Merge branch 'master' of github.com:rails/rails

20 files changed, 93 insertions, 35 deletions

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 2a09ccf61a..7d6521b2a8 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,6 +1,13 @@
+*   Fix a bug in the `gem` method for Rails templates when non-String options
+    are used.
+
+    Fixes #16709.
+
+    *Yves Senn*
+
 *   The [web-console](https://github.com/rails/web-console) gem is now
     installed by default for new applications. It can help you debug
-    development exceptions by spawnig an interactive console in its cause
+    development exceptions by spawning an interactive console in its cause
     binding.
 
     *Ryan Dao*, *Genadi Samokovarov*, *Guillermo Iguaran*
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 9a6a4a52c7..2c16b83f8a 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -117,7 +117,7 @@ module Rails
       end
 
       def log_level
-        @log_level ||= Rails.env.production? ? :info : :debug
+        @log_level ||= :debug
       end
 
       def colorize_logging
diff --git a/railties/lib/rails/commands/console.rb b/railties/lib/rails/commands/console.rb
index 555d8f31e1..96ced3c2f9 100644
--- a/railties/lib/rails/commands/console.rb
+++ b/railties/lib/rails/commands/console.rb
@@ -18,12 +18,12 @@ module Rails
           opt.on("-e", "--environment=name", String,
                   "Specifies the environment to run this console under (test/development/production).",
                   "Default: development") { |v| options[:environment] = v.strip }
-          opt.on("--debugger", 'Enable the debugger.') do |v|
+          opt.on("--debugger", 'Enables the debugger.') do |v|
             if RUBY_VERSION < '2.0.0'
               options[:debugger] = v
             else
-              puts "=> Notice: debugger option is ignored since ruby 2.0 and " \
-                   "it will be removed in future versions"
+              puts "=> Notice: debugger option is ignored since Ruby 2.0 and " \
+                   "it will be removed in future versions."
             end
           end
           opt.parse!(arguments)
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index c3b7bb6f84..c479e92ae0 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -20,20 +20,20 @@ module Rails
 
       def option_parser(options)
         OptionParser.new do |opts|
-          opts.banner = "Usage: rails server [mongrel, thin, etc] [options]"
+          opts.banner = "Usage: rails server [mongrel, thin etc] [options]"
           opts.on("-p", "--port=port", Integer,
                   "Runs Rails on the specified port.", "Default: 3000") { |v| options[:Port] = v }
-          opts.on("-b", "--binding=ip", String,
-                  "Binds Rails to the specified ip.", "Default: 0.0.0.0") { |v| options[:Host] = v }
+          opts.on("-b", "--binding=IP", String,
+                  "Binds Rails to the specified IP.", "Default: 0.0.0.0") { |v| options[:Host] = v }
           opts.on("-c", "--config=file", String,
-                  "Use custom rackup configuration file") { |v| options[:config] = v }
-          opts.on("-d", "--daemon", "Make server run as a Daemon.") { options[:daemonize] = true }
-          opts.on("-u", "--debugger", "Enable the debugger") do
+                  "Uses a custom rackup configuration.") { |v| options[:config] = v }
+          opts.on("-d", "--daemon", "Runs server as a Daemon.") { options[:daemonize] = true }
+          opts.on("-u", "--debugger", "Enables the debugger.") do
             if RUBY_VERSION < '2.0.0'
               options[:debugger] = true
             else
