Remove http_encoder_patch, Rails new version not need that;

Format config/

Author: huacnlee

config/application.rb

@@ -1,23 +1,23 @@
 # coding: utf-8
 require File.expand_path('../boot', __FILE__)
 
-require "action_controller/railtie"
-require "action_mailer/railtie"
-require "rails/test_unit/railtie"
+require 'action_controller/railtie'
+require 'action_mailer/railtie'
+require 'rails/test_unit/railtie'
 require 'sprockets/railtie'
 
 if defined?(Bundler)
-  Bundler.require *Rails.groups(assets: %w(production development test))
+  Bundler.require(*Rails.groups(assets: %w(production development test)))
 end
 
 module RubyChina
   class Application < Rails::Application
     # Custom directories with classes and modules you want to be autoloadable.
     config.time_zone = 'Beijing'
-    
+
     # Ensure App config files exist.
     if Rails.env.development?
-      %W(config redis mongoid secrets).each do |fname|
+      %w(config redis mongoid secrets).each do |fname|
         filename = "config/#{fname}.yml"
         next if File.exist?(Rails.root.join(filename))
         FileUtils.cp(Rails.root.join("#{filename}.default"), Rails.root.join(filename))
@@ -26,32 +26,32 @@ class Application < Rails::Application
 
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    config.i18n.default_locale = "zh-CN"
-    
-    config.autoload_paths << Rails.root.join("app/api")
+    config.i18n.default_locale = 'zh-CN'
+
+    config.autoload_paths << Rails.root.join('app/api')
     config.eager_load_paths += %W( #{config.root}/lib/exception_notifier )
 
     # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
+    config.encoding = 'utf-8'
 
     config.mongoid.include_root_in_json = false
 
     config.generators do |g|
       g.test_framework :rspec
-      g.fixture_replacement :factory_girl, dir: "spec/factories"
+      g.fixture_replacement :factory_girl, dir: 'spec/factories'
     end
 
-    config.action_view.sanitized_allowed_attributes = %w{target}
+    config.action_view.sanitized_allowed_attributes = %w(target)
 
-    config.to_prepare {
-      Devise::Mailer.layout "mailer"
+    config.to_prepare do
+      Devise::Mailer.layout 'mailer'
       # Only Applications list
-      Doorkeeper::ApplicationsController.layout "simple"
+      Doorkeeper::ApplicationsController.layout 'simple'
       # Only Authorization endpoint
-      Doorkeeper::AuthorizationsController.layout "simple"
+      Doorkeeper::AuthorizationsController.layout 'simple'
       # Only Authorized Applications
-      Doorkeeper::AuthorizedApplicationsController.layout "simple"
-    }
+      Doorkeeper::AuthorizedApplicationsController.layout 'simple'
+    end
 
     config.middleware.use Rack::Cors do
       allow do
@@ -61,7 +61,7 @@ class Application < Rails::Application
       end
     end
 
-    config.cache_store = [:dalli_store,"127.0.0.1", { namespace: "rb-cn", compress: true }]
+    config.cache_store = [:dalli_store, '127.0.0.1', { namespace: 'rb-cn', compress: true }]
 
     config.middleware.insert 0, Rack::UTF8Sanitizer
   end
@@ -72,5 +72,5 @@ class Application < Rails::Application
 I18n.config.enforce_available_locales = false
 I18n.locale = 'zh-CN'
 
-require "markdown"
+require 'markdown'
 # GC::Profiler.enable

config/deploy.rb

@@ -8,20 +8,20 @@
 
 set :rvm_ruby_string, 'ruby-2.2.2'
 set :rvm_type, :user
-set :application, "ruby-china"
-set :repository,  "git://github.com/ruby-china/ruby-china.git"
-set :branch, "master"
+set :application, 'ruby-china'
+set :repository,  'git://github.com/ruby-china/ruby-china.git'
+set :branch, 'master'
 set :scm, :git
-set :user, "ruby"
+set :user, 'ruby'
 set :deploy_to, "/data/www/#{application}"
-set :runner, "ruby"
+set :runner, 'ruby'
 # set :deploy_via, :remote_cache
 set :git_shallow_clone, 1
 
-role :web, "ruby-china.org"
-role :app, "ruby-china.org"
-role :db,  "ruby-china.org", primary: true
-role :queue, "ruby-china.org"
+role :web, 'ruby-china.org'
+role :app, 'ruby-china.org'
+role :db,  'ruby-china.org', primary: true
+role :queue, 'ruby-china.org'
 
 task :link_shared, roles: :web do
   run "mkdir -p #{shared_path}/log"
@@ -43,5 +43,5 @@
   run "cd #{current_path}; RAILS_ENV=production bundle exec rake db:mongoid:create_indexes"
 end
 
-after "deploy:finalize_update","deploy:symlink", :link_shared, :migrate_db , :compile_assets
+after 'deploy:finalize_update', 'deploy:symlink', :link_shared, :migrate_db, :compile_assets
 after 'deploy:restart', 'unicorn:restart'

config/environments/development.rb

@@ -18,8 +18,8 @@
   # Don't care if the mailer can't send
   config.action_mailer.raise_delivery_errors = false
   # config.action_mailer.delivery_method = :letter_opener
-  config.action_mailer.default_url_options = { :host => Setting.domain }
-  config.action_mailer.delivery_method   = :letter_opener
+  config.action_mailer.default_url_options = { host: Setting.domain }
+  config.action_mailer.delivery_method = :letter_opener
 
   # Print deprecation notices to the Rails logger
   config.active_support.deprecation = :log
@@ -40,12 +40,12 @@
 end
 
 @last_api_change = Time.now
-api_reloader = ActiveSupport::FileUpdateChecker.new(Dir["#{Rails.root}/app/grape/**/*.rb"]) do |reloader|
-  times = Dir["#{Rails.root}/app/grape/**/*.rb"].map{|f| File.mtime(f) }
-  files = Dir["#{Rails.root}/app/grape/**/*.rb"].map{|f| f }
+api_reloader = ActiveSupport::FileUpdateChecker.new(Dir["#{Rails.root}/app/grape/**/*.rb"]) do |_reloader|
+  times = Dir["#{Rails.root}/app/grape/**/*.rb"].map { |f| File.mtime(f) }
+  files = Dir["#{Rails.root}/app/grape/**/*.rb"].map { |f| f }
 
-  Rails.logger.debug "! Change detected: reloading following files:"
-  files.each_with_index do |s,i|
+  Rails.logger.debug '! Change detected: reloading following files:'
+  files.each_with_index do |s, i|
     if times[i] > @last_api_change
       Rails.logger.debug " - #{s}"
       load s

config/environments/production.rb

@@ -56,7 +56,7 @@
 
   # Disable delivery errors, bad email addresses will be ignored
   # config.action_mailer.raise_delivery_errors = false
-  config.action_mailer.default_url_options = { host: Setting.domain, protocol: "https" }
+  config.action_mailer.default_url_options = { host: Setting.domain, protocol: 'https' }
   config.action_mailer.delivery_method   = :postmark
   config.action_mailer.postmark_settings = { api_key: Setting.email_password }
 

config/environments/test.rb

@@ -13,7 +13,7 @@
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_files  = true
+  config.serve_static_files = true
   config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.
@@ -39,4 +39,4 @@
 
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
-end
+end

config/initializers/assets.rb

@@ -5,5 +5,5 @@
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
 Rails.application.config.assets.precompile += %w(application.css app.js topics.css topics.js front.css cpanel.css
-  users.css pages.css pages.js notes.css notes.js
-  mobile.css home.css)
+                                                 users.css pages.css pages.js notes.css notes.js
+                                                 mobile.css home.css)

