From 2495a0ba33832d20e3eadc163999dd40123e10c1 Mon Sep 17 00:00:00 2001
From: Benjamin Fleischer <benjamin.fleischer@swipesense.com>
Date: Thu, 12 May 2016 14:21:07 -0500
Subject: Extract notes from files in binary

Prevents:

ArgumentError: invalid byte sequence in UTF-8
railties/lib/rails/source_annotation_extractor.rb:115:in `=~'
railties/lib/rails/source_annotation_extractor.rb:115:in `block in extract_annotations_from'

And there's no reason we need to interpret the files as UTF-8
when scanning for annotations.

Applies to Rails 4.2 as well.
---
 railties/lib/rails/source_annotation_extractor.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/source_annotation_extractor.rb b/railties/lib/rails/source_annotation_extractor.rb
index f0df76d3f3..c60e59cb88 100644
--- a/railties/lib/rails/source_annotation_extractor.rb
+++ b/railties/lib/rails/source_annotation_extractor.rb
@@ -116,7 +116,7 @@ class SourceAnnotationExtractor
   # Otherwise it returns an empty hash.
   def extract_annotations_from(file, pattern)
     lineno = 0
-    result = File.readlines(file).inject([]) do |list, line|
+    result = File.readlines(file, encoding: Encoding::BINARY).inject([]) do |list, line|
       lineno += 1
       next list unless line =~ pattern
       list << Annotation.new(lineno, $1, $2)
-- 
cgit v1.2.3


From 447e1a48811fa053e8bef954376d1ad47bdb5cef Mon Sep 17 00:00:00 2001
From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
Date: Sat, 10 Sep 2016 10:43:09 +0900
Subject: clear all environments log files by default

In #22703, `log:clear` task has been changed to clear only standard environment
log files.
However, it is often to add a non-standard environment(e.g. "staging").
Therefore, I think than it is better to clear all environments log files by default.
---
 railties/lib/rails/tasks/log.rake | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/tasks/log.rake b/railties/lib/rails/tasks/log.rake
index c376234fee..ba796845d7 100644
--- a/railties/lib/rails/tasks/log.rake
+++ b/railties/lib/rails/tasks/log.rake
@@ -3,7 +3,7 @@ namespace :log do
   ##
   # Truncates all/specified log files
   # ENV['LOGS']
-  #   - defaults to standard environment log files i.e. 'development,test,production'
+  #   - defaults to all environments log files i.e. 'development,test,production'
   #   - ENV['LOGS']=all truncates all files i.e. log/*.log
   #   - ENV['LOGS']='test,development' truncates only specified files
   desc "Truncates all/specified *.log files in log/ to zero bytes (specify which logs with LOGS=test,development)"
@@ -19,7 +19,7 @@ namespace :log do
     elsif ENV["LOGS"]
       log_files_to_truncate(ENV["LOGS"])
     else
-      log_files_to_truncate("development,test,production")
+      log_files_to_truncate(all_environments.join(","))
     end
   end
 
@@ -33,4 +33,8 @@ namespace :log do
     f = File.open(file, "w")
     f.close
   end
+
+  def all_environments
+    Dir["config/environments/*.rb"].map { |fname| File.basename(fname, ".*") }
+  end
 end
-- 
cgit v1.2.3


From dffeb3d70cd50b0759a7481f8e83dea5d2b9e7dd Mon Sep 17 00:00:00 2001
From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
Date: Fri, 2 Dec 2016 12:50:51 +0900
Subject: use yarn binstub in `bin/update`

Follow up to 3dac36bd8e26363bb10f4d2a7b21efa75d200e26
---
 railties/lib/rails/generators/rails/app/templates/bin/update.tt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/rails/app/templates/bin/update.tt b/railties/lib/rails/generators/rails/app/templates/bin/update.tt
index 0d8ca2f902..dcd80b6ce5 100644
--- a/railties/lib/rails/generators/rails/app/templates/bin/update.tt
+++ b/railties/lib/rails/generators/rails/app/templates/bin/update.tt
@@ -17,7 +17,7 @@ chdir APP_ROOT do
   system! 'gem install bundler --conservative'
   system('bundle check') || system!('bundle install')
 <% if options[:yarn] %>
-  system! 'yarn'
+  system! 'bin/yarn'
 
 <% end %>
 <% unless options.skip_active_record -%>
-- 
cgit v1.2.3


From 62462d41e87a7e63e8df37efdb092ca3ee5a5a09 Mon Sep 17 00:00:00 2001
From: Koichi ITO <koic.ito@gmail.com>
Date: Fri, 2 Dec 2016 17:23:57 +0800
Subject: Use JavaScripts instead of Javascripts in `rake stats`

---
 railties/lib/rails/tasks/statistics.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/tasks/statistics.rake b/railties/lib/rails/tasks/statistics.rake