-              puts "=> Notice: debugger option is ignored since ruby 2.0 and " \
-                   "it will be removed in future versions"
+              puts "=> Notice: debugger option is ignored since Ruby 2.0 and " \
+                   "it will be removed in future versions."
             end
           end
           opts.on("-e", "--environment=name", String,
@@ -45,7 +45,7 @@ module Rails
 
           opts.separator ""
 
-          opts.on("-h", "--help", "Show this help message.") { puts opts; exit }
+          opts.on("-h", "--help", "Shows this help message.") { puts opts; exit }
         end
       end
     end
diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb
index 4709914947..b2c9d12996 100644
--- a/railties/lib/rails/generators/actions.rb
+++ b/railties/lib/rails/generators/actions.rb
@@ -268,11 +268,13 @@ module Rails
 
         # Surround string with single quotes if there is no quotes.
         # Otherwise fall back to double quotes
-        def quote(str)
-          if str.include?("'")
-            str.inspect
+        def quote(value)
+          return value.inspect unless value.is_a? String
+
+          if value.include?("'")
+            value.inspect
           else
-            "'#{str}'"
+            "'#{value}'"
           end
         end
     end
diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb
index 23db8b5153..80393a16ba 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -5,6 +5,7 @@ require 'rails/all'
 <% else -%>
 # Pick the frameworks you want:
 require "active_model/railtie"
+require "active_job/railtie"
 <%= comment_if :skip_active_record %>require "active_record/railtie"
 require "action_controller/railtie"
 require "action_mailer/railtie"
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
index 35e3035a0b..d8326d1728 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
@@ -30,7 +30,7 @@ Rails.application.configure do
   # number of complex assets.
   config.assets.debug = true
 
-  # Asset digests allow you to set far-future HTTP expiration dates on all assets, 
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
   # yet still be able to expire them through the digest params.
   config.assets.digest = true
 
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
index bec7716a9b..2cd8040f35 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
@@ -30,7 +30,7 @@ Rails.application.configure do
   # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
 
-  # Asset digests allow you to set far-future HTTP expiration dates on all assets, 
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
   # yet still be able to expire them through the digest params.
   config.assets.digest = true
 
@@ -44,8 +44,8 @@ Rails.application.configure do
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
 
-  # Set to :info to decrease the log volume.
-  config.log_level = :debug
+  # Decrease the log volume.
+  # config.log_level = :info
 
   # Prepend all log lines with the following tags.
   # config.log_tags = [ :subdomain, :uuid ]
diff --git a/railties/lib/rails/generators/rails/model/USAGE b/railties/lib/rails/generators/rails/model/USAGE
index 2a6b8700e3..8c3b63c3b4 100644
--- a/railties/lib/rails/generators/rails/model/USAGE
+++ b/railties/lib/rails/generators/rails/model/USAGE
@@ -46,7 +46,6 @@ Available field types:
         date
         time
         datetime
-        timestamp
 
     You can also consider `references` as a kind of type. For instance, if you run:
 
diff --git a/railties/lib/rails/generators/test_unit/job/job_generator.rb b/railties/lib/rails/generators/test_unit/job/job_generator.rb
new file mode 100644
index 0000000000..05d9fde280
--- /dev/null
+++ b/railties/lib/rails/generators/test_unit/job/job_generator.rb
@@ -0,0 +1,13 @@
+require 'rails/generators/test_unit'
+
+module TestUnit # :nodoc:
+  module Generators # :nodoc:
+    class JobGenerator < Base # :nodoc:
+      check_class_collision suffix: 'JobTest'
+
+      def create_test_file
+        template 'unit_test.rb.erb', File.join('test/job', class_path, "#{file_name}_test.rb")
+      end
+    end
+  end
+end
diff --git a/railties/lib/rails/generators/test_unit/job/templates/unit_test.rb.erb b/railties/lib/rails/generators/test_unit/job/templates/unit_test.rb.erb
new file mode 100644
index 0000000000..6200218313
--- /dev/null
+++ b/railties/lib/rails/generators/test_unit/job/templates/unit_test.rb.erb
@@ -0,0 +1,9 @@
+require 'test_helper'
+
+<% module_namespacing do -%>
+class <%= class_name %>JobTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
+<% end -%>
diff --git a/railties/lib/rails/tasks/statistics.rake b/railties/lib/rails/tasks/statistics.rake
index ae5a7d2759..b94cd244be 100644
--- a/railties/lib/rails/tasks/statistics.rake
+++ b/railties/lib/rails/tasks/statistics.rake
@@ -4,6 +4,7 @@
 STATS_DIRECTORIES = [
   %w(Controllers        app/controllers),
   %w(Helpers            app/helpers),
+  %w(Jobs               app/jobs),
   %w(Models             app/models),
   %w(Mailers            app/mailers),
   %w(Javascripts        app/assets/javascripts),
@@ -24,4 +25,4 @@ desc "Report code statistics (KLOCs, etc) from the application or engine"
 task :stats do
   require 'rails/code_statistics'
   CodeStatistics.new(*STATS_DIRECTORIES).to_s
-end
\ No newline at end of file
+end
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index e661b6f4cc..db2106aed3 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -118,7 +118,7 @@ module ApplicationTests
     test "Rails::Application responds to paths" do
       require "#{app_path}/config/environment"
       assert_respond_to AppTemplate::Application, :paths
-      assert_equal AppTemplate::Application.paths["app/views"].expanded, ["#{app_path}/app/views"]
+      assert_equal ["#{app_path}/app/views"], AppTemplate::Application.paths["app/views"].expanded
     end
 
     test "the application root is set correctly" do
diff --git a/railties/test/application/initializers/frameworks_test.rb b/railties/test/application/initializers/frameworks_test.rb
index ae550331bd..2d45c9b53f 100644
--- a/railties/test/application/initializers/frameworks_test.rb
+++ b/railties/test/application/initializers/frameworks_test.rb
@@ -35,8 +35,8 @@ module ApplicationTests
       require "#{app_path}/config/environment"
 
       expanded_path = File.expand_path("app/views", app_path)
-      assert_equal ActionController::Base.view_paths[0].to_s, expanded_path
-      assert_equal ActionMailer::Base.view_paths[0].to_s, expanded_path
+      assert_equal expanded_path, ActionController::Base.view_paths[0].to_s
+      assert_equal expanded_path, ActionMailer::Base.view_paths[0].to_s
     end
 
     test "allows me to configure default url options for ActionMailer" do
diff --git a/railties/test/application/middleware/remote_ip_test.rb b/railties/test/application/middleware/remote_ip_test.rb
index 946b82eeb3..97d5b5c698 100644
--- a/railties/test/application/middleware/remote_ip_test.rb
+++ b/railties/test/application/middleware/remote_ip_test.rb
@@ -1,3 +1,4 @@
+require 'ipaddr'
 require 'isolation/abstract_unit'
 require 'active_support/key_generator'
 
@@ -53,12 +54,25 @@ module ApplicationTests
       end
     end
 
+    test "remote_ip works with HTTP_X_FORWARDED_FOR" do
+      make_basic_app
+      assert_equal "4.2.42.42", remote_ip("REMOTE_ADDR" => "1.1.1.1", "HTTP_X_FORWARDED_FOR" => "4.2.42.42")
+    end
+
     test "the user can set trusted proxies" do
       make_basic_app do |app|
         app.config.action_dispatch.trusted_proxies = /^4\.2\.42\.42$/
       end
 
-      assert_equal "1.1.1.1", remote_ip("REMOTE_ADDR" => "4.2.42.42,1.1.1.1")
+      assert_equal "1.1.1.1", remote_ip("REMOTE_ADDR" => "1.1.1.1", "HTTP_X_FORWARDED_FOR" => "4.2.42.42")
+    end
+
+    test "the user can set trusted proxies with an IPAddr argument" do
+      make_basic_app do |app|
+        app.config.action_dispatch.trusted_proxies = IPAddr.new('4.2.42.0/24')
+      end
+
+      assert_equal "1.1.1.1", remote_ip("REMOTE_ADDR" => "1.1.1.1", "HTTP_X_FORWARDED_FOR" => "10.0.0.0,4.2.42.42")
     end
   end
 end
diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index 33eb034b1c..a905598d80 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -83,7 +83,7 @@ module ApplicationTests
       add_to_config "config.ssl_options = { host: 'example.com' }"
       boot!
 
-      assert_equal Rails.application.middleware.first.args, [{host: 'example.com'}]
+      assert_equal [{host: 'example.com'}], Rails.application.middleware.first.args
     end
 
     test "removing Active Record omits its middleware" do
diff --git a/railties/test/commands/dbconsole_test.rb b/railties/test/commands/dbconsole_test.rb
index ede08e7b86..a3cd1eb0ed 100644
--- a/railties/test/commands/dbconsole_test.rb
+++ b/railties/test/commands/dbconsole_test.rb
@@ -28,7 +28,7 @@ class Rails::DBConsoleTest < ActiveSupport::TestCase
       }
     }
     app_db_config(config_sample) do