config/initializers/carrierwave.rb

@@ -11,7 +11,7 @@ module Mongoid
     ##
     # See +CarrierWave::Mount#mount_uploader+ for documentation
     #
-    def mount_uploader(column, uploader=nil, options={}, &block)
+    def mount_uploader(column, uploader = nil, options = {}, &block)
       field options[:mount_on] || column
 
       super
@@ -23,7 +23,7 @@ def mount_uploader(column, uploader=nil, options={}, &block)
 
       include CarrierWave::Validations::ActiveModel
 
-      validates_integrity_of  column if uploader_option(column.to_sym, :validate_integrity)
+      validates_integrity_of column if uploader_option(column.to_sym, :validate_integrity)
       validates_processing_of column if uploader_option(column.to_sym, :validate_processing)
 
       after_save :"store_#{column}!"
@@ -32,7 +32,7 @@ def mount_uploader(column, uploader=nil, options={}, &block)
       before_update :"store_previous_model_for_#{column}"
       after_save :"remove_previously_stored_#{column}"
 
-      class_eval <<-RUBY, __FILE__, __LINE__+1
+      class_eval <<-RUBY, __FILE__, __LINE__ + 1
         def #{column}=(new_file)
           column = _mounter(:#{column}).serialization_column
           send(:"\#{column}_will_change!")

config/initializers/colorize_log.rb

@@ -1,7 +1,7 @@
 if Rails.env.development?
-  CACHE_PREFIX = "  CACHE:".colorize(:yellow)
-  MOPED_PREFIX = "  MONGO:".colorize(:magenta)
-  
+  CACHE_PREFIX = '  CACHE:'.colorize(:yellow)
+  MOPED_PREFIX = '  MONGO:'.colorize(:magenta)
+
   module ActionView
     class LogSubscriber < ActiveSupport::LogSubscriber
       def render_template(event)
@@ -11,16 +11,15 @@ def render_template(event)
           message << " (#{event.duration.round(1)}ms)".colorize(:green)
         end
       end
-      alias :render_partial :render_template
-      alias :render_collection :render_template
+      alias_method :render_partial, :render_template
+      alias_method :render_collection, :render_template
     end
   end
 
-
   module ActionController
     class LogSubscriber < ActiveSupport::LogSubscriber
       %w(write_fragment read_fragment exist_fragment?
-       expire_fragment expire_page write_page).each do |method|
+         expire_fragment expire_page write_page).each do |method|
         class_eval <<-METHOD, __FILE__, __LINE__ + 1
           def #{method}(event)
             return unless logger.info?
