Privatize unneededly protected methods in Railties

25 files changed, 136 insertions, 135 deletions

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)