-      assert_equal Rails::DBConsole.new.config, config_sample["test"]
+      assert_equal config_sample["test"], Rails::DBConsole.new.config
     end
   end
 
@@ -79,22 +79,23 @@ class Rails::DBConsoleTest < ActiveSupport::TestCase
   end
 
   def test_env
-    assert_equal Rails::DBConsole.new.environment, "test"
+    assert_equal "test", Rails::DBConsole.new.environment
 
     ENV['RAILS_ENV'] = nil
     ENV['RACK_ENV'] = nil
 
     Rails.stub(:respond_to?, false) do
-      assert_equal Rails::DBConsole.new.environment, "development"
+      assert_equal "development", Rails::DBConsole.new.environment
 
       ENV['RACK_ENV'] = "rack_env"
-      assert_equal Rails::DBConsole.new.environment, "rack_env"
+      assert_equal "rack_env", Rails::DBConsole.new.environment
 
       ENV['RAILS_ENV'] = "rails_env"
-      assert_equal Rails::DBConsole.new.environment, "rails_env"
+      assert_equal "rails_env", Rails::DBConsole.new.environment
     end
   ensure
     ENV['RAILS_ENV'] = "test"
+    ENV['RACK_ENV'] = nil
   end
 
   def test_rails_env_is_development_when_argument_is_dev
