railties 6.1.4.1 → 7.0.0.rc2

data/lib/rails/commands/help/USAGE

@@ -6,10 +6,11 @@ The most common rails commands are:
  test:system  Run system tests
  dbconsole    Start a console for the database specified in config/database.yml
               (short-cut alias: "db")
-<% unless engine? %>
+<% unless engine? -%>
  new          Create a new Rails application. "rails new my_app" creates a
               new application called MyApp in "./my_app"
-<% end %>
+ plugin new   Create a new Rails railtie or engine
+<% end -%>
 
 All commands can be run with -h (or --help) for more information.
 In addition to those commands, there are:

data/lib/rails/commands/runner/runner_command.rb

@@ -38,8 +38,9 @@ module Rails
         if code_or_file == "-"
           eval($stdin.read, TOPLEVEL_BINDING, "stdin")
         elsif File.exist?(code_or_file)
-          $0 = code_or_file
-          Kernel.load code_or_file
+          expanded_file_path = File.expand_path code_or_file
+          $0 = expanded_file_path
+          Kernel.load expanded_file_path
         else
           begin
             eval(code_or_file, TOPLEVEL_BINDING, __FILE__, __LINE__)

data/lib/rails/commands/server/server_command.rb

@@ -4,7 +4,6 @@ require "fileutils"
 require "action_dispatch"
 require "rails"
 require "active_support/core_ext/string/filters"
-require "active_support/core_ext/symbol/starts_ends_with"
 require "rails/dev_caching"
 require "rails/command/environment_argument"
 
@@ -263,11 +262,9 @@ module Rails
               Run `bin/rails server --help` for more options.
             MSG
           else
-            suggestion = Rails::Command::Spellchecker.suggest(server, from: RACK_SERVERS)
-            suggestion_msg = "Maybe you meant #{suggestion.inspect}?" if suggestion
-
+            error = CorrectableError.new("Could not find server '#{server}'.", server, RACK_SERVERS)
             <<~MSG
-              Could not find server "#{server}". #{suggestion_msg}
+              #{error.message}
               Run `bin/rails server --help` for more options.
             MSG
           end

data/lib/rails/configuration.rb

@@ -49,48 +49,43 @@ module Rails
         @delete_operations = delete_operations
       end
 
-      def insert_before(*args, &block)
-        @operations << -> middleware { middleware.insert_before(*args, &block) }
+      def insert_before(...)
+        @operations << -> middleware { middleware.insert_before(...) }
       end
-      ruby2_keywords(:insert_before) if respond_to?(:ruby2_keywords, true)
 
       alias :insert :insert_before
 
-      def insert_after(*args, &block)
-        @operations << -> middleware { middleware.insert_after(*args, &block) }
+      def insert_after(...)
+        @operations << -> middleware { middleware.insert_after(...) }
       end
-      ruby2_keywords(:insert_after) if respond_to?(:ruby2_keywords, true)
 
-      def swap(*args, &block)
-        @operations << -> middleware { middleware.swap(*args, &block) }
+      def swap(...)
+        @operations << -> middleware { middleware.swap(...) }
       end
-      ruby2_keywords(:swap) if respond_to?(:ruby2_keywords, true)
 
-      def use(*args, &block)
-        @operations << -> middleware { middleware.use(*args, &block) }
+      def use(...)
+        @operations << -> middleware { middleware.use(...) }
       end
-      ruby2_keywords(:use) if respond_to?(:ruby2_keywords, true)
 
-      def delete(*args, &block)
-        @delete_operations << -> middleware { middleware.delete(*args, &block) }
+      def delete(...)
+        @delete_operations << -> middleware { middleware.delete(...) }
       end
 
-      def move_before(*args, &block)
-        @delete_operations << -> middleware { middleware.move_before(*args, &block) }
+      def move_before(...)
+        @delete_operations << -> middleware { middleware.move_before(...) }
       end
 
       alias :move :move_before
 
-      def move_after(*args, &block)
-        @delete_operations << -> middleware { middleware.move_after(*args, &block) }
+      def move_after(...)
+        @delete_operations << -> middleware { middleware.move_after(...) }
       end
 
-      def unshift(*args, &block)
-        @operations << -> middleware { middleware.unshift(*args, &block) }
+      def unshift(...)
+        @operations << -> middleware { middleware.unshift(...) }
       end
-      ruby2_keywords(:unshift) if respond_to?(:ruby2_keywords, true)
 
-      def merge_into(other) #:nodoc:
+      def merge_into(other) # :nodoc:
         (@operations + @delete_operations).each do |operation|
           operation.call(other)
         end
@@ -106,7 +101,7 @@ module Rails
         attr_reader :operations, :delete_operations
     end
 
-    class Generators #:nodoc:
+    class Generators # :nodoc:
       attr_accessor :aliases, :options, :templates, :fallbacks, :colorize_logging, :api_only
       attr_reader :hidden_namespaces, :after_generate_callbacks
 