index a6cdd1e99c..8265aef10b 100644
--- a/railties/lib/rails/tasks/statistics.rake
+++ b/railties/lib/rails/tasks/statistics.rake
@@ -8,7 +8,7 @@ STATS_DIRECTORIES = [
   %w(Models             app/models),
   %w(Mailers            app/mailers),
   %w(Channels           app/channels),
-  %w(Javascripts        app/assets/javascripts),
+  %w(JavaScripts        app/assets/javascripts),
   %w(Libraries          lib/),
   %w(Tasks              lib/tasks),
   %w(APIs               app/apis),
-- 
cgit v1.2.3


From 5ad8da59a2ab6dca77b498698c522e930cbce20b Mon Sep 17 00:00:00 2001
From: Prathamesh Sonpatki <csonpatki@gmail.com>
Date: Mon, 5 Dec 2016 08:45:02 +0530
Subject: Add fullstop following the pattern used in rest of the file

---
 .../generators/rails/app/templates/config/initializers/assets.rb.tt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt
index bf5399ac2d..29d9df6ad4 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt
@@ -3,7 +3,7 @@
 # Version of your assets, change this if you want to expire all your assets.
 Rails.application.config.assets.version = '1.0'
 
-# Add additional assets to the asset load path
+# Add additional assets to the asset load path.
 # Rails.application.config.assets.paths << Emoji.images_path
 <%- if options[:yarn] -%>
 # Add Yarn node_modules folder to the asset load path.
-- 
cgit v1.2.3


From b6e49a4c0cf20fdd1b74bd0b489f87e90ddd6ad9 Mon Sep 17 00:00:00 2001
From: brchristian <brchristian@gmail.com>
Date: Mon, 5 Dec 2016 16:48:25 -0800
Subject: Update puma.rb

Clarifying some of the language/punctuation and removing a couple comma splices.
---
 .../lib/rails/generators/rails/app/templates/config/puma.rb  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/rails/app/templates/config/puma.rb b/railties/lib/rails/generators/rails/app/templates/config/puma.rb
index 7ee948002e..1e19380dcb 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/puma.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/puma.rb
@@ -1,13 +1,13 @@
 # Puma can serve each request in a thread from an internal thread pool.
-# The `threads` method setting takes two numbers a minimum and maximum.
+# The `threads` method setting takes two numbers: a minimum and maximum.
 # Any libraries that use thread pools should be configured to match
 # the maximum value specified for Puma. Default is set to 5 threads for minimum
-# and maximum, this matches the default thread size of Active Record.
+# and maximum; this matches the default thread size of Active Record.
 #
 threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
 threads threads_count, threads_count
 
-# Specifies the `port` that Puma will listen on to receive requests, default is 3000.
+# Specifies the `port` that Puma will listen on to receive requests; default is 3000.
 #
 port        ENV.fetch("PORT") { 3000 }
 
@@ -42,9 +42,9 @@ environment ENV.fetch("RAILS_ENV") { "development" }
 
 # The code in the `on_worker_boot` will be called if you are using
 # clustered mode by specifying a number of `workers`. After each worker
-# process is booted this block will be run, if you are using `preload_app!`
-# option you will want to use this block to reconnect to any threads
-# or connections that may have been created at application boot, Ruby
+# process is booted, this block will be run. If you are using the `preload_app!`
+# option, you will want to use this block to reconnect to any threads
+# or connections that may have been created at application boot, as Ruby
 # cannot share connections between processes.
 #
 # on_worker_boot do
-- 
cgit v1.2.3


From 0d20530e5edfd7d00fbc2a38ef5f87eca6ccc924 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Thu, 8 Dec 2016 10:33:23 -0800
Subject: Make Yarn the default, drop default vendor/asset directories (#27300)

---
 railties/lib/rails/generators/app_base.rb          | 53 +---------------------
 .../rails/generators/rails/app/app_generator.rb    | 33 ++++----------
 .../app/assets/javascripts/application.js.tt       |  4 +-
 .../app/assets/stylesheets/application.css         |  4 +-
 .../generators/rails/app/templates/bin/setup.tt    |  4 +-
 .../generators/rails/app/templates/bin/update.tt   |  4 +-
 .../app/templates/config/initializers/assets.rb.tt |  2 +-
 .../rails/generators/rails/app/templates/gitignore |  2 +-
 8 files changed, 22 insertions(+), 84 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 87f6f01750..aba68d6db2 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -33,8 +33,8 @@ module Rails
         class_option :javascript,         type: :string, aliases: "-j",
                                           desc: "Preconfigure for selected JavaScript library"
 
-        class_option :yarn,               type: :boolean, default: false,
-                                          desc: "Preconfigure for assets management with Yarn"
+        class_option :skip_yarn,          type: :boolean, default: false,
+                                          desc: "Don't use Yarn for managing JavaScript dependencies"
 
         class_option :skip_gemfile,       type: :boolean, default: false,
                                           desc: "Don't create a Gemfile"
@@ -414,55 +414,6 @@ module Rails
         bundle_command("install") if bundle_install?
       end
 
-      def run_yarn
-        if package_json_exist?
-          if yarn_path
-            say_status :run, "yarn install"
-            yarn_command("install")
-          else
-            say_status :warning, "yarn option passed but Yarn executable was not detected in the system.", :yellow
-            say_status :warning, "Download Yarn at https://yarnpkg.com/en/docs/install", :yellow
-          end
-        end
-      end
-
-      def package_json_exist?
-        File.exist?("vendor/package.json")
-      end
-
-      def yarn_path
-        commands = ["yarn"]
-
-        if Gem.win_platform?
-          ENV["PATHEXT"].split(File::PATH_SEPARATOR).each do |ext|
-            commands << commands[0] + ext
-          end
-        end
-
-        yarn_path = commands.find do |cmd|
-          paths = ENV["PATH"].split(File::PATH_SEPARATOR)
-
-          path = paths.find do |p|
-            full_path = File.expand_path(cmd, p)
-            File.executable?(full_path) && File.file?(full_path)
-          end
-
-          path && File.expand_path(cmd, path)
-        end
-
-        yarn_path
-      end
-
-      def yarn_command(command)
-        full_command = "#{yarn_path} #{command}"
-
-        if options[:quiet]
-          system(full_command, out: File::NULL)
-        else
-          system(full_command)
-        end
-      end
-
       def generate_spring_binstubs
         if bundle_install? && spring_install?
           bundle_command("exec spring binstub --all")
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index 49d23d682a..20bc45fee8 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -53,10 +53,6 @@ module Rails
       template "gitignore", ".gitignore"
     end
 
-    def packagejson
-      template "package.json", "vendor/package.json"
-    end
-
     def app
       directory "app"
 
@@ -155,23 +151,12 @@ module Rails
     end
 
     def vendor
-      if options[:yarn]
-        empty_directory_with_keep_file "vendor"
-      else
-        vendor_javascripts
-        vendor_stylesheets
-      end
-    end
+      empty_directory_with_keep_file "vendor"
 
-    def vendor_javascripts
-      unless options[:skip_javascript]
-        empty_directory_with_keep_file "vendor/assets/javascripts"
+      unless options[:skip_yarn]
+        template "package.json", "vendor/package.json"
       end
     end
-
-    def vendor_stylesheets
-      empty_directory_with_keep_file "vendor/assets/stylesheets"
-    end
   end
 
   module Generators
@@ -213,9 +198,8 @@ module Rails
         build(:readme)
         build(:rakefile)
         build(:configru)
-        build(:packagejson) if options[:yarn]
-        build(:gitignore) unless options[:skip_git]
-        build(:gemfile)   unless options[:skip_gemfile]
+        build(:gitignore)   unless options[:skip_git]
+        build(:gemfile)     unless options[:skip_gemfile]
       end
 
       def create_app_files
@@ -276,6 +260,10 @@ module Rails
 
       def create_vendor_files
         build(:vendor)
+
+        if options[:skip_yarn]
+          remove_file "vendor/package.json"
+        end
       end
 
       def delete_app_assets_if_api_option
@@ -283,7 +271,6 @@ module Rails
           remove_dir "app/assets"
           remove_dir "lib/assets"
           remove_dir "tmp/cache/assets"
-          remove_dir "vendor/assets"
         end
       end
 
@@ -364,7 +351,7 @@ module Rails
       end
 
       public_task :apply_rails_template, :run_bundle
-      public_task :run_yarn, :generate_spring_binstubs
+      public_task :generate_spring_binstubs
 
       def run_after_bundle_callbacks
         @after_bundle_callbacks.each(&:call)
diff --git a/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt b/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt
index 8db5b7e075..25870f19c8 100644
--- a/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt
+++ b/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt
@@ -1,8 +1,8 @@
 // This is a manifest file that'll be compiled into application.js, which will include all the files
 // listed below.
 //
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's 
+// vendor/assets/javascripts directory can be referenced here using a relative path.
 //
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
 // compiled file. JavaScript code in this file should be added after the last require_* statement.
diff --git a/railties/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css b/railties/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css
index 0ebd7fe829..865300bef9 100644
--- a/railties/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css
+++ b/railties/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css
@@ -2,8 +2,8 @@
  * This is a manifest file that'll be compiled into application.css, which will include all the files
  * listed below.
  *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's 
+ * vendor/assets/stylesheets directory can be referenced here using a relative path.
  *
  * You're free to add application-wide styles to this file and they'll appear at the bottom of the
  * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
diff --git a/railties/lib/rails/generators/rails/app/templates/bin/setup.tt b/railties/lib/rails/generators/rails/app/templates/bin/setup.tt
index 73b0732463..e4ba83a129 100644
--- a/railties/lib/rails/generators/rails/app/templates/bin/setup.tt
+++ b/railties/lib/rails/generators/rails/app/templates/bin/setup.tt
@@ -16,8 +16,8 @@ chdir APP_ROOT do
   puts '== Installing dependencies =='
   system! 'gem install bundler --conservative'
   system('bundle check') || system!('bundle install')
-<% if options[:yarn] %>
-  system! 'bin/yarn'
+<% unless options[:skip_yarn] %>
+  system('bin/yarn') # Ignore failure from yarn not being installed
 
 <% end %>
 <% unless options.skip_active_record -%>
diff --git a/railties/lib/rails/generators/rails/app/templates/bin/update.tt b/railties/lib/rails/generators/rails/app/templates/bin/update.tt
index dcd80b6ce5..cc188315a8 100644
--- a/railties/lib/rails/generators/rails/app/templates/bin/update.tt
+++ b/railties/lib/rails/generators/rails/app/templates/bin/update.tt
@@ -16,8 +16,8 @@ chdir APP_ROOT do
   puts '== Installing dependencies =='
   system! 'gem install bundler --conservative'
   system('bundle check') || system!('bundle install')
-<% if options[:yarn] %>
-  system! 'bin/yarn'
+<% unless options[:skip_yarn] %>
+  system('bin/yarn') # Ignore failure from yarn not being installed
 
 <% end %>
 <% unless options.skip_active_record -%>
diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt
index 29d9df6ad4..f5d03fb117 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt
@@ -5,7 +5,7 @@ Rails.application.config.assets.version = '1.0'
 
 # Add additional assets to the asset load path.
 # Rails.application.config.assets.paths << Emoji.images_path
-<%- if options[:yarn] -%>
+<%- unless options[:skip_yarn] -%>
 # Add Yarn node_modules folder to the asset load path.
 Rails.application.config.assets.paths << Rails.root.join('vendor/node_modules')
 <%- end -%>
diff --git a/railties/lib/rails/generators/rails/app/templates/gitignore b/railties/lib/rails/generators/rails/app/templates/gitignore
index dee42ebb87..709b341387 100644
--- a/railties/lib/rails/generators/rails/app/templates/gitignore
+++ b/railties/lib/rails/generators/rails/app/templates/gitignore
@@ -21,7 +21,7 @@
 !/tmp/.keep
 <% end -%>
 
-<% if options[:yarn] -%>
+<% unless options[:skip_yarn] -%>
 /vendor/node_modules
 
 <% end -%>
-- 
cgit v1.2.3


From fbd33b911acd5a4487f37dc1df2aad439c090bfa Mon Sep 17 00:00:00 2001
From: Yuji Yaginuma <yuuji.yaginuma@gmail.com>
Date: Fri, 9 Dec 2016 12:07:40 +0900
Subject: specify `skip_yarn` option in API-only Application (#27309)

---
 railties/lib/rails/generators/rails/app/app_generator.rb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index 20bc45fee8..a8586d56dd 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -186,9 +186,11 @@ module Rails
           raise Error, "Invalid value for --database option. Supported for preconfiguration are: #{DATABASES.join(", ")}."
         end
 
-        # Force sprockets to be skipped when generating API only apps.
+        # Force sprockets and yarn to be skipped when generating API only apps.
         # Can't modify options hash as it's frozen by default.
-        self.options = options.merge(skip_sprockets: true, skip_javascript: true).freeze if options[:api]
+        if options[:api]
+          self.options = options.merge(skip_sprockets: true, skip_javascript: true, skip_yarn: true).freeze
+        end
       end
 
       public_task :set_default_accessors!
@@ -346,6 +348,10 @@ module Rails
         end
       end
 
+      def delete_bin_yarn_if_api_option
+        remove_file "bin/yarn" if options[:api]
+      end
+
       def finish_template
         build(:leftovers)
       end
-- 
cgit v1.2.3


From c873746c506e193cf6294d8919d464997d54eadb Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Thu, 8 Dec 2016 19:49:15 -0800
Subject: Only have Yarn bundling commented out as we cant be sure Yarn is
 installed

---
 railties/lib/rails/generators/rails/app/templates/bin/setup.tt  | 3 ++-
 railties/lib/rails/generators/rails/app/templates/bin/update.tt | 4 ----
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/rails/app/templates/bin/setup.tt b/railties/lib/rails/generators/rails/app/templates/bin/setup.tt
index e4ba83a129..c6607dbb2b 100644
--- a/railties/lib/rails/generators/rails/app/templates/bin/setup.tt
+++ b/railties/lib/rails/generators/rails/app/templates/bin/setup.tt
@@ -17,7 +17,8 @@ chdir APP_ROOT do
   system! 'gem install bundler --conservative'
   system('bundle check') || system!('bundle install')
 <% unless options[:skip_yarn] %>
-  system('bin/yarn') # Ignore failure from yarn not being installed
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
 
 <% end %>
 <% unless options.skip_active_record -%>
diff --git a/railties/lib/rails/generators/rails/app/templates/bin/update.tt b/railties/lib/rails/generators/rails/app/templates/bin/update.tt
index cc188315a8..d23af018c7 100644
--- a/railties/lib/rails/generators/rails/app/templates/bin/update.tt
+++ b/railties/lib/rails/generators/rails/app/templates/bin/update.tt
@@ -16,10 +16,6 @@ chdir APP_ROOT do
   puts '== Installing dependencies =='
   system! 'gem install bundler --conservative'
   system('bundle check') || system!('bundle install')
-<% unless options[:skip_yarn] %>
-  system('bin/yarn') # Ignore failure from yarn not being installed
-
-<% end %>
 <% unless options.skip_active_record -%>
   puts "\n== Updating database =="
   system! 'bin/rails db:migrate'
-- 
cgit v1.2.3


From 872faa958398fa5aaf6b0e4cd6a8090503d6885a Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Fri, 9 Dec 2016 10:46:28 -0500
Subject: Show message if Yarn is not installed (#27312)

---
 railties/lib/rails/generators/rails/app/templates/bin/yarn | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/rails/app/templates/bin/yarn b/railties/lib/rails/generators/rails/app/templates/bin/yarn
index cf48e2e5b7..872438cecb 100644
--- a/railties/lib/rails/generators/rails/app/templates/bin/yarn
+++ b/railties/lib/rails/generators/rails/app/templates/bin/yarn
@@ -1,2 +1,9 @@
 VENDOR_PATH = File.expand_path('../vendor', __dir__)
-Dir.chdir(VENDOR_PATH) { exec "yarnpkg #{ARGV.join(" ")}" }
+Dir.chdir(VENDOR_PATH) do
+  begin
+    exec "yarnpkg #{ARGV.join(" ")}"
+  rescue Errno::ENOENT
+    puts "Yarn executable was not detected in the system."
+    puts "Download Yarn at https://yarnpkg.com/en/docs/install"
+  end
+end
-- 
cgit v1.2.3


From 8c947eb6e95f50ae88e19c0f036bd4a3d3b2dece Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Fri, 9 Dec 2016 12:19:43 -0800
Subject: Basic --webpack delegation to new webpacker gem (#27288)

---
 railties/lib/rails/generators/app_base.rb                | 15 +++++++++++++++
 railties/lib/rails/generators/rails/app/app_generator.rb |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index aba68d6db2..2f7339e7f5 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -33,6 +33,9 @@ module Rails
         class_option :javascript,         type: :string, aliases: "-j",
                                           desc: "Preconfigure for selected JavaScript library"
 
+        class_option :webpack,            type: :boolean, default: false,
+                                          desc: "Preconfigure for app-like JavaScript with Webpack"
+
         class_option :skip_yarn,          type: :boolean, default: false,
                                           desc: "Don't use Yarn for managing JavaScript dependencies"
 
@@ -128,6 +131,7 @@ module Rails
          database_gemfile_entry,
          webserver_gemfile_entry,
          assets_gemfile_entry,
+         webpacker_gemfile_entry,
          javascript_gemfile_entry,
          jbuilder_gemfile_entry,
          psych_gemfile_entry,
@@ -315,6 +319,13 @@ module Rails
         gems
       end
 
+      def webpacker_gemfile_entry
+        if options[:webpack]
+          comment = "Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker"
+          GemfileEntry.new "webpacker", "~> 0.1", comment
+        end
+      end
+
       def jbuilder_gemfile_entry
         comment = "Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder"
         GemfileEntry.new "jbuilder", "~> 2.5", comment, {}, options[:api]
@@ -414,6 +425,10 @@ module Rails
         bundle_command("install") if bundle_install?
       end
 
+      def run_webpack
+        rails_command "webpacker:install"
+      end
+
       def generate_spring_binstubs
         if bundle_install? && spring_install?
           bundle_command("exec spring binstub --all")
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index a8586d56dd..19d3ba2f0f 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -357,7 +357,7 @@ module Rails
       end
 
       public_task :apply_rails_template, :run_bundle
-      public_task :generate_spring_binstubs
+      public_task :run_webpack, :generate_spring_binstubs
 
       def run_after_bundle_callbacks
         @after_bundle_callbacks.each(&:call)
-- 
cgit v1.2.3


From ecddc0468d6cacd06faaa474d11f96f41b17ac78 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Fri, 9 Dec 2016 13:33:45 -0800
Subject: Use GitHub webpacker until closer to release

---
 railties/lib/rails/generators/app_base.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 2f7339e7f5..187f4555a2 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -322,7 +322,7 @@ module Rails
       def webpacker_gemfile_entry
         if options[:webpack]
           comment = "Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker"
-          GemfileEntry.new "webpacker", "~> 0.1", comment
+          GemfileEntry.github "webpacker", "rails/webpacker", nil, comment
         end
       end
 
-- 
cgit v1.2.3


From c16296c79556ac660a0d7bd2df95e348a9e8df31 Mon Sep 17 00:00:00 2001
From: Yuji Yaginuma <yuuji.yaginuma@gmail.com>
Date: Sat, 10 Dec 2016 09:21:28 +0900
Subject: gemfile entry method need to return an empty array rather than nil
 (#27318)

This fixes the following error when executing rails new command.

```
(erb):9:in `block in template': undefined method `comment' for nil:NilClass (NoMethodError)
```

Follow up to #27288
---
 railties/lib/rails/generators/app_base.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 187f4555a2..578aa23513 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -320,10 +320,10 @@ module Rails
       end
 
       def webpacker_gemfile_entry
-        if options[:webpack]
-          comment = "Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker"
-          GemfileEntry.github "webpacker", "rails/webpacker", nil, comment
-        end
+        return [] unless options[:webpack]
+
+        comment = "Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker"
+        GemfileEntry.github "webpacker", "rails/webpacker", nil, comment
       end
 
       def jbuilder_gemfile_entry
-- 
cgit v1.2.3


From c2c840fa6b66a43959901235ca7b3995528e4dac Mon Sep 17 00:00:00 2001
From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
Date: Sat, 10 Dec 2016 10:46:24 +0900
Subject: run `webpack` command only when webpack option is specified

---
 railties/lib/rails/generators/app_base.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 578aa23513..576c36fc86 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -426,7 +426,7 @@ module Rails
       end
 
       def run_webpack
-        rails_command "webpacker:install"
+        rails_command "webpacker:install" if options[:webpack]
       end
 
       def generate_spring_binstubs
-- 
cgit v1.2.3


From f1878baad5e8f6bc49d1c37dd5afb917b79985f4 Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Mon, 12 Dec 2016 20:28:39 +0900
Subject: :nail_care:

Don't expect the caller of this method to know that the return value has an extra "  "
---
 .../lib/rails/generators/rails/controller/controller_generator.rb     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/rails/controller/controller_generator.rb b/railties/lib/rails/generators/rails/controller/controller_generator.rb
index ced3c85c00..4f60e44888 100644
--- a/railties/lib/rails/generators/rails/controller/controller_generator.rb
+++ b/railties/lib/rails/generators/rails/controller/controller_generator.rb
@@ -16,7 +16,7 @@ module Rails
         unless options[:skip_routes]
           actions.reverse_each do |action|
             # route prepends two spaces onto the front of the string that is passed, this corrects that.
-            route generate_routing_code(action)[2..-1]
+            route generate_routing_code(action)
           end
         end
       end
@@ -40,7 +40,7 @@ module Rails
           #   namespace :bar do
           namespace_ladder = regular_class_path.each_with_index.map do |ns, i|
             indent("  namespace :#{ns} do\n", i * 2)
-          end.join
+          end.join[2..-1]
 
           # Create route
           #     get 'baz/index'
-- 
cgit v1.2.3


From edf4bff77cfc157afe7201a45c6b16652cdcceb8 Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Mon, 12 Dec 2016 21:34:22 +0900
Subject: Oops!

namespace_ladder can be nil here
---
 railties/lib/rails/generators/rails/controller/controller_generator.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/rails/controller/controller_generator.rb b/railties/lib/rails/generators/rails/controller/controller_generator.rb
index 4f60e44888..01214dc919 100644
--- a/railties/lib/rails/generators/rails/controller/controller_generator.rb
+++ b/railties/lib/rails/generators/rails/controller/controller_generator.rb
@@ -54,7 +54,7 @@ module Rails
           end.join
 
           # Combine the 3 parts to generate complete route entry
-          namespace_ladder + route + end_ladder
+          "#{namespace_ladder}#{route}#{end_ladder}"
         end
     end
   end
-- 
cgit v1.2.3


From cfdf6e13689c67a108b1f3980f59a4e3933369c3 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Mon, 12 Dec 2016 11:07:28 -0800
Subject: Add option to trigger JS framework-specific installation as part of
 webpack setup

---
 railties/lib/rails/generators/app_base.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 576c36fc86..b94630de15 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -33,7 +33,7 @@ module Rails
         class_option :javascript,         type: :string, aliases: "-j",
                                           desc: "Preconfigure for selected JavaScript library"
 
-        class_option :webpack,            type: :boolean, default: false,
+        class_option :webpack,            type: :string, default: "base",
                                           desc: "Preconfigure for app-like JavaScript with Webpack"
 
         class_option :skip_yarn,          type: :boolean, default: false,
@@ -426,7 +426,10 @@ module Rails
       end
 
       def run_webpack
-        rails_command "webpacker:install" if options[:webpack]
+        if !(webpack = options[:webpack]).nil?
+          rails_command "webpacker:install"
+          rails_command "webpacker:install:#{webpack}" unless webpack == "base"
+        end
       end
 
       def generate_spring_binstubs
-- 
cgit v1.2.3


From 1373f9bdcf725f75832dc7401994cc76113a8a4e Mon Sep 17 00:00:00 2001
From: Kasper Timm Hansen <kaspth@gmail.com>
Date: Mon, 12 Dec 2016 21:10:50 +0100
Subject: Don't assign a default to `webpack`.

Unintentionally makes `--webpack` implied on `rails new apper`.

If passed `--webpack` Thor assigns `"webpack"` to `options[:webpack]`,
so we can check for that instead of `"base"`.
---
 railties/lib/rails/generators/app_base.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index b94630de15..15cc070e35 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -33,7 +33,7 @@ module Rails
         class_option :javascript,         type: :string, aliases: "-j",
                                           desc: "Preconfigure for selected JavaScript library"
 
-        class_option :webpack,            type: :string, default: "base",
+        class_option :webpack,            type: :string, default: nil,
                                           desc: "Preconfigure for app-like JavaScript with Webpack"
 
         class_option :skip_yarn,          type: :boolean, default: false,
@@ -428,7 +428,7 @@ module Rails
       def run_webpack
         if !(webpack = options[:webpack]).nil?
           rails_command "webpacker:install"
-          rails_command "webpacker:install:#{webpack}" unless webpack == "base"
+          rails_command "webpacker:install:#{webpack}" unless webpack == "webpack"
         end
       end
 
-- 
cgit v1.2.3


From 92dae5dfda9b72e748bb00f38603e8fda403089a Mon Sep 17 00:00:00 2001
From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
Date: Wed, 14 Dec 2016 11:11:32 +0900
Subject: use appropriate type for `rc` option

This fixes the following warning.

```
Expected boolean default value for '--rc'; got "~/.railsrc" (string)
```
---
 railties/lib/rails/commands/plugin/plugin_command.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/commands/plugin/plugin_command.rb b/railties/lib/rails/commands/plugin/plugin_command.rb
index 16587ce067..b40ab006af 100644
--- a/railties/lib/rails/commands/plugin/plugin_command.rb
+++ b/railties/lib/rails/commands/plugin/plugin_command.rb
@@ -11,7 +11,7 @@ module Rails
         "#{executable} new [options]"
       end
 
-      class_option :rc, type: :boolean, default: File.join("~", ".railsrc"),
+      class_option :rc, type: :string, default: File.join("~", ".railsrc"),
         desc: "Initialize the plugin command with previous defaults. Uses .railsrc in your home directory by default."
 
       class_option :no_rc, desc: "Skip evaluating .railsrc."
-- 
cgit v1.2.3


From a0d4d78884a6e7c89b582e9555ed2bb30db9d438 Mon Sep 17 00:00:00 2001
From: Fumiaki MATSUSHIMA <mtsmfm@gmail.com>
Date: Wed, 14 Dec 2016 19:09:01 +0900
Subject: Remove unused method `namespaced_file_path`

```
$ git grep namespaced_file_path
railties/lib/rails/generators/named_base.rb:        def namespaced_file_path
railties/lib/rails/generators/named_base.rb:          @namespaced_file_path ||= namespaced_class_path.join("/")
```
---
 railties/lib/rails/generators/named_base.rb | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/named_base.rb b/railties/lib/rails/generators/named_base.rb
index 45f2fba5b9..70f63dc672 100644
--- a/railties/lib/rails/generators/named_base.rb
+++ b/railties/lib/rails/generators/named_base.rb
@@ -90,10 +90,6 @@ module Rails
           @class_path
         end
 
-        def namespaced_file_path
-          @namespaced_file_path ||= namespaced_class_path.join("/")
-        end
-
         def namespaced_class_path
           @namespaced_class_path ||= [namespaced_path] + @class_path
         end
-- 
cgit v1.2.3


From fa69b2c03582f5817572050a4373e365d9071b5d Mon Sep 17 00:00:00 2001
From: Jon Moss <me@jonathanmoss.me>
Date: Fri, 16 Dec 2016 20:10:21 -0500
Subject: `ARGV.shift` before calling Rails generators

Gems like rspec-rails depend on `ARGV` being shifted, and `scaffold`
(for example) not being the first item in `ARGV`. This should allow
rspec-rails to be passing on Rails master.
---
 railties/lib/rails/commands/generate/generate_command.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/commands/generate/generate_command.rb b/railties/lib/rails/commands/generate/generate_command.rb
index 59b2febc43..aa8dab71b0 100644
--- a/railties/lib/rails/commands/generate/generate_command.rb
+++ b/railties/lib/rails/commands/generate/generate_command.rb
@@ -14,6 +14,8 @@ module Rails
         require_application_and_environment!
         load_generators
 
+        ARGV.shift
+
         Rails::Generators.invoke generator, args, behavior: :invoke, destination_root: Rails::Command.root
       end
     end
-- 
cgit v1.2.3


From 21e5fd4a2a1c162ad33708d3e01b1fda165f204d Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Mon, 19 Dec 2016 19:10:49 +0900
Subject: Describe what we are protecting

---
 railties/lib/rails/generators/named_base.rb       | 2 ++
 railties/lib/rails/generators/resource_helpers.rb | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/named_base.rb b/railties/lib/rails/generators/named_base.rb
index 70f63dc672..7b9095c7b1 100644
--- a/railties/lib/rails/generators/named_base.rb
+++ b/railties/lib/rails/generators/named_base.rb
@@ -32,6 +32,8 @@ module Rails
         end
       end
 
+      # TODO Change this to private once we've dropped Ruby 2.2 support.
+      # Workaround for Ruby 2.2 "private attribute?" warning.
       protected
         attr_reader :file_name
 
diff --git a/railties/lib/rails/generators/resource_helpers.rb b/railties/lib/rails/generators/resource_helpers.rb
index a28977319a..bbfda09bb4 100644
--- a/railties/lib/rails/generators/resource_helpers.rb
+++ b/railties/lib/rails/generators/resource_helpers.rb
@@ -23,6 +23,8 @@ module Rails
         assign_controller_names!(controller_name.pluralize)
       end
 
+      # TODO Change this to private once we've dropped Ruby 2.2 support.
+      # Workaround for Ruby 2.2 "private attribute?" warning.
       protected
 
         attr_reader :controller_name, :controller_file_name
-- 
cgit v1.2.3


From 87ec7009bfdaad292a18b8bbdc9b25522bb9b1a1 Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Sat, 24 Dec 2016 23:53:46 +0900
Subject: `protected` here doesn't protect anything

there aren't any instance method defined in this class
---
 railties/lib/rails/generators.rb | 51 ++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 26 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index 67037106e5..28f8078a9d 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -275,38 +275,37 @@ module Rails
       end
     end
 
-    protected
-      def self.print_list(base, namespaces)
-        namespaces = namespaces.reject { |n| hidden_namespaces.include?(n) }
-        super
-      end
-
-      # Try fallbacks for the given base.
-      def self.invoke_fallbacks_for(name, base) #:nodoc:
-        return nil unless base && fallbacks[base.to_sym]
-        invoked_fallbacks = []
+    def self.print_list(base, namespaces)
+      namespaces = namespaces.reject { |n| hidden_namespaces.include?(n) }
+      super
+    end
 
-        Array(fallbacks[base.to_sym]).each do |fallback|
-          next if invoked_fallbacks.include?(fallback)
-          invoked_fallbacks << fallback
+    # Try fallbacks for the given base.
+    def self.invoke_fallbacks_for(name, base) #:nodoc:
+      return nil unless base && fallbacks[base.to_sym]
+      invoked_fallbacks = []
 
-          klass = find_by_namespace(name, fallback)
-          return klass if klass
-        end
+      Array(fallbacks[base.to_sym]).each do |fallback|
+        next if invoked_fallbacks.include?(fallback)
+        invoked_fallbacks << fallback
 
-        nil
+        klass = find_by_namespace(name, fallback)
+        return klass if klass
       end
 
-      def self.command_type
-        @command_type ||= "generator"
-      end
+      nil
+    end
 
-      def self.lookup_paths
-        @lookup_paths ||= %w( rails/generators generators )
-      end
+    def self.command_type
+      @command_type ||= "generator"
+    end
 
-      def self.file_lookup_paths
-        @file_lookup_paths ||= [ "{#{lookup_paths.join(',')}}", "**", "*_generator.rb" ]
-      end
+    def self.lookup_paths
+      @lookup_paths ||= %w( rails/generators generators )
+    end
+
+    def self.file_lookup_paths
+      @file_lookup_paths ||= [ "{#{lookup_paths.join(',')}}", "**", "*_generator.rb" ]
+    end
   end
 end
-- 
cgit v1.2.3


From f9caa5a6dd99275aa9400ab64813a850a26a0386 Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Sat, 24 Dec 2016 23:58:00 +0900
Subject: Prefer class << self; def over def self.

---
 railties/lib/rails/generators.rb | 400 +++++++++++++++++++--------------------
 1 file changed, 200 insertions(+), 200 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index 28f8078a9d..04f4908f52 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -67,245 +67,245 @@ module Rails
       }
     }
 
-    def self.configure!(config) #:nodoc:
-      api_only! if config.api_only
-      no_color! unless config.colorize_logging
-      aliases.deep_merge! config.aliases
-      options.deep_merge! config.options
-      fallbacks.merge! config.fallbacks
-      templates_path.concat config.templates
-      templates_path.uniq!
-      hide_namespaces(*config.hidden_namespaces)
-    end
+    class << self
+      def configure!(config) #:nodoc:
+        api_only! if config.api_only
+        no_color! unless config.colorize_logging
+        aliases.deep_merge! config.aliases
+        options.deep_merge! config.options
+        fallbacks.merge! config.fallbacks
+        templates_path.concat config.templates
+        templates_path.uniq!
+        hide_namespaces(*config.hidden_namespaces)
+      end
 
-    def self.templates_path #:nodoc:
-      @templates_path ||= []
-    end
+      def templates_path #:nodoc:
+        @templates_path ||= []
+      end
 
-    def self.aliases #:nodoc:
-      @aliases ||= DEFAULT_ALIASES.dup
-    end
+      def aliases #:nodoc:
+        @aliases ||= DEFAULT_ALIASES.dup
+      end
 
-    def self.options #:nodoc:
-      @options ||= DEFAULT_OPTIONS.dup
-    end
+      def options #:nodoc:
+        @options ||= DEFAULT_OPTIONS.dup
+      end
 
-    # Hold configured generators fallbacks. If a plugin developer wants a
-    # generator group to fallback to another group in case of missing generators,
-    # they can add a fallback.
-    #
-    # For example, shoulda is considered a test_framework and is an extension
-    # of test_unit. However, most part of shoulda generators are similar to
-    # test_unit ones.
-    #
-    # Shoulda then can tell generators to search for test_unit generators when
-    # some of them are not available by adding a fallback:
-    #
-    #   Rails::Generators.fallbacks[:shoulda] = :test_unit
-    def self.fallbacks
-      @fallbacks ||= {}
-    end
+      # Hold configured generators fallbacks. If a plugin developer wants a
+      # generator group to fallback to another group in case of missing generators,
+      # they can add a fallback.
+      #
+      # For example, shoulda is considered a test_framework and is an extension
+      # of test_unit. However, most part of shoulda generators are similar to
+      # test_unit ones.
+      #
+      # Shoulda then can tell generators to search for test_unit generators when
+      # some of them are not available by adding a fallback:
+      #
+      #   Rails::Generators.fallbacks[:shoulda] = :test_unit
+      def fallbacks
+        @fallbacks ||= {}
+      end
 
-    # Configure generators for API only applications. It basically hides
-    # everything that is usually browser related, such as assets and session
-    # migration generators, and completely disable helpers and assets
-    # so generators such as scaffold won't create them.
-    def self.api_only!
-      hide_namespaces "assets", "helper", "css", "js"
-
-      options[:rails].merge!(
-        api: true,
-        assets: false,
-        helper: false,
-        template_engine: nil
-      )
-
-      if ARGV.first == "mailer"
-        options[:rails].merge!(template_engine: :erb)
+      # Configure generators for API only applications. It basically hides
+      # everything that is usually browser related, such as assets and session
+      # migration generators, and completely disable helpers and assets
+      # so generators such as scaffold won't create them.
+      def api_only!
+        hide_namespaces "assets", "helper", "css", "js"
+
+        options[:rails].merge!(
+          api: true,
+          assets: false,
+          helper: false,
+          template_engine: nil
+        )
+
+        if ARGV.first == "mailer"
+          options[:rails].merge!(template_engine: :erb)
+        end
       end
-    end
 
-    # Remove the color from output.
-    def self.no_color!
-      Thor::Base.shell = Thor::Shell::Basic
-    end
+      # Remove the color from output.
+      def no_color!
+        Thor::Base.shell = Thor::Shell::Basic
+      end
 
-    # Returns an array of generator namespaces that are hidden.
-    # Generator namespaces may be hidden for a variety of reasons.
-    # Some are aliased such as "rails:migration" and can be
-    # invoked with the shorter "migration", others are private to other generators
-    # such as "css:scaffold".
-    def self.hidden_namespaces
-      @hidden_namespaces ||= begin
-        orm      = options[:rails][:orm]
-        test     = options[:rails][:test_framework]
-        template = options[:rails][:template_engine]
-        css      = options[:rails][:stylesheet_engine]
-
-        [
-          "rails",
-          "resource_route",
-          "#{orm}:migration",
-          "#{orm}:model",
-          "#{test}:controller",
-          "#{test}:helper",
-          "#{test}:integration",
-          "#{test}:mailer",
-          "#{test}:model",
-          "#{test}:scaffold",
-          "#{test}:view",
-          "#{test}:job",
-          "#{template}:controller",
-          "#{template}:scaffold",
-          "#{template}:mailer",
-          "#{css}:scaffold",
-          "#{css}:assets",
-          "css:assets",
-          "css:scaffold"
-        ]
+      # Returns an array of generator namespaces that are hidden.
+      # Generator namespaces may be hidden for a variety of reasons.
+      # Some are aliased such as "rails:migration" and can be
+      # invoked with the shorter "migration", others are private to other generators
+      # such as "css:scaffold".
+      def hidden_namespaces
+        @hidden_namespaces ||= begin
+          orm      = options[:rails][:orm]
+          test     = options[:rails][:test_framework]
+          template = options[:rails][:template_engine]
+          css      = options[:rails][:stylesheet_engine]
+
+          [
+            "rails",
+            "resource_route",
+            "#{orm}:migration",
+            "#{orm}:model",
+            "#{test}:controller",
+            "#{test}:helper",
+            "#{test}:integration",
+            "#{test}:mailer",
+            "#{test}:model",
+            "#{test}:scaffold",
+            "#{test}:view",
+            "#{test}:job",
+            "#{template}:controller",
+            "#{template}:scaffold",
+            "#{template}:mailer",
+            "#{css}:scaffold",
+            "#{css}:assets",
+            "css:assets",
+            "css:scaffold"
+          ]
+        end
       end
-    end
 
-    class << self
       def hide_namespaces(*namespaces)
         hidden_namespaces.concat(namespaces)
       end
       alias hide_namespace hide_namespaces
-    end
 
-    # Show help message with available generators.
-    def self.help(command = "generate")
-      puts "Usage: rails #{command} GENERATOR [args] [options]"
-      puts
-      puts "General options:"
-      puts "  -h, [--help]     # Print generator's options and usage"
-      puts "  -p, [--pretend]  # Run but do not make any changes"
-      puts "  -f, [--force]    # Overwrite files that already exist"
-      puts "  -s, [--skip]     # Skip files that already exist"
-      puts "  -q, [--quiet]    # Suppress status output"
-      puts
-      puts "Please choose a generator below."
-      puts
-
-      print_generators
-    end
+      # Show help message with available generators.
+      def help(command = "generate")
+        puts "Usage: rails #{command} GENERATOR [args] [options]"
+        puts
+        puts "General options:"
+        puts "  -h, [--help]     # Print generator's options and usage"
+        puts "  -p, [--pretend]  # Run but do not make any changes"
+        puts "  -f, [--force]    # Overwrite files that already exist"
+        puts "  -s, [--skip]     # Skip files that already exist"
+        puts "  -q, [--quiet]    # Suppress status output"
+        puts
+        puts "Please choose a generator below."
+        puts
+
+        print_generators
+      end
 
-    def self.public_namespaces
-      lookup!
-      subclasses.map(&:namespace)
-    end
+      def public_namespaces
+        lookup!
+        subclasses.map(&:namespace)
+      end
 
-    def self.print_generators
-      sorted_groups.each { |b, n| print_list(b, n) }
-    end
+      def print_generators
+        sorted_groups.each { |b, n| print_list(b, n) }
+      end
 
-    def self.sorted_groups
-      namespaces = public_namespaces
-      namespaces.sort!
+      def sorted_groups
+        namespaces = public_namespaces
+        namespaces.sort!
 
-      groups = Hash.new { |h, k| h[k] = [] }
-      namespaces.each do |namespace|
-        base = namespace.split(":").first
-        groups[base] << namespace
-      end
+        groups = Hash.new { |h, k| h[k] = [] }
+        namespaces.each do |namespace|
+          base = namespace.split(":").first
+          groups[base] << namespace
+        end
 
-      rails = groups.delete("rails")
-      rails.map! { |n| n.sub(/^rails:/, "") }
-      rails.delete("app")
-      rails.delete("plugin")
+        rails = groups.delete("rails")
+        rails.map! { |n| n.sub(/^rails:/, "") }
+        rails.delete("app")
+        rails.delete("plugin")
 
-      hidden_namespaces.each { |n| groups.delete(n.to_s) }
+        hidden_namespaces.each { |n| groups.delete(n.to_s) }
 
-      [[ "rails", rails ]] + groups.sort.to_a
-    end
+        [[ "rails", rails ]] + groups.sort.to_a
+      end
 
-    # Rails finds namespaces similar to thor, it only adds one rule:
-    #
-    # Generators names must end with "_generator.rb". This is required because Rails
-    # looks in load paths and loads the generator just before it's going to be used.
-    #
-    #   find_by_namespace :webrat, :rails, :integration
-    #
-    # Will search for the following generators:
-    #
-    #   "rails:webrat", "webrat:integration", "webrat"
-    #
-    # Notice that "rails:generators:webrat" could be loaded as well, what
-    # Rails looks for is the first and last parts of the namespace.
-    def self.find_by_namespace(name, base = nil, context = nil) #:nodoc:
-      lookups = []
-      lookups << "#{base}:#{name}"    if base
-      lookups << "#{name}:#{context}" if context
-
-      unless base || context
-        unless name.to_s.include?(?:)
-          lookups << "#{name}:#{name}"
-          lookups << "rails:#{name}"
+      # Rails finds namespaces similar to thor, it only adds one rule:
+      #
+      # Generators names must end with "_generator.rb". This is required because Rails
+      # looks in load paths and loads the generator just before it's going to be used.
+      #
+      #   find_by_namespace :webrat, :rails, :integration
+      #
+      # Will search for the following generators:
+      #
+      #   "rails:webrat", "webrat:integration", "webrat"
+      #
+      # Notice that "rails:generators:webrat" could be loaded as well, what
+      # Rails looks for is the first and last parts of the namespace.
+      def find_by_namespace(name, base = nil, context = nil) #:nodoc:
+        lookups = []
+        lookups << "#{base}:#{name}"    if base
+        lookups << "#{name}:#{context}" if context
+
+        unless base || context
+          unless name.to_s.include?(?:)
+            lookups << "#{name}:#{name}"
+            lookups << "rails:#{name}"
+          end
+          lookups << "#{name}"
         end
-        lookups << "#{name}"
-      end
 
-      lookup(lookups)
+        lookup(lookups)
+
+        namespaces = Hash[subclasses.map { |klass| [klass.namespace, klass] }]
+        lookups.each do |namespace|
 
-      namespaces = Hash[subclasses.map { |klass| [klass.namespace, klass] }]
-      lookups.each do |namespace|
+          klass = namespaces[namespace]
+          return klass if klass
+        end
 
-        klass = namespaces[namespace]
-        return klass if klass
+        invoke_fallbacks_for(name, base) || invoke_fallbacks_for(context, name)
       end
 
-      invoke_fallbacks_for(name, base) || invoke_fallbacks_for(context, name)
-    end
+      # Receives a namespace, arguments and the behavior to invoke the generator.
+      # It's used as the default entry point for generate, destroy and update
+      # commands.
+      def invoke(namespace, args = ARGV, config = {})
+        names = namespace.to_s.split(":")
+        if klass = find_by_namespace(names.pop, names.any? && names.join(":"))
+          args << "--help" if args.empty? && klass.arguments.any?(&:required?)
+          klass.start(args, config)
+        else
+          options     = sorted_groups.flat_map(&:last)
+          suggestions = options.sort_by { |suggested| levenshtein_distance(namespace.to_s, suggested) }.first(3)
+          msg =  "Could not find generator '#{namespace}'. "
+          msg << "Maybe you meant #{ suggestions.map { |s| "'#{s}'" }.to_sentence(last_word_connector: " or ", locale: :en) }\n"
+          msg << "Run `rails generate --help` for more options."
+          puts msg
+        end
+      end
 
-    # Receives a namespace, arguments and the behavior to invoke the generator.
-    # It's used as the default entry point for generate, destroy and update
-    # commands.
-    def self.invoke(namespace, args = ARGV, config = {})
-      names = namespace.to_s.split(":")
-      if klass = find_by_namespace(names.pop, names.any? && names.join(":"))
-        args << "--help" if args.empty? && klass.arguments.any?(&:required?)
-        klass.start(args, config)
-      else
-        options     = sorted_groups.flat_map(&:last)
-        suggestions = options.sort_by { |suggested| levenshtein_distance(namespace.to_s, suggested) }.first(3)
-        msg =  "Could not find generator '#{namespace}'. "
-        msg << "Maybe you meant #{ suggestions.map { |s| "'#{s}'" }.to_sentence(last_word_connector: " or ", locale: :en) }\n"
-        msg << "Run `rails generate --help` for more options."
-        puts msg
+      def print_list(base, namespaces)
+        namespaces = namespaces.reject { |n| hidden_namespaces.include?(n) }
+        super
       end
-    end
 
-    def self.print_list(base, namespaces)
-      namespaces = namespaces.reject { |n| hidden_namespaces.include?(n) }
-      super
-    end
+      # Try fallbacks for the given base.
+      def invoke_fallbacks_for(name, base) #:nodoc:
+        return nil unless base && fallbacks[base.to_sym]
+        invoked_fallbacks = []
 
-    # Try fallbacks for the given base.
-    def self.invoke_fallbacks_for(name, base) #:nodoc:
-      return nil unless base && fallbacks[base.to_sym]
-      invoked_fallbacks = []
+        Array(fallbacks[base.to_sym]).each do |fallback|
+          next if invoked_fallbacks.include?(fallback)
+          invoked_fallbacks << fallback
 
-      Array(fallbacks[base.to_sym]).each do |fallback|
-        next if invoked_fallbacks.include?(fallback)
-        invoked_fallbacks << fallback
+          klass = find_by_namespace(name, fallback)
+          return klass if klass
+        end
 
-        klass = find_by_namespace(name, fallback)
-        return klass if klass
+        nil
       end
 
-      nil
-    end
-
-    def self.command_type
-      @command_type ||= "generator"
-    end
+      def command_type
+        @command_type ||= "generator"
+      end
 
-    def self.lookup_paths
-      @lookup_paths ||= %w( rails/generators generators )
-    end
+      def lookup_paths
+        @lookup_paths ||= %w( rails/generators generators )
+      end
 
-    def self.file_lookup_paths
-      @file_lookup_paths ||= [ "{#{lookup_paths.join(',')}}", "**", "*_generator.rb" ]
+      def file_lookup_paths
+        @file_lookup_paths ||= [ "{#{lookup_paths.join(',')}}", "**", "*_generator.rb" ]
+      end
     end
   end
 end
-- 
cgit v1.2.3


From 6b049057f0e7b21235ee88900d56f99ac527eecf Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Sun, 25 Dec 2016 00:00:08 +0900
Subject: Privatize some methods that were originally protected

---
 railties/lib/rails/generators.rb | 52 +++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 25 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index 04f4908f52..e1980a42ad 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -274,38 +274,40 @@ module Rails
         end
       end
 
-      def print_list(base, namespaces)
-        namespaces = namespaces.reject { |n| hidden_namespaces.include?(n) }
-        super
-      end
+      private
 
-      # Try fallbacks for the given base.
-      def invoke_fallbacks_for(name, base) #:nodoc:
-        return nil unless base && fallbacks[base.to_sym]
-        invoked_fallbacks = []
+        def print_list(base, namespaces) # :doc:
+          namespaces = namespaces.reject { |n| hidden_namespaces.include?(n) }
+          super
+        end
 
-        Array(fallbacks[base.to_sym]).each do |fallback|
-          next if invoked_fallbacks.include?(fallback)
-          invoked_fallbacks << fallback
+        # Try fallbacks for the given base.
+        def invoke_fallbacks_for(name, base)
+          return nil unless base && fallbacks[base.to_sym]
+          invoked_fallbacks = []
 
-          klass = find_by_namespace(name, fallback)
-          return klass if klass
-        end
+          Array(fallbacks[base.to_sym]).each do |fallback|
+            next if invoked_fallbacks.include?(fallback)
+            invoked_fallbacks << fallback
 
-        nil
-      end
+            klass = find_by_namespace(name, fallback)
+            return klass if klass
+          end
 
-      def command_type
-        @command_type ||= "generator"
-      end
+          nil
+        end
 
-      def lookup_paths
-        @lookup_paths ||= %w( rails/generators generators )
-      end
+        def command_type # :doc:
+          @command_type ||= "generator"
+        end
 
-      def file_lookup_paths
-        @file_lookup_paths ||= [ "{#{lookup_paths.join(',')}}", "**", "*_generator.rb" ]
-      end
+        def lookup_paths # :doc:
+          @lookup_paths ||= %w( rails/generators generators )
+        end
+
+        def file_lookup_paths # :doc:
+          @file_lookup_paths ||= [ "{#{lookup_paths.join(',')}}", "**", "*_generator.rb" ]
+        end
     end
   end
 end
-- 
cgit v1.2.3


From d1daf4c31301f5f5917b877fd63a817f5f4608ed Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Fri, 23 Dec 2016 19:20:01 +0900
Subject: Privatize unneededly protected methods in Railties

---
 railties/lib/rails/application_controller.rb       |  2 +-
 railties/lib/rails/command.rb                      |  8 +--
 railties/lib/rails/command/behavior.rb             | 12 ++--
 .../rails/commands/dbconsole/dbconsole_command.rb  |  6 +-
 railties/lib/rails/engine.rb                       | 26 ++++----
 railties/lib/rails/generators/actions.rb           | 10 +--
 .../rails/generators/actions/create_migration.rb   |  6 +-
 railties/lib/rails/generators/app_base.rb          | 30 ++++-----
 railties/lib/rails/generators/base.rb              | 24 +++----
 railties/lib/rails/generators/erb.rb               |  2 +-
 .../generators/erb/mailer/mailer_generator.rb      |  2 +-
 .../generators/erb/scaffold/scaffold_generator.rb  |  2 +-
 railties/lib/rails/generators/named_base.rb        | 74 +++++++++++-----------
 .../rails/generators/rails/app/app_generator.rb    |  4 +-
 .../generators/rails/assets/assets_generator.rb    |  2 +-
 .../rails/generator/generator_generator.rb         |  2 +-
 .../generators/rails/plugin/plugin_generator.rb    |  2 +-
 railties/lib/rails/generators/resource_helpers.rb  |  2 +
 .../test_unit/generator/generator_generator.rb     |  2 +-
 .../test_unit/mailer/mailer_generator.rb           |  2 +-
 railties/lib/rails/generators/testing/behaviour.rb | 10 +--
 railties/lib/rails/mailers_controller.rb           | 10 +--
 railties/lib/rails/rack/logger.rb                  | 24 ++++---
 railties/lib/rails/railtie.rb                      |  5 +-
 railties/lib/rails/railtie/configurable.rb         |  2 +-
 25 files changed, 136 insertions(+), 135 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/application_controller.rb b/railties/lib/rails/application_controller.rb
index f8394b8e0a..a98e51fd28 100644
--- a/railties/lib/rails/application_controller.rb
+++ b/railties/lib/rails/application_controller.rb
@@ -2,7 +2,7 @@ class Rails::ApplicationController < ActionController::Base # :nodoc:
   self.view_paths = File.expand_path("../templates", __FILE__)
   layout "application"
 
-  protected
+  private
 
     def require_local!
       unless local_request?
diff --git a/railties/lib/rails/command.rb b/railties/lib/rails/command.rb
index 6065e78fd1..ddb953543f 100644
--- a/railties/lib/rails/command.rb
+++ b/railties/lib/rails/command.rb
@@ -82,16 +82,16 @@ module Rails
         [[ "rails", rails ]] + groups.sort.to_a
       end
 
-      protected
-        def command_type
+      private
+        def command_type # :doc:
           @command_type ||= "command"
         end
 
-        def lookup_paths
+        def lookup_paths # :doc:
           @lookup_paths ||= %w( rails/commands commands )
         end
 
-        def file_lookup_paths
+        def file_lookup_paths # :doc:
           @file_lookup_paths ||= [ "{#{lookup_paths.join(',')}}", "**", "*_command.rb" ]
         end
     end
diff --git a/railties/lib/rails/command/behavior.rb b/railties/lib/rails/command/behavior.rb
index 2e8517070c..4a92f72f16 100644
--- a/railties/lib/rails/command/behavior.rb
+++ b/railties/lib/rails/command/behavior.rb
@@ -16,13 +16,13 @@ module Rails
           @subclasses ||= []
         end
 
-        protected
+        private
 
           # This code is based directly on the Text gem implementation.
           # Copyright (c) 2006-2013 Paul Battley, Michael Neumann, Tim Fletcher.
           #
           # Returns a value representing the "cost" of transforming str1 into str2.
-          def levenshtein_distance(str1, str2)
+          def levenshtein_distance(str1, str2) # :doc:
             s = str1
             t = str2
             n = s.length
@@ -58,7 +58,7 @@ module Rails
           end
 
           # Prints a list of generators.
-          def print_list(base, namespaces) #:nodoc:
+          def print_list(base, namespaces)
             return if namespaces.empty?
             puts "#{base.camelize}:"
 
@@ -71,7 +71,7 @@ module Rails
 
           # Receives namespaces in an array and tries to find matching generators
           # in the load path.
-          def lookup(namespaces) #:nodoc:
+          def lookup(namespaces)
             paths = namespaces_to_paths(namespaces)
 
             paths.each do |raw_path|
@@ -91,7 +91,7 @@ module Rails
           end
 
           # This will try to load any command in the load path to show in help.
-          def lookup! #:nodoc:
+          def lookup!
             $LOAD_PATH.each do |base|
               Dir[File.join(base, *file_lookup_paths)].each do |path|
                 begin
@@ -107,7 +107,7 @@ module Rails
           # Convert namespaces to paths by replacing ":" for "/" and adding
           # an extra lookup. For example, "rails:model" should be searched
           # in both: "rails/model/model_generator" and "rails/model_generator".
-          def namespaces_to_paths(namespaces) #:nodoc:
+          def namespaces_to_paths(namespaces)
             paths = []
             namespaces.each do |namespace|
               pieces = namespace.split(":")
diff --git a/railties/lib/rails/commands/dbconsole/dbconsole_command.rb b/railties/lib/rails/commands/dbconsole/dbconsole_command.rb
index 35e8673215..588fb06b15 100644
--- a/railties/lib/rails/commands/dbconsole/dbconsole_command.rb
+++ b/railties/lib/rails/commands/dbconsole/dbconsole_command.rb
@@ -99,14 +99,14 @@ module Rails
       Rails.respond_to?(:env) ? Rails.env : Rails::Command.environment
     end
 
-    protected
-      def configurations
+    private
+      def configurations # :doc:
         require APP_PATH
         ActiveRecord::Base.configurations = Rails.application.config.database_configuration
         ActiveRecord::Base.configurations
       end
 
-      def find_cmd_and_exec(commands, *args)
+      def find_cmd_and_exec(commands, *args) # :doc:
         commands = Array(commands)
 
         dirs_on_path = ENV["PATH"].to_s.split(File::PATH_SEPARATOR)
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index e56f6159ad..2dd1fb3273 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -643,18 +643,20 @@ module Rails
 
     protected
 
-      def load_config_initializer(initializer)
-        ActiveSupport::Notifications.instrument("load_config_initializer.railties", initializer: initializer) do
-          load(initializer)
-        end
-      end
-
       def run_tasks_blocks(*) #:nodoc:
         super
         paths["lib/tasks"].existent.sort.each { |ext| load(ext) }
       end
 
-      def has_migrations? #:nodoc:
+    private
+
+      def load_config_initializer(initializer) # :doc:
+        ActiveSupport::Notifications.instrument("load_config_initializer.railties", initializer: initializer) do
+          load(initializer)
+        end
+      end
+
+      def has_migrations?
         paths["db/migrate"].existent.any?
       end
 
@@ -671,24 +673,22 @@ module Rails
         Pathname.new File.realpath root
       end
 
-      def default_middleware_stack #:nodoc:
+      def default_middleware_stack
         ActionDispatch::MiddlewareStack.new
       end
 
-      def _all_autoload_once_paths #:nodoc:
+      def _all_autoload_once_paths
         config.autoload_once_paths
       end
 
-      def _all_autoload_paths #:nodoc:
+      def _all_autoload_paths
         @_all_autoload_paths ||= (config.autoload_paths + config.eager_load_paths + config.autoload_once_paths).uniq
       end
 
-      def _all_load_paths #:nodoc:
+      def _all_load_paths
         @_all_load_paths ||= (config.paths.load_paths + _all_autoload_paths).uniq
       end
 
-    private
-
       def build_request(env)
         env.merge!(env_config)
         req = ActionDispatch::Request.new env
diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb
index 8a60560f86..d058d82cea 100644
--- a/railties/lib/rails/generators/actions.rb
+++ b/railties/lib/rails/generators/actions.rb
@@ -260,12 +260,12 @@ module Rails
         @after_bundle_callbacks << block
       end
 
-      protected
+      private
 
         # Define log for backwards compatibility. If just one argument is sent,
         # invoke say, otherwise invoke say_status. Differently from say and
         # similarly to say_status, this method respects the quiet? option given.
-        def log(*args)
+        def log(*args) # :doc:
           if args.size == 1
             say args.first.to_s unless options.quiet?
           else
@@ -276,7 +276,7 @@ module Rails
 
         # Runs the supplied command using either "rake ..." or "rails ..."
         # based on the executor parameter provided.
-        def execute_command(executor, command, options = {})
+        def execute_command(executor, command, options = {}) # :doc:
           log executor, command
           env  = options[:env] || ENV["RAILS_ENV"] || "development"
           sudo = options[:sudo] && !Gem.win_platform? ? "sudo " : ""
@@ -284,7 +284,7 @@ module Rails
         end
 
         # Add an extension to the given name based on the platform.
-        def extify(name)
+        def extify(name) # :doc:
           if Gem.win_platform?
             "#{name}.bat"
           else
@@ -294,7 +294,7 @@ module Rails
 
         # Surround string with single quotes if there is no quotes.
         # Otherwise fall back to double quotes
-        def quote(value)
+        def quote(value) # :doc:
           return value.inspect unless value.is_a? String
 
           if value.include?("'")
diff --git a/railties/lib/rails/generators/actions/create_migration.rb b/railties/lib/rails/generators/actions/create_migration.rb
index 587c61fd42..f677e545e5 100644
--- a/railties/lib/rails/generators/actions/create_migration.rb
+++ b/railties/lib/rails/generators/actions/create_migration.rb
@@ -37,9 +37,9 @@ module Rails
         end
         alias :exists? :existing_migration
 
-        protected
+        private
 
-          def on_conflict_behavior
+          def on_conflict_behavior # :doc:
             options = base.options.merge(config)
             if identical?
               say_status :identical, :blue, relative_existing_migration
@@ -60,7 +60,7 @@ module Rails
             end
           end
 
-          def say_status(status, color, message = relative_destination)
+          def say_status(status, color, message = relative_destination) # :doc:
             base.shell.say_status(status, message, color) if config[:verbose]
           end
       end
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 15cc070e35..5c809807a1 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -108,9 +108,9 @@ module Rails
         convert_database_option_for_jruby
       end
 
-    protected
+    private
 
-      def gemfile_entry(name, *args)
+      def gemfile_entry(name, *args) # :doc:
         options = args.extract_options!
         version = args.first
         github = options[:github]
@@ -126,7 +126,7 @@ module Rails
         self
       end
 
-      def gemfile_entries
+      def gemfile_entries # :doc:
         [rails_gemfile_entry,
          database_gemfile_entry,
          webserver_gemfile_entry,
@@ -139,13 +139,13 @@ module Rails
          @extra_entries].flatten.find_all(&@gem_filter)
       end
 
-      def add_gem_entry_filter
+      def add_gem_entry_filter # :doc:
         @gem_filter = lambda { |next_filter, entry|
           yield(entry) && next_filter.call(entry)
         }.curry[@gem_filter]
       end
 
-      def builder
+      def builder # :doc:
         @builder ||= begin
           builder_class = get_builder_class
           builder_class.include(ActionMethods)
@@ -153,24 +153,24 @@ module Rails
         end
       end
 
-      def build(meth, *args)
+      def build(meth, *args) # :doc:
         builder.send(meth, *args) if builder.respond_to?(meth)
       end
 
-      def create_root
+      def create_root # :doc:
         valid_const?
 
         empty_directory "."
         FileUtils.cd(destination_root) unless options[:pretend]
       end
 
-      def apply_rails_template
+      def apply_rails_template # :doc:
         apply rails_template if rails_template
       rescue Thor::Error, LoadError, Errno::ENOENT => e
         raise Error, "The template [#{rails_template}] could not be loaded. Error: #{e}"
       end
 
-      def set_default_accessors!
+      def set_default_accessors! # :doc:
         self.destination_root = File.expand_path(app_path, destination_root)
         self.rails_template = \
           case options[:template]
@@ -183,32 +183,32 @@ module Rails
           end
       end
 
-      def database_gemfile_entry
+      def database_gemfile_entry # :doc:
         return [] if options[:skip_active_record]
         gem_name, gem_version = gem_for_database
         GemfileEntry.version gem_name, gem_version,
                             "Use #{options[:database]} as the database for Active Record"
       end
 
-      def webserver_gemfile_entry
+      def webserver_gemfile_entry # :doc:
         return [] if options[:skip_puma]
         comment = "Use Puma as the app server"
         GemfileEntry.new("puma", "~> 3.0", comment)
       end
 
-      def include_all_railties?
+      def include_all_railties? # :doc:
         options.values_at(:skip_active_record, :skip_action_mailer, :skip_test, :skip_sprockets, :skip_action_cable).none?
       end
 
-      def comment_if(value)
+      def comment_if(value) # :doc:
         options[value] ? "# " : ""
       end
 
-      def keeps?
+      def keeps? # :doc:
         !options[:skip_keeps]
       end
 
-      def sqlite3?
+      def sqlite3? # :doc:
         !options[:skip_active_record] && options[:database] == "sqlite3"
       end
 
diff --git a/railties/lib/rails/generators/base.rb b/railties/lib/rails/generators/base.rb
index c707bbfcbf..cc6ae3860f 100644
--- a/railties/lib/rails/generators/base.rb
+++ b/railties/lib/rails/generators/base.rb
@@ -239,11 +239,11 @@ module Rails
         end
       end
 
-      protected
+      private
 
         # Check whether the given class names are already taken by user
         # application or Ruby on Rails.
-        def class_collisions(*class_names) #:nodoc:
+        def class_collisions(*class_names)
           return unless behavior == :invoke
 
           class_names.flatten.each do |class_name|
@@ -264,7 +264,7 @@ module Rails
         end
 
         # Takes in an array of nested modules and extracts the last module
-        def extract_last_module(nesting)
+        def extract_last_module(nesting) # :doc:
           nesting.inject(Object) do |last_module, nest|
             break unless last_module.const_defined?(nest, false)
             last_module.const_get(nest)
@@ -272,12 +272,12 @@ module Rails
         end
 
         # Use Rails default banner.
-        def self.banner
+        def self.banner # :doc:
           "rails generate #{namespace.sub(/^rails:/, '')} #{arguments.map(&:usage).join(' ')} [options]".gsub(/\s+/, " ")
         end
 
         # Sets the base_name taking into account the current class namespace.
-        def self.base_name
+        def self.base_name # :doc:
           @base_name ||= begin
             if base = name.to_s.split("::").first
               base.underscore
@@ -287,7 +287,7 @@ module Rails
 
         # Removes the namespaces and get the generator name. For example,
         # Rails::Generators::ModelGenerator will return "model" as generator name.
-        def self.generator_name
+        def self.generator_name # :doc:
           @generator_name ||= begin
             if generator = name.to_s.split("::").last
               generator.sub!(/Generator$/, "")
@@ -298,18 +298,18 @@ module Rails
 
         # Returns the default value for the option name given doing a lookup in
         # Rails::Generators.options.
-        def self.default_value_for_option(name, options)
+        def self.default_value_for_option(name, options) # :doc:
           default_for_option(Rails::Generators.options, name, options, options[:default])
         end
 
         # Returns default aliases for the option name given doing a lookup in
         # Rails::Generators.aliases.
-        def self.default_aliases_for_option(name, options)
+        def self.default_aliases_for_option(name, options) # :doc:
           default_for_option(Rails::Generators.aliases, name, options, options[:aliases])
         end
 
         # Returns default for the option name given doing a lookup in config.
-        def self.default_for_option(config, name, options, default)
+        def self.default_for_option(config, name, options, default) # :doc:
           if generator_name && (c = config[generator_name.to_sym]) && c.key?(name)
             c[name]
           elsif base_name && (c = config[base_name.to_sym]) && c.key?(name)
@@ -343,7 +343,7 @@ module Rails
 
         # Small macro to add ruby as an option to the generator with proper
         # default value plus an instance helper method called shebang.
-        def self.add_shebang_option!
+        def self.add_shebang_option! # :doc:
           class_option :ruby, type: :string, aliases: "-r", default: Thor::Util.ruby_command,
                               desc: "Path to the Ruby binary of your choice", banner: "PATH"
 
@@ -361,7 +361,7 @@ module Rails
           }
         end
 
-        def self.usage_path
+        def self.usage_path # :doc:
           paths = [
             source_root && File.expand_path("../USAGE", source_root),
             default_generator_root && File.join(default_generator_root, "USAGE")
@@ -369,7 +369,7 @@ module Rails
           paths.compact.detect { |path| File.exist? path }
         end
 
-        def self.default_generator_root
+        def self.default_generator_root # :doc:
           path = File.expand_path(File.join(base_name, generator_name), base_root)
           path if File.exist?(path)
         end
diff --git a/railties/lib/rails/generators/erb.rb b/railties/lib/rails/generators/erb.rb
index d01502002f..d5e326d6ee 100644
--- a/railties/lib/rails/generators/erb.rb
+++ b/railties/lib/rails/generators/erb.rb
@@ -3,7 +3,7 @@ require "rails/generators/named_base"
 module Erb # :nodoc:
   module Generators # :nodoc:
     class Base < Rails::Generators::NamedBase #:nodoc:
-      protected
+      private
 
         def formats
           [format]
diff --git a/railties/lib/rails/generators/erb/mailer/mailer_generator.rb b/railties/lib/rails/generators/erb/mailer/mailer_generator.rb
index f150240908..677f8041ae 100644
--- a/railties/lib/rails/generators/erb/mailer/mailer_generator.rb
+++ b/railties/lib/rails/generators/erb/mailer/mailer_generator.rb
@@ -26,7 +26,7 @@ module Erb # :nodoc:
         end
       end
 
-      protected
+      private
 
         def formats
           [:text, :html]
diff --git a/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb
index 154d85f381..0d77ef21da 100644
--- a/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb
+++ b/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb
@@ -21,7 +21,7 @@ module Erb # :nodoc:
         end
       end
 
-    protected
+    private
 
       def available_views
         %w(index edit show new _form)
diff --git a/railties/lib/rails/generators/named_base.rb b/railties/lib/rails/generators/named_base.rb
index 7b9095c7b1..e3660b012a 100644
--- a/railties/lib/rails/generators/named_base.rb
+++ b/railties/lib/rails/generators/named_base.rb
@@ -37,138 +37,140 @@ module Rails
       protected
         attr_reader :file_name
 
+      private
+
         # FIXME: We are avoiding to use alias because a bug on thor that make
         # this method public and add it to the task list.
-        def singular_name
+        def singular_name # :doc:
           file_name
         end
 
         # Wrap block with namespace of current application
         # if namespace exists and is not skipped
-        def module_namespacing(&block)
+        def module_namespacing(&block) # :doc:
           content = capture(&block)
           content = wrap_with_namespace(content) if namespaced?
           concat(content)
         end
 
-        def indent(content, multiplier = 2)
+        def indent(content, multiplier = 2) # :doc:
           spaces = " " * multiplier
           content.each_line.map { |line| line.blank? ? line : "#{spaces}#{line}" }.join
         end
 
-        def wrap_with_namespace(content)
+        def wrap_with_namespace(content) # :doc:
           content = indent(content).chomp
           "module #{namespace.name}\n#{content}\nend\n"
         end
 
-        def inside_template
+        def inside_template # :doc:
           @inside_template = true
           yield
         ensure
           @inside_template = false
         end
 
-        def inside_template?
+        def inside_template? # :doc:
           @inside_template
         end
 
-        def namespace
+        def namespace # :doc:
           Rails::Generators.namespace
         end
 
-        def namespaced?
+        def namespaced? # :doc:
           !options[:skip_namespace] && namespace
         end
 
-        def file_path
+        def file_path # :doc:
           @file_path ||= (class_path + [file_name]).join("/")
         end
 
-        def class_path
+        def class_path # :doc:
           inside_template? || !namespaced? ? regular_class_path : namespaced_class_path
         end
 
-        def regular_class_path
+        def regular_class_path # :doc:
           @class_path
         end
 
-        def namespaced_class_path
+        def namespaced_class_path # :doc:
           @namespaced_class_path ||= [namespaced_path] + @class_path
         end
 
-        def namespaced_path
+        def namespaced_path # :doc:
           @namespaced_path ||= namespace.name.split("::").first.underscore
         end
 
-        def class_name
+        def class_name # :doc:
           (class_path + [file_name]).map!(&:camelize).join("::")
         end
 
-        def human_name
+        def human_name # :doc:
           @human_name ||= singular_name.humanize
         end
 
-        def plural_name
+        def plural_name # :doc:
           @plural_name ||= singular_name.pluralize
         end
 
-        def i18n_scope
+        def i18n_scope # :doc:
           @i18n_scope ||= file_path.tr("/", ".")
         end
 
-        def table_name
+        def table_name # :doc:
           @table_name ||= begin
             base = pluralize_table_names? ? plural_name : singular_name
             (class_path + [base]).join("_")
           end
         end
 
-        def uncountable?
+        def uncountable? # :doc:
           singular_name == plural_name
         end
 
-        def index_helper
+        def index_helper # :doc:
           uncountable? ? "#{plural_table_name}_index" : plural_table_name
         end
 
-        def show_helper
+        def show_helper # :doc:
           "#{singular_table_name}_url(@#{singular_table_name})"
         end
 
-        def edit_helper
+        def edit_helper # :doc:
           "edit_#{show_helper}"
         end
 
-        def new_helper
+        def new_helper # :doc:
           "new_#{singular_table_name}_url"
         end
 
-        def singular_table_name
+        def singular_table_name # :doc:
           @singular_table_name ||= (pluralize_table_names? ? table_name.singularize : table_name)
         end
 
-        def plural_table_name
+        def plural_table_name # :doc:
           @plural_table_name ||= (pluralize_table_names? ? table_name : table_name.pluralize)
         end
 
-        def plural_file_name
+        def plural_file_name # :doc:
           @plural_file_name ||= file_name.pluralize
         end
 
-        def fixture_file_name
+        def fixture_file_name # :doc:
           @fixture_file_name ||= (pluralize_table_names? ? plural_file_name : file_name)
         end
 
-        def route_url
+        def route_url # :doc:
           @route_url ||= class_path.collect { |dname| "/" + dname }.join + "/" + plural_file_name
         end
 
-        def url_helper_prefix
+        def url_helper_prefix # :doc:
           @url_helper_prefix ||= (class_path + [file_name]).join("_")
         end
 
         # Tries to retrieve the application name or simply return application.
-        def application_name
+        def application_name # :doc:
           if defined?(Rails) && Rails.application
             Rails.application.class.name.split("::").first.underscore
           else
@@ -176,20 +178,20 @@ module Rails
           end
         end
 
-        def assign_names!(name) #:nodoc:
+        def assign_names!(name)
           @class_path = name.include?("/") ? name.split("/") : name.split("::")
           @class_path.map!(&:underscore)
           @file_name = @class_path.pop
         end
 
         # Convert attributes array into GeneratedAttribute objects.
-        def parse_attributes! #:nodoc:
+        def parse_attributes!
           self.attributes = (attributes || []).map do |attr|
             Rails::Generators::GeneratedAttribute.parse(attr)
           end
         end
 
-        def attributes_names
+        def attributes_names # :doc:
           @attributes_names ||= attributes.each_with_object([]) do |a, names|
             names << a.column_name
             names << "password_confirmation" if a.password_digest?
@@ -197,11 +199,11 @@ module Rails
           end
         end
 
-        def pluralize_table_names?
+        def pluralize_table_names? # :doc:
           !defined?(ActiveRecord::Base) || ActiveRecord::Base.pluralize_table_names
         end
 
-        def mountable_engine?
+        def mountable_engine? # :doc:
           defined?(ENGINE_ROOT) && namespaced?
         end
 
@@ -215,7 +217,7 @@ module Rails
         # If the generator is invoked with class name Admin, it will check for
         # the presence of "AdminDecorator".
         #
-        def self.check_class_collision(options = {})
+        def self.check_class_collision(options = {}) # :doc:
           define_method :check_class_collision do
             name = if self.respond_to?(:controller_class_name) # for ScaffoldBase
               controller_class_name
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index 19d3ba2f0f..070a6ac124 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -363,12 +363,12 @@ module Rails
         @after_bundle_callbacks.each(&:call)
       end
 
-    protected
-
       def self.banner
         "rails new #{arguments.map(&:usage).join(' ')} [options]"
       end
 
+    private
+
       # Define file as an alias to create_file for backwards compatibility.
       def file(*args, &block)
         create_file(*args, &block)
diff --git a/railties/lib/rails/generators/rails/assets/assets_generator.rb b/railties/lib/rails/generators/rails/assets/assets_generator.rb
index 265dada2ca..95d00c2d39 100644
--- a/railties/lib/rails/generators/rails/assets/assets_generator.rb
+++ b/railties/lib/rails/generators/rails/assets/assets_generator.rb
@@ -7,7 +7,7 @@ module Rails
       class_option :javascript_engine, desc: "Engine for JavaScripts"
       class_option :stylesheet_engine, desc: "Engine for Stylesheets"
 
-      protected
+      private
 
         def asset_name
           file_name
diff --git a/railties/lib/rails/generators/rails/generator/generator_generator.rb b/railties/lib/rails/generators/rails/generator/generator_generator.rb
index 8040ec5e7b..299a7da5f1 100644
--- a/railties/lib/rails/generators/rails/generator/generator_generator.rb
+++ b/railties/lib/rails/generators/rails/generator/generator_generator.rb
@@ -12,7 +12,7 @@ module Rails
 
       hook_for :test_framework
 
-      protected
+      private
 
         def generator_dir
           if options[:namespace]
diff --git a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
index 2186fa4ded..4cf4f8cd9a 100644
--- a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
+++ b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
@@ -286,7 +286,7 @@ task default: :test
         @namespaced_name ||= name.tr("-", "/")
       end
 
-    protected
+    private
 
       def create_dummy_app(path = nil)
         dummy_path(path) if path
diff --git a/railties/lib/rails/generators/resource_helpers.rb b/railties/lib/rails/generators/resource_helpers.rb
index bbfda09bb4..978b053308 100644
--- a/railties/lib/rails/generators/resource_helpers.rb
+++ b/railties/lib/rails/generators/resource_helpers.rb
@@ -29,6 +29,8 @@ module Rails
 
         attr_reader :controller_name, :controller_file_name
 
+      private
+
         def controller_class_path
           if options[:model_name]
             @controller_class_path
diff --git a/railties/lib/rails/generators/test_unit/generator/generator_generator.rb b/railties/lib/rails/generators/test_unit/generator/generator_generator.rb
index 59f8d40343..6b6e094453 100644
--- a/railties/lib/rails/generators/test_unit/generator/generator_generator.rb
+++ b/railties/lib/rails/generators/test_unit/generator/generator_generator.rb
@@ -12,7 +12,7 @@ module TestUnit # :nodoc:
         template "generator_test.rb", File.join("test/lib/generators", class_path, "#{file_name}_generator_test.rb")
       end
 
-    protected
+    private
 
       def generator_path
         if options[:namespace]
diff --git a/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb b/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb
index 806279788e..67bff8e4f9 100644
--- a/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb
+++ b/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb
@@ -17,7 +17,7 @@ module TestUnit # :nodoc:
         template "preview.rb", File.join("test/mailers/previews", class_path, "#{file_name}_mailer_preview.rb")
       end
 
-      protected
+      private
         def file_name
           @_file_name ||= super.gsub(/_mailer/i, "")
         end
diff --git a/railties/lib/rails/generators/testing/behaviour.rb b/railties/lib/rails/generators/testing/behaviour.rb
index a1e5a233b9..64d641d096 100644
--- a/railties/lib/rails/generators/testing/behaviour.rb
+++ b/railties/lib/rails/generators/testing/behaviour.rb
@@ -82,23 +82,23 @@ module Rails
           Rails::Generators::GeneratedAttribute.parse([name, attribute_type, index].compact.join(":"))
         end
 
-        protected
+        private
 
-          def destination_root_is_set? # :nodoc:
+          def destination_root_is_set?
             raise "You need to configure your Rails::Generators::TestCase destination root." unless destination_root
           end
 
-          def ensure_current_path # :nodoc:
+          def ensure_current_path
             cd current_path
           end
 
           # Clears all files and directories in destination.
-          def prepare_destination
+          def prepare_destination # :doc:
             rm_rf(destination_root)
             mkdir_p(destination_root)
           end
 
-          def migration_file_name(relative) # :nodoc:
+          def migration_file_name(relative)
             absolute = File.expand_path(relative, destination_root)
             dirname, file_name = File.dirname(absolute), File.basename(absolute).sub(/\.rb$/, "")
             Dir.glob("#{dirname}/[0-9]*_*.rb").grep(/\d+_#{file_name}.rb$/).first
diff --git a/railties/lib/rails/mailers_controller.rb b/railties/lib/rails/mailers_controller.rb
index 95de998208..000ce40fbc 100644
--- a/railties/lib/rails/mailers_controller.rb
+++ b/railties/lib/rails/mailers_controller.rb
@@ -40,12 +40,12 @@ class Rails::MailersController < Rails::ApplicationController # :nodoc:
     end
   end
 
-  protected
-    def show_previews?
+  private
+    def show_previews? # :doc:
       ActionMailer::Base.show_previews
     end
 
-    def find_preview
+    def find_preview # :doc:
       candidates = []
       params[:path].to_s.scan(%r{/|$}) { candidates << $` }
       preview = candidates.detect { |candidate| ActionMailer::Preview.exists?(candidate) }
@@ -57,7 +57,7 @@ class Rails::MailersController < Rails::ApplicationController # :nodoc:
       end
     end
 
-    def find_preferred_part(*formats)
+    def find_preferred_part(*formats) # :doc:
       formats.each do |format|
         if part = @email.find_first_mime_type(format)
           return part
@@ -69,7 +69,7 @@ class Rails::MailersController < Rails::ApplicationController # :nodoc:
       end
     end
 
-    def find_part(format)
+    def find_part(format) # :doc:
       if part = @email.find_first_mime_type(format)
         part
       elsif @email.mime_type == format
diff --git a/railties/lib/rails/rack/logger.rb b/railties/lib/rails/rack/logger.rb
index e3fee75603..0fc202910c 100644
--- a/railties/lib/rails/rack/logger.rb
+++ b/railties/lib/rails/rack/logger.rb
@@ -27,9 +27,9 @@ module Rails
         end
       end
 
-    protected
+      private
 
-      def call_app(request, env)
+      def call_app(request, env) # :doc:
         instrumenter = ActiveSupport::Notifications.instrumenter
         instrumenter.start "request.action_dispatch", request: request
         logger.info { started_request_message(request) }
@@ -44,7 +44,7 @@ module Rails
       end
 
       # Started GET "/session/new" for 127.0.0.1 at 2012-09-26 14:51:42 -0700
-      def started_request_message(request)
+      def started_request_message(request) # :doc:
         'Started %s "%s" for %s at %s' % [
           request.request_method,
           request.filtered_path,
@@ -52,7 +52,7 @@ module Rails
           Time.now.to_default_s ]
       end
 
-      def compute_tags(request)
+      def compute_tags(request) # :doc:
         @taggers.collect do |tag|
           case tag
           when Proc
@@ -65,16 +65,14 @@ module Rails
         end
       end
 
-      private
-
-        def finish(request)
-          instrumenter = ActiveSupport::Notifications.instrumenter
-          instrumenter.finish "request.action_dispatch", request: request
-        end
+      def finish(request)
+        instrumenter = ActiveSupport::Notifications.instrumenter
+        instrumenter.finish "request.action_dispatch", request: request
+      end
 
-        def logger
-          Rails.logger
-        end
+      def logger
+        Rails.logger
+      end
     end
   end
 end
diff --git a/railties/lib/rails/railtie.rb b/railties/lib/rails/railtie.rb
index 696db61f01..474118c0a9 100644
--- a/railties/lib/rails/railtie.rb
+++ b/railties/lib/rails/railtie.rb
@@ -173,8 +173,8 @@ module Rails
         instance.configure(&block)
       end
 
-      protected
-        def generate_railtie_name(string) #:nodoc:
+      private
+        def generate_railtie_name(string)
           ActiveSupport::Inflector.underscore(string).tr("/", "_")
         end
 
@@ -188,7 +188,6 @@ module Rails
           end
         end
 
-      private
         # receives an instance variable identifier, set the variable value if is
         # blank and append given block to value, which will be used later in
         # `#each_registered_block(type, &block)`
diff --git a/railties/lib/rails/railtie/configurable.rb b/railties/lib/rails/railtie/configurable.rb
index 39f1f87575..2a8295426e 100644
--- a/railties/lib/rails/railtie/configurable.rb
+++ b/railties/lib/rails/railtie/configurable.rb
@@ -24,7 +24,7 @@ module Rails
           class_eval(&block)
         end
 
-        protected
+        private
 
           def method_missing(*args, &block)
             instance.send(*args, &block)
-- 
cgit v1.2.3


From f27edc84dfe714869a1702206c5c6e57a0810cfc Mon Sep 17 00:00:00 2001
From: Matthew Draper <matthew@trebex.net>
Date: Sun, 25 Dec 2016 16:44:39 +1030
Subject: Correct indent-accounting in controller route generation

Fixes #27447

[Matthew Draper & Yuuji Yaginuma]
---
 .../rails/controller/controller_generator.rb       | 25 ++++++++++++----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/rails/controller/controller_generator.rb b/railties/lib/rails/generators/rails/controller/controller_generator.rb
index 01214dc919..06bdb8b5ce 100644
--- a/railties/lib/rails/generators/rails/controller/controller_generator.rb
+++ b/railties/lib/rails/generators/rails/controller/controller_generator.rb
@@ -16,7 +16,7 @@ module Rails
         unless options[:skip_routes]
           actions.reverse_each do |action|
             # route prepends two spaces onto the front of the string that is passed, this corrects that.
-            route generate_routing_code(action)
+            route indent(generate_routing_code(action), 2)[2..-1]
           end
         end
       end
@@ -34,27 +34,30 @@ module Rails
         #   end
         # end
         def generate_routing_code(action)
-          depth = regular_class_path.length
+          depth = 0
+          lines = []
+
           # Create 'namespace' ladder
           # namespace :foo do
           #   namespace :bar do
-          namespace_ladder = regular_class_path.each_with_index.map do |ns, i|
-            indent("  namespace :#{ns} do\n", i * 2)
-          end.join[2..-1]
+          regular_class_path.each do |ns|
+            lines << indent("namespace :#{ns} do\n", depth * 2)
+            depth += 1
+          end
 
           # Create route
           #     get 'baz/index'
-          route = indent(%{  get '#{file_name}/#{action}'\n}, depth * 2)
+          lines << indent(%{get '#{file_name}/#{action}'\n}, depth * 2)
 
           # Create `end` ladder
           #   end
           # end
-          end_ladder = (1..depth).reverse_each.map do |i|
-            indent("end\n", i * 2)
-          end.join
+          until depth.zero?
+            depth -= 1
+            lines << indent("end\n", depth * 2)
+          end
 
-          # Combine the 3 parts to generate complete route entry
-          "#{namespace_ladder}#{route}#{end_ladder}"
+          lines.join
         end
     end
   end
-- 
cgit v1.2.3


From 010e246756c09f44e901f4fd8e8eab2cb3022e95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Wed, 28 Dec 2016 21:53:51 -0500
Subject: Fix Rubocop violations and fix documentation visibility

Some methods were added to public API in
5b14129d8d4ad302b4e11df6bd5c7891b75f393c and they should be not part of
the public API.
---
 railties/lib/rails/rack/logger.rb | 76 +++++++++++++++++++--------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/rack/logger.rb b/railties/lib/rails/rack/logger.rb
index 0fc202910c..853fc26051 100644
--- a/railties/lib/rails/rack/logger.rb
+++ b/railties/lib/rails/rack/logger.rb
@@ -29,50 +29,50 @@ module Rails
 
       private
 
-      def call_app(request, env) # :doc:
-        instrumenter = ActiveSupport::Notifications.instrumenter
-        instrumenter.start "request.action_dispatch", request: request
-        logger.info { started_request_message(request) }
-        resp = @app.call(env)
-        resp[2] = ::Rack::BodyProxy.new(resp[2]) { finish(request) }
-        resp
-      rescue Exception
-        finish(request)
-        raise
-      ensure
-        ActiveSupport::LogSubscriber.flush_all!
-      end
+        def call_app(request, env) # :doc:
+          instrumenter = ActiveSupport::Notifications.instrumenter
+          instrumenter.start "request.action_dispatch", request: request
+          logger.info { started_request_message(request) }
+          resp = @app.call(env)
+          resp[2] = ::Rack::BodyProxy.new(resp[2]) { finish(request) }
+          resp
+        rescue Exception
+          finish(request)
+          raise
+        ensure
+          ActiveSupport::LogSubscriber.flush_all!
+        end
 
-      # Started GET "/session/new" for 127.0.0.1 at 2012-09-26 14:51:42 -0700
-      def started_request_message(request) # :doc:
-        'Started %s "%s" for %s at %s' % [
-          request.request_method,
-          request.filtered_path,
-          request.ip,
-          Time.now.to_default_s ]
-      end
+        # Started GET "/session/new" for 127.0.0.1 at 2012-09-26 14:51:42 -0700
+        def started_request_message(request) # :doc:
+          'Started %s "%s" for %s at %s' % [
+            request.request_method,
+            request.filtered_path,
+            request.ip,
+            Time.now.to_default_s ]
+        end
 
-      def compute_tags(request) # :doc:
-        @taggers.collect do |tag|
-          case tag
-          when Proc
-            tag.call(request)
-          when Symbol
-            request.send(tag)
-          else
-            tag
+        def compute_tags(request) # :doc:
+          @taggers.collect do |tag|
+            case tag
+            when Proc
+              tag.call(request)
+            when Symbol
+              request.send(tag)
+            else
+              tag
+            end
           end
         end
-      end
 
-      def finish(request)
-        instrumenter = ActiveSupport::Notifications.instrumenter
-        instrumenter.finish "request.action_dispatch", request: request
-      end
+        def finish(request)
+          instrumenter = ActiveSupport::Notifications.instrumenter
+          instrumenter.finish "request.action_dispatch", request: request
+        end
 
-      def logger
-        Rails.logger
-      end
+        def logger
+          Rails.logger
+        end
     end
   end
 end
-- 
cgit v1.2.3