diff --git a/railties/test/generators/actions_test.rb b/railties/test/generators/actions_test.rb
index a4337926d1..2206e389b5 100644
--- a/railties/test/generators/actions_test.rb
+++ b/railties/test/generators/actions_test.rb
@@ -79,6 +79,16 @@ class ActionsTest < Rails::Generators::TestCase
     assert_file 'Gemfile', /gem 'rspec', github: 'dchelimsky\/rspec', tag: '1\.2\.9\.rc1'/
   end
 
+  def test_gem_with_non_string_options
+    run_generator
+
+    action :gem, 'rspec', require: false
+    action :gem, 'rspec-rails', group: [:development, :test]
+
+    assert_file 'Gemfile', /^gem 'rspec', require: false$/
+    assert_file 'Gemfile', /^gem 'rspec-rails', group: \[:development, :test\]$/
+  end
+
   def test_gem_falls_back_to_inspect_if_string_contains_single_quote
     run_generator
 
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 70c439672f..d687a8f506 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -395,6 +395,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
     run_generator [destination_root, "--skip-test-unit", "--skip-active-record"]
     assert_file "config/application.rb", /#\s+require\s+["']rails\/test_unit\/railtie["']/
     assert_file "config/application.rb", /#\s+require\s+["']active_record\/railtie["']/
+    assert_file "config/application.rb", /\s+require\s+["']active_job\/railtie["']/
   end
 
   def test_new_hash_style
diff --git a/railties/test/generators/generators_test_helper.rb b/railties/test/generators/generators_test_helper.rb
index e7990de754..6cc91f166b 100644
--- a/railties/test/generators/generators_test_helper.rb
+++ b/railties/test/generators/generators_test_helper.rb
@@ -7,7 +7,7 @@ module Rails
   class << self
     remove_possible_method :root
     def root
-      @root ||= File.expand_path('../../fixtures', __FILE__)
+      @root ||= Pathname.new(File.expand_path('../../fixtures', __FILE__))
     end
   end
 end