@@ -34,32 +33,31 @@ def #{method}(event)
     end
   end
 
-
   module ActiveSupport
     module Cache
       class DalliStore
-        def log(operation, key, options=nil)
+        def log(operation, key, options = nil)
           return unless logger && logger.debug? && !silence?
-          return if operation.to_s == "fetch_hit"
-          logger.debug("#{CACHE_PREFIX} #{operation} #{key}#{options.blank? ? "" : " (#{options.inspect})"}")
+          return if operation.to_s == 'fetch_hit'
+          logger.debug("#{CACHE_PREFIX} #{operation} #{key}#{options.blank? ? '' : " (#{options.inspect})"}")
         end
       end
     end
   end
 
   module Moped
     module Loggable
-      def self.log_operations(prefix, ops, runtime)
-        indent  = " "
+      def self.log_operations(_prefix, ops, runtime)
+        indent = ' '
         if ops.length == 1
           Moped.logger.debug([MOPED_PREFIX, ops.first.log_inspect, runtime].join(' '))
         else
           first, *middle, last = ops
-          Moped.logger.debug([ MOPED_PREFIX, first.log_inspect ].join(' '))
-          middle.each { |m| Moped.logger.debug([ indent, m.log_inspect ].join(' ')) }
+          Moped.logger.debug([MOPED_PREFIX, first.log_inspect].join(' '))
+          middle.each { |m| Moped.logger.debug([indent, m.log_inspect].join(' ')) }
           Moped.logger.debug([indent, last.log_inspect, runtime].join(' '))
         end
       end
     end
   end
-end
+end

config/initializers/cookies_serializer.rb

@@ -1,2 +1,2 @@
 # Be sure to restart your server when you modify this file.
-Rails.application.config.action_dispatch.cookies_serializer = :hybrid
+Rails.application.config.action_dispatch.cookies_serializer = :hybrid

config/initializers/devise.rb

@@ -10,7 +10,7 @@
   config.mailer_sender = Setting.email_sender
 
   # Configure the class responsible to send e-mails.
-  config.mailer = "Devise::Mailer"
+  config.mailer = 'Devise::Mailer'
   # config.mailer = "Devise::Async::Proxy"
 
   # ==> ORM configuration
@@ -26,17 +26,17 @@
   # parameters are used only when authenticating and not when retrieving from
   # session. If you need permissions, you should implement that in a before filter.
   # config.authentication_keys = [ :email ]
-  config.authentication_keys = [ :login ]
+  config.authentication_keys = [:login]
 
   # Configure which authentication keys should be case-insensitive.
   # These keys will be downcased upon creating or modifying a user and when used
   # to authenticate or find a user. Default is :email.
-  config.case_insensitive_keys = [ :email, :login ]
+  config.case_insensitive_keys = [:email, :login]
 
   # Configure which authentication keys should have whitespace stripped.
   # These keys will have whitespace before and after removed upon creating or
   # modifying a user and when used to authenticate or find a user. Default is :email.
-  config.strip_whitespace_keys = [ :email, :login ]
+  config.strip_whitespace_keys = [:email, :login]
 
   # Tell if authentication through request.params is enabled. True by default.
   # config.params_authenticatable = true
@@ -78,7 +78,7 @@
   # config.encryptor = :bcrypt
 
   # Setup a pepper to generate the encrypted password.
-  config.pepper = "c7d4ed7d1ea1a7fee16e8a7ef80ca1d391fc3bb8e79a2da9ca23a68dc5c82e6cf3715a6f3d8369335372ab8be36a526bc2e778f17075ed241a1c14c5b93eea60"
+  config.pepper = 'c7d4ed7d1ea1a7fee16e8a7ef80ca1d391fc3bb8e79a2da9ca23a68dc5c82e6cf3715a6f3d8369335372ab8be36a526bc2e778f17075ed241a1c14c5b93eea60'
 
   # ==> Configuration for :confirmable
   # The time you want to give your user to confirm his account. During this time

config/initializers/doorkeeper.rb

@@ -9,7 +9,7 @@
     current_user || warden.authenticate!(scope: :user)
   end
 
-  resource_owner_from_credentials do |routes|
+  resource_owner_from_credentials do |_routes|
     u = User.find_for_database_authentication(login: params[:username])
     u if u && u.valid_password?(params[:password])
   end
@@ -107,7 +107,7 @@
   # end
 
   # WWW-Authenticate Realm (default "Doorkeeper").
-  realm "Ruby China"
+  realm 'Ruby China'
 end
 
-Doorkeeper.configuration.token_grant_types << "password"
+Doorkeeper.configuration.token_grant_types << 'password'

config/initializers/exception_notification.rb

@@ -1,13 +1,13 @@
 require 'exception_notification/rails'
 require 'exception_notification/sidekiq'
-require "exception_notifier/database_notifier"
+require 'exception_notifier/database_notifier'
 
 ExceptionNotification.configure do |config|
-  config.ignored_exceptions += %w{ActionView::TemplateError Mongoid::Errors::DocumentNotFound 
-    ActionController::BadRequest ActionView::MissingTemplate ActionController::UrlGenerationError 
-    ActionController::UnknownFormat}
+  config.ignored_exceptions += %w(ActionView::TemplateError Mongoid::Errors::DocumentNotFound
+                                  ActionController::BadRequest ActionView::MissingTemplate ActionController::UrlGenerationError
+                                  ActionController::UnknownFormat)
   # config.ignore_if do |exception, options|
   #   not Rails.env.production?
   # end
   config.add_notifier :database, {}
-end
+end