Merge branch 'master' into joindep

* master: (44 commits)
  grammar fix (reverted in e9a1ecd)
  Revert "fixed a doc bug in the CHANGELOG.md s/does no longer depend on/no longer depends on/"
  Add missed require making `enable_warnings` available
  Prepare generated Gemfile for Capistrano 3
  Added --model-name option scaffold_controller_generator.
  read the association instead of sending
  we should have unique sponsorable ids in the fixtures at least
  simplify populating the ordering hash
  the preloader for the RHS has all the preloaded records, so ask it
  only calculate offset index once. #12537
  Remove size alias for length validation
  Fix `singleton_class?`
  Minor Refactoring to `NumberHelper#number_to_human`
  `$SAFE = 4;` has been removed with Ruby 2.1
  scope_chain should not be mutated for other reflections
  Remove `default_primary_key_type`  and extract contains of `native_database_types` to a constant since they aren't conditional now in SQLite3Adapter. Makes it more like other adapters.
  cleanup changelog entry format. [ci skip]
  Extract a function to determine if the default value is a function
  Push default_function to superclass to avoid method check
  Dump the default function when the primary key is uuid
  ...

Conflicts:
	activerecord/lib/active_record/relation/finder_methods.rb

9 files changed, 108 insertions, 20 deletions

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 4e6bf899af..8a0e0ff3f6 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Added `--model-name` scaffld\_controller\_generator option.
+
+    *yalab*
+
 *   Expose MiddlewareStack#unshift to environment configuration.
 
     *Ben Pickles*
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index 485bd1eb09..4201dac42f 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -1,6 +1,7 @@
 require 'fileutils'
 require 'optparse'
 require 'action_dispatch'
+require 'rails'
 
 module Rails
   class Server < ::Rack::Server
@@ -32,7 +33,7 @@ module Rails
 
         opt_parser.parse! args
 
-        options[:log_stdout] = options[:daemonize].blank? && options[:environment] == "development"
+        options[:log_stdout] = options[:daemonize].blank? && (options[:environment] || Rails.env) == "development"
         options[:server]     = args.shift
         options
       end
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile
index edc76e6c34..4048930c8d 100644
--- a/railties/lib/rails/generators/rails/app/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/app/templates/Gemfile
@@ -25,7 +25,7 @@ end
 # gem 'unicorn'
 
 # Use Capistrano for deployment
-# gem 'capistrano', group: :development
+# gem 'capistrano-rails', group: :development
 
 <% unless defined?(JRUBY_VERSION) -%>
 # Use debugger
diff --git a/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb b/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
index 4f36b612ae..6bf0a33a5f 100644
--- a/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
+++ b/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
@@ -13,7 +13,7 @@ module Rails
       argument :attributes, type: :array, default: [], banner: "field:type field:type"
 
       def create_controller_files
-        template "controller.rb", File.join('app/controllers', class_path, "#{controller_file_name}_controller.rb")
+        template "controller.rb", File.join('app/controllers', controller_class_path, "#{controller_file_name}_controller.rb")
       end
 
       hook_for :template_engine, :test_framework, as: :scaffold
diff --git a/railties/lib/rails/generators/resource_helpers.rb b/railties/lib/rails/generators/resource_helpers.rb
index 7fd5c00768..a01eb57651 100644
--- a/railties/lib/rails/generators/resource_helpers.rb
+++ b/railties/lib/rails/generators/resource_helpers.rb
@@ -9,11 +9,19 @@ module Rails
 
       def self.included(base) #:nodoc:
         base.class_option :force_plural, type: :boolean, desc: "Forces the use of a plural ModelName"
+        base.class_option :model_name, type: :string, desc: "ModelName to be used"
       end
 
       # Set controller variables on initialization.
       def initialize(*args) #:nodoc:
         super
+        if options[:model_name]
+          controller_name = name
+          self.name = options[:model_name]
+          assign_names!(self.name)
+        else
+          controller_name = name
+        end
 
         if name == name.pluralize && name.singularize != name.pluralize && !options[:force_plural]
           unless ResourceHelpers.skip_warn
@@ -24,19 +32,26 @@ module Rails
           assign_names!(name)
         end
 
-        @controller_name = name.pluralize
+        assign_controller_names!(controller_name.pluralize)
       end
 
       protected
 
-        attr_reader :controller_name
+        attr_reader :controller_name, :controller_file_name
 
         def controller_class_path
-          class_path
+          if options[:model_name]
+            @controller_class_path
+          else
+            class_path
+          end
         end
 
-        def controller_file_name
-          @controller_file_name ||= file_name.pluralize
+        def assign_controller_names!(name)
+          @controller_name = name
+          @controller_class_path = name.include?('/') ? name.split('/') : name.split('::')
+          @controller_class_path.map! { |m| m.underscore }
+          @controller_file_name = @controller_class_path.pop
         end
 
         def controller_file_path
diff --git a/railties/test/commands/server_test.rb b/railties/test/commands/server_test.rb
index 20afca2618..ba688f1e9e 100644
--- a/railties/test/commands/server_test.rb
+++ b/railties/test/commands/server_test.rb
@@ -27,26 +27,62 @@ class Rails::ServerTest < ActiveSupport::TestCase
   end
 
   def test_environment_with_rails_env