data/lib/rails/engine/configuration.rb

@@ -44,7 +44,7 @@ module Rails
                                            exclude: ["assets", javascript_path]
           paths.add "app/assets",          glob: "*"
           paths.add "app/controllers",     eager_load: true
-          paths.add "app/channels",        eager_load: true, glob: "**/*_channel.rb"
+          paths.add "app/channels",        eager_load: true
           paths.add "app/helpers",         eager_load: true
           paths.add "app/models",          eager_load: true
           paths.add "app/mailers",         eager_load: true
@@ -55,9 +55,9 @@ module Rails
           paths.add "lib/tasks",           glob: "**/*.rake"
 
           paths.add "config"
-          paths.add "config/environments", glob: "#{Rails.env}.rb"
+          paths.add "config/environments", glob: -"#{Rails.env}.rb"
           paths.add "config/initializers", glob: "**/*.rb"
-          paths.add "config/locales",      glob: "*.{rb,yml}"
+          paths.add "config/locales",      glob: "**/*.{rb,yml}"
           paths.add "config/routes.rb"
           paths.add "config/routes",       glob: "**/*.rb"
 

data/lib/rails/engine.rb

@@ -33,7 +33,7 @@ module Rails
   # Then ensure that this file is loaded at the top of your <tt>config/application.rb</tt>
   # (or in your +Gemfile+) and it will automatically load models, controllers and helpers
   # inside +app+, load routes at <tt>config/routes.rb</tt>, load locales at
-  # <tt>config/locales/*</tt>, and load tasks at <tt>lib/tasks/*</tt>.
+  # <tt>config/locales/**/*</tt>, and load tasks at <tt>lib/tasks/**/*</tt>.
   #
   # == Configuration
   #
@@ -482,17 +482,8 @@ module Rails
     end
 
     def eager_load!
-      # Already done by Zeitwerk::Loader.eager_load_all. We need this guard to
-      # easily provide a compatible API for both zeitwerk and classic modes.
-      return if Rails.autoloaders.zeitwerk_enabled?
-
-      config.eager_load_paths.each do |load_path|
-        # Starts after load_path plus a slash, ends before ".rb".
-        relname_range = (load_path.to_s.length + 1)...-3
-        Dir.glob("#{load_path}/**/*.rb").sort.each do |file|
-          require_dependency file[relname_range]
-        end
-      end
+      # Already done by Zeitwerk::Loader.eager_load_all. By now, we leave the
+      # method as a no-op for backwards compatibility.
     end
 
     def railties
@@ -579,11 +570,6 @@ module Rails
       $LOAD_PATH.uniq!
     end
 
-    # Set the paths from which Rails will automatically load source files,
-    # and the load_once paths.
-    #
-    # This needs to be an initializer, since it needs to run once
-    # per engine and get the engine as a block parameter.
     initializer :set_autoload_paths, before: :bootstrap_hook do
       ActiveSupport::Dependencies.autoload_paths.unshift(*_all_autoload_paths)
       ActiveSupport::Dependencies.autoload_once_paths.unshift(*_all_autoload_once_paths)
@@ -665,12 +651,12 @@ module Rails
       end
     end
 
-    def routes? #:nodoc:
+    def routes? # :nodoc:
       @routes
     end
 
     protected
-      def run_tasks_blocks(*) #:nodoc:
+      def run_tasks_blocks(*) # :nodoc:
         super
         paths["lib/tasks"].existent.sort.each { |ext| load(ext) }
       end
@@ -686,7 +672,7 @@ module Rails
         paths["db/migrate"].existent.any?
       end
 
-      def self.find_root_with_flag(flag, root_path, default = nil) #:nodoc:
+      def self.find_root_with_flag(flag, root_path, default = nil) # :nodoc:
         while root_path && File.directory?(root_path) && !File.exist?("#{root_path}/#{flag}")
           parent = File.dirname(root_path)
           root_path = parent != root_path && parent
@@ -703,17 +689,25 @@ module Rails
       end
 
       def _all_autoload_once_paths
-        config.autoload_once_paths
+        config.autoload_once_paths.uniq
       end
 
       def _all_autoload_paths
-        @_all_autoload_paths ||= (config.autoload_paths + config.eager_load_paths + config.autoload_once_paths).uniq
+        @_all_autoload_paths ||= begin
+          autoload_paths  = config.autoload_paths
+          autoload_paths += config.eager_load_paths
+          autoload_paths -= config.autoload_once_paths
+          autoload_paths.uniq
+        end
       end
 
       def _all_load_paths(add_autoload_paths_to_load_path)
         @_all_load_paths ||= begin
-          load_paths  = config.paths.load_paths
-          load_paths += _all_autoload_paths if add_autoload_paths_to_load_path
+          load_paths = config.paths.load_paths
+          if add_autoload_paths_to_load_path
+            load_paths += _all_autoload_paths
+            load_paths += _all_autoload_once_paths
+          end
           load_paths.uniq
         end
       end