-    with_rails_env 'production' do
-      server = Rails::Server.new
-      assert_equal 'production', server.options[:environment]
+    with_rack_env nil do
+      with_rails_env 'production' do
+        server = Rails::Server.new
+        assert_equal 'production', server.options[:environment]
+      end
     end
   end
 
   def test_environment_with_rack_env
-    with_rack_env 'production' do
-      server = Rails::Server.new
-      assert_equal 'production', server.options[:environment]
+    with_rails_env nil do
+      with_rack_env 'production' do
+        server = Rails::Server.new
+        assert_equal 'production', server.options[:environment]
+      end
     end
   end
 
   def test_log_stdout
-    args    = ["-e", "development"]
-    options = Rails::Server::Options.new.parse!(args)
-    assert_equal true, options[:log_stdout]
+    with_rack_env nil do
+      with_rails_env nil do
+        args    = []
+        options = Rails::Server::Options.new.parse!(args)
+        assert_equal true, options[:log_stdout]
 
-    args    = ["-e", "production"]
-    options = Rails::Server::Options.new.parse!(args)
-    assert_equal false, options[:log_stdout]
+        args    = ["-e", "development"]
+        options = Rails::Server::Options.new.parse!(args)
+        assert_equal true, options[:log_stdout]
+
+        args    = ["-e", "production"]
+        options = Rails::Server::Options.new.parse!(args)
+        assert_equal false, options[:log_stdout]
+
+        with_rack_env 'development' do
+          args    = []
+          options = Rails::Server::Options.new.parse!(args)
+          assert_equal true, options[:log_stdout]
+        end
+
+        with_rack_env 'production' do
+          args    = []
+          options = Rails::Server::Options.new.parse!(args)
+          assert_equal false, options[:log_stdout]
+        end
+
+        with_rails_env 'development' do
+          args    = []
+          options = Rails::Server::Options.new.parse!(args)
+          assert_equal true, options[:log_stdout]
+        end
+
+        with_rails_env 'production' do
+          args    = []
+          options = Rails::Server::Options.new.parse!(args)
+          assert_equal false, options[:log_stdout]
+        end
+      end
+    end
   end
 end
diff --git a/railties/test/env_helpers.rb b/railties/test/env_helpers.rb
index 6223c85bbf..330fe150ca 100644
--- a/railties/test/env_helpers.rb
+++ b/railties/test/env_helpers.rb
@@ -1,7 +1,10 @@
+require 'rails'
+
 module EnvHelpers
   private
 
   def with_rails_env(env)
+    Rails.instance_variable_set :@_env, nil
     switch_env 'RAILS_ENV', env do
       switch_env 'RACK_ENV', nil do
         yield
@@ -10,6 +13,7 @@ module EnvHelpers
   end
 
   def with_rack_env(env)
+    Rails.instance_variable_set :@_env, nil
     switch_env 'RACK_ENV', env do
       switch_env 'RAILS_ENV', nil do
         yield
diff --git a/railties/test/generators/named_base_test.rb b/railties/test/generators/named_base_test.rb
index 2bc2c33a72..ac5cfff229 100644
--- a/railties/test/generators/named_base_test.rb
+++ b/railties/test/generators/named_base_test.rb
@@ -117,6 +117,25 @@ class NamedBaseTest < Rails::Generators::TestCase
     assert Rails::Generators.hidden_namespaces.include?('hidden')
   end
 
+  def test_scaffold_plural_names_with_model_name_option
+    g = generator ['Admin::Foo'], model_name: 'User'
+    assert_name g, 'user',        :singular_name
+    assert_name g, 'User',        :name
+    assert_name g, 'user',        :file_path
+    assert_name g, 'User',        :class_name
+    assert_name g, 'user',        :file_name
+    assert_name g, 'User',        :human_name
+    assert_name g, 'users',       :plural_name
+    assert_name g, 'user',        :i18n_scope
+    assert_name g, 'users',       :table_name
+    assert_name g, 'Admin::Foos', :controller_name
+    assert_name g, %w(admin),     :controller_class_path
+    assert_name g, 'Admin::Foos', :controller_class_name
+    assert_name g, 'admin/foos',  :controller_file_path
+    assert_name g, 'foos',        :controller_file_name
+    assert_name g, 'admin.foos',  :controller_i18n_scope
+  end
+
   protected
 
     def assert_name(generator, value, method)
diff --git a/railties/test/generators/scaffold_controller_generator_test.rb b/railties/test/generators/scaffold_controller_generator_test.rb
index 013cb78252..26e56a162c 100644
--- a/railties/test/generators/scaffold_controller_generator_test.rb
+++ b/railties/test/generators/scaffold_controller_generator_test.rb
@@ -166,4 +166,13 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
       assert_match(/render action: 'new'/, content)
     end
   end
+
+  def test_model_name_option
+    run_generator ["Admin::User", "--model-name=User"]
+    assert_file "app/controllers/admin/users_controller.rb" do |content|
+      assert_instance_method :index, content do |m|
+        assert_match("@users = User.all", m)
+      end
+    end
+  end
 end