data/lib/rails/gem_version.rb

@@ -7,10 +7,10 @@ module Rails
   end
 
   module VERSION
-    MAJOR = 6
-    MINOR = 1
-    TINY  = 4
-    PRE   = "1"
+    MAJOR = 7
+    MINOR = 0
+    TINY  = 0
+    PRE   = "rc2"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/rails/generators/actions/create_migration.rb

@@ -6,7 +6,7 @@ require "thor/actions"
 module Rails
   module Generators
     module Actions
-      class CreateMigration < Thor::Actions::CreateFile #:nodoc:
+      class CreateMigration < Thor::Actions::CreateFile # :nodoc:
         def migration_dir
           File.dirname(@destination)
         end
@@ -39,10 +39,8 @@ module Rails
         end
 
         def existing_migration
-          @existing_migration ||= begin
-            @base.class.migration_exists?(migration_dir, migration_file_name) ||
+          @existing_migration ||= @base.class.migration_exists?(migration_dir, migration_file_name) ||
             File.exist?(@destination) && @destination
-          end
         end
         alias :exists? :existing_migration
 

data/lib/rails/generators/actions.rb

@@ -18,6 +18,7 @@ module Rails
       #   gem "technoweenie-restful-authentication", lib: "restful-authentication", source: "http://gems.github.com/"
       #   gem "rails", "3.0", git: "https://github.com/rails/rails"
       #   gem "RedCloth", ">= 4.1.0", "< 4.2.0"
+      #   gem "rspec", comment: "Put this comment above the gem declaration"
       def gem(*args)
         options = args.extract_options!
         name, *versions = args
@@ -26,6 +27,9 @@ module Rails
         # otherwise use name (version).
         parts, message = [ quote(name) ], name.dup
 
+        # Output a comment above the gem declaration.
+        comment = options.delete(:comment)
+
         if versions = versions.any? ? versions : options.delete(:version)
           _versions = Array(versions)
           _versions.each do |version|
@@ -40,9 +44,17 @@ module Rails
         parts << quote(options) unless options.empty?
 
         in_root do
-          str = "gem #{parts.join(", ")}"
-          str = indentation + str
-          append_file_with_newline "Gemfile", str, verbose: false
+          str = []
+          if comment
+            comment.each_line do |comment_line|
+              str << indentation
+              str << "# #{comment_line}"
+            end
+            str << "\n"
+          end
+          str << indentation
+          str << "gem #{parts.join(", ")}"
+          append_file_with_newline "Gemfile", str.join, verbose: false
         end
       end
 
@@ -268,14 +280,25 @@ module Rails
       #   route "root 'admin#index'", namespace: :admin
       def route(routing_code, namespace: nil)
         routing_code = Array(namespace).reverse.reduce(routing_code) do |code, ns|
-          "namespace :#{ns} do\n#{indent(code, 2)}\nend"
+          "namespace :#{ns} do\n#{optimize_indentation(code, 2)}end"
         end
 
         log :route, routing_code
-        sentinel = /\.routes\.draw do\s*\n/m
+
+        after_pattern = Array(namespace).each_with_index.reverse_each.reduce(nil) do |pattern, (ns, i)|
+          margin = "\\#{i + 1}[ ]{2}"
+          "(?:(?:^[ ]*\n|^#{margin}.*\n)*?^(#{margin})namespace :#{ns} do\n#{pattern})?"
+        end.then do |pattern|
+          /^([ ]*).+\.routes\.draw do[ ]*\n#{pattern}/
+        end
 
         in_root do
-          inject_into_file "config/routes.rb", optimize_indentation(routing_code, 2), after: sentinel, verbose: false, force: false
+          if existing = match_file("config/routes.rb", after_pattern)
+            base_indent, *, prev_indent = existing.captures.compact.map(&:length)
+            routing_code = optimize_indentation(routing_code, base_indent + 2).lines.grep_v(/^[ ]{,#{prev_indent}}\S/).join
+          end
+
+          inject_into_file "config/routes.rb", routing_code, after: after_pattern, verbose: false, force: false
         end
       end
 
@@ -323,8 +346,7 @@ module Rails
           end
         end
 
-        # Surround string with single quotes if there is no quotes.
-        # Otherwise fall back to double quotes
+        # Always returns value in double quotes.
         def quote(value) # :doc:
           if value.respond_to? :each_pair
             return value.map do |k, v|
@@ -333,11 +355,7 @@ module Rails
           end
           return value.inspect unless value.is_a? String
 
-          if value.include?("'")
-            value.inspect
-          else
-            "'#{value}'"
-          end
+          "\"#{value.tr("'", '"')}\""
         end
 
         # Returns optimized string with indentation
@@ -365,6 +383,10 @@ module Rails
             match.end_with?("\n") ? "" : "\n#{str}\n"
           end
         end
+
+        def match_file(path, pattern)
+          File.read(path).match(pattern) if File.exist?(path)
+        end
     end
   end
 end