railties 7.0.10 → 7.1.0.beta1

data/lib/rails/commands/version/version_command.rb

@@ -3,6 +3,7 @@
 module Rails
   module Command
     class VersionCommand < Base # :nodoc:
+      desc "version", "Show the Rails version"
       def perform
         Rails::Command.invoke :application, [ "--version" ]
       end

data/lib/rails/configuration.rb

@@ -7,17 +7,17 @@ require "rails/rack"
 
 module Rails
   module Configuration
-    # MiddlewareStackProxy is a proxy for the Rails middleware stack that allows
+    # MiddlewareStackProxy is a proxy for the \Rails middleware stack that allows
     # you to configure middlewares in your application. It works basically as a
     # command recorder, saving each command to be applied after initialization
     # over the default middleware stack, so you can add, swap, or remove any
-    # middleware in Rails.
+    # middleware in \Rails.
     #
     # You can add your own middlewares by using the +config.middleware.use+ method:
     #
     #     config.middleware.use Magical::Unicorns
     #
-    # This will put the <tt>Magical::Unicorns</tt> middleware on the end of the stack.
+    # This will put the +Magical::Unicorns+ middleware on the end of the stack.
     # You can use +insert_before+ if you wish to add a middleware before another:
     #
     #     config.middleware.insert_before Rack::Head, Magical::Unicorns
@@ -34,8 +34,8 @@ module Rails
     #
     #     config.middleware.move_before ActionDispatch::Flash, Magical::Unicorns
     #
-    # This will move the <tt>Magical::Unicorns</tt> middleware before the
-    # <tt>ActionDispatch::Flash</tt>. You can also move it after:
+    # This will move the +Magical::Unicorns+ middleware before the
+    # +ActionDispatch::Flash+. You can also move it after:
     #
     #     config.middleware.move_after ActionDispatch::Flash, Magical::Unicorns
     #

data/lib/rails/console/app.rb

@@ -9,9 +9,7 @@ module Rails
     # instance, pass a non-false value as the parameter.
     def app(create = false)
       @app_integration_instance = nil if create
-      @app_integration_instance ||= new_session do |sess|
-        sess.host! "www.example.com"
-      end
+      @app_integration_instance ||= new_session
     end
 
     # create a new session. If a block is given, the new session will be yielded
@@ -19,7 +17,6 @@ module Rails
     def new_session
       app = Rails.application
       session = ActionDispatch::Integration::Session.new(app)
-      yield session if block_given?
 
       # This makes app.url_for and app.foo_path available in the console
       session.extend(app.routes.url_helpers)

data/lib/rails/deprecator.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Rails
+  def self.deprecator # :nodoc:
+    @deprecator ||= ActiveSupport::Deprecation.new
+  end
+end

data/lib/rails/engine/configuration.rb

@@ -50,6 +50,9 @@ module Rails
           paths.add "app/mailers",         eager_load: true
           paths.add "app/views"
 
+          # If you add more lib subdirectories here that should not be managed
+          # by the main autoloader, please update the config.autoload_lib call
+          # in the template that generates config/application.rb accordingly.
           paths.add "lib",                 load_path: true
           paths.add "lib/assets",          glob: "*"
           paths.add "lib/tasks",           glob: "**/*.rake"
@@ -68,6 +71,8 @@ module Rails
           paths.add "vendor",              load_path: true
           paths.add "vendor/assets",       glob: "*"
 
+          paths.add "test/mailers/previews", autoload: true
+
           paths
         end
       end

data/lib/rails/engine.rb

@@ -9,14 +9,13 @@ require "pathname"
 require "thread"
 
 module Rails
-  # <tt>Rails::Engine</tt> allows you to wrap a specific Rails application or subset of
+  # +Rails::Engine+ allows you to wrap a specific \Rails application or subset of
   # functionality and share it with other applications or within a larger packaged application.
   # Every Rails::Application is just an engine, which allows for simple
   # feature and application sharing.
   #
-  # Any <tt>Rails::Engine</tt> is also a Rails::Railtie, so the same
-  # methods (like {rake_tasks}[rdoc-ref:Rails::Railtie::rake_tasks] and
-  # {generators}[rdoc-ref:Rails::Railtie::generators]) and configuration
+  # Any +Rails::Engine+ is also a Rails::Railtie, so the same
+  # methods (like <tt>rake_tasks</tt> and +generators+) and configuration
   # options that are available in railties can also be used in engines.
   #
   # == Creating an Engine
@@ -117,7 +116,7 @@ module Rails
   # An engine can also be a Rack application. It can be useful if you have a Rack application that
   # you would like to provide with some of the +Engine+'s features.
   #
-  # To do that, use the ::endpoint method:
+  # To do that, use the +endpoint+ method:
   #
   #   module MyEngine
   #     class Engine < Rails::Engine
@@ -182,7 +181,7 @@ module Rails
   #   it's used as default <tt>:as</tt> option
   # * rake task for installing migrations <tt>my_engine:install:migrations</tt>
   #
-  # Engine name is set by default based on class name. For <tt>MyEngine::Engine</tt> it will be
+  # Engine name is set by default based on class name. For +MyEngine::Engine+ it will be
   # <tt>my_engine_engine</tt>. You can change it manually using the <tt>engine_name</tt> method:
   #
   #   module MyEngine
@@ -198,7 +197,7 @@ module Rails
   # named routes from the application will be available to your engine's controllers as well.
   #
   # However, sometimes you want to isolate your engine from the application, especially if your engine
-  # has its own router. To do that, you simply need to call ::isolate_namespace. This method requires
+  # has its own router. To do that, you simply need to call +isolate_namespace+. This method requires
   # you to pass a module where all your controllers, helpers, and models should be nested to:
   #
   #   module MyEngine
@@ -232,14 +231,14 @@ module Rails
   #   end
   #
   # If +MyEngine+ is isolated, the routes above will point to
-  # <tt>MyEngine::ArticlesController</tt>. You also don't need to use longer
+  # +MyEngine::ArticlesController+. You also don't need to use longer
   # URL helpers like +my_engine_articles_path+. Instead, you should simply use
   # +articles_path+, like you would do with your main application.
   #
   # To make this behavior consistent with other parts of the framework,
   # isolated engines also have an effect on ActiveModel::Naming. In a
-  # normal Rails app, when you use a namespaced model such as
-  # <tt>Namespace::Article</tt>, ActiveModel::Naming will generate
+  # normal \Rails app, when you use a namespaced model such as
+  # +Namespace::Article+, ActiveModel::Naming will generate
   # names with the prefix "namespace". In an isolated engine, the prefix will
   # be omitted in URL helpers and form fields, for convenience.
   #
@@ -253,7 +252,7 @@ module Rails
   # Additionally, an isolated engine will set its own name according to its
   # namespace, so <tt>MyEngine::Engine.engine_name</tt> will return
   # "my_engine". It will also set +MyEngine.table_name_prefix+ to "my_engine_",
-  # meaning for example that <tt>MyEngine::Article</tt> will use the
+  # meaning for example that +MyEngine::Article+ will use the
   # +my_engine_articles+ database table by default.
   #
   # == Using Engine's routes outside Engine
@@ -328,7 +327,7 @@ module Rails
   # To use engine's migrations in application you can use the rake task below, which copies them to
   # application's dir:
   #
-  #   $ rake ENGINE_NAME:install:migrations
+  #   rake ENGINE_NAME:install:migrations
   #
   # Note that some of the migrations may be skipped if a migration with the same name already exists
   # in application. In such a situation you must decide whether to leave that migration or rename the
@@ -451,7 +450,7 @@ module Rails
       self
     end
 
-    # Load Rails runner and invoke the registered hooks.
+    # Load \Rails runner and invoke the registered hooks.
     # Check Rails::Railtie.runner for more info.
     def load_runner(app = self)
       run_runner_blocks(app)
@@ -466,7 +465,7 @@ module Rails
       self
     end
 
-    # Load Rails generators and invoke the registered hooks.
+    # Load \Rails generators and invoke the registered hooks.
     # Check Rails::Railtie.generators for more info.
     def load_generators(app = self)
       require "rails/generators"
@@ -495,8 +494,7 @@ module Rails
     def helpers
       @helpers ||= begin
         helpers = Module.new
-        all = ActionController::Base.all_helpers_from_path(helpers_paths)
-        ActionController::Base.modules_for_helpers(all).each do |mod|
+        AbstractController::Helpers.helper_modules_from_paths(helpers_paths).each do |mod|
           helpers.include(mod)
         end
         helpers
@@ -588,6 +586,7 @@ module Rails
       routing_paths = paths["config/routes.rb"].existent
       external_paths = self.paths["config/routes"].paths
       routes.draw_paths.concat(external_paths)
+      app.routes.draw_paths.concat(external_paths)
 
       if routes? || routing_paths.any?
         app.routes_reloader.paths.unshift(*routing_paths)
@@ -610,6 +609,22 @@ module Rails
       end
     end
 
+    initializer :add_mailer_preview_paths do
+      previews = paths["test/mailers/previews"].existent
+      unless previews.empty?
+        ActiveSupport.on_load(:action_mailer) { self.preview_paths |= previews }
+      end
+    end
+
+    initializer :add_fixture_paths do
+      next if is_a?(Rails::Application)
+
+      fixtures = config.root.join("test", "fixtures")
+      if fixtures_in_root_and_not_in_vendor?(fixtures)
+        ActiveSupport.on_load(:active_record_fixtures) { self.fixture_paths |= ["#{fixtures}/"] }
+      end
+    end
+
     initializer :prepend_helpers_path do |app|
       if !isolated? || (app == self)
         app.config.helpers_paths.unshift(*paths["app/helpers"].existent)
@@ -713,6 +728,11 @@ module Rails
         end
       end
 
+      def fixtures_in_root_and_not_in_vendor?(fixtures)
+        fixtures.exist? && fixtures.to_s.start_with?(Rails.root.to_s) &&
+          !fixtures.to_s.start_with?(Rails.root.join("vendor").to_s)
+      end
+
       def build_request(env)
         env.merge!(env_config)
         req = ActionDispatch::Request.new env

data/lib/rails/gem_version.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
 module Rails
-  # Returns the currently loaded version of Rails as a <tt>Gem::Version</tt>.
+  # Returns the currently loaded version of \Rails as a +Gem::Version+.
   def self.gem_version
     Gem::Version.new VERSION::STRING
   end
 
   module VERSION
     MAJOR = 7
-    MINOR = 0
-    TINY  = 10
-    PRE   = nil
+    MINOR = 1
+    TINY  = 0
+    PRE   = "beta1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/rails/generators/actions.rb

@@ -162,7 +162,7 @@ module Rails
         end
       end
 
-      # Adds configuration code to a Rails runtime environment.
+      # Adds configuration code to a \Rails runtime environment.
       #
       # By default, adds code inside the +Application+ class in
       # +config/application.rb+ so that it applies to all environments.
@@ -349,7 +349,7 @@ module Rails
       # ==== Options
       #
       # [+:env+]
-      #   The Rails environment in which to run the task. Defaults to
+      #   The \Rails environment in which to run the task. Defaults to
       #   <tt>ENV["RAILS_ENV"] || "development"</tt>.
       #
       # [+:abort_on_failure+]
@@ -365,7 +365,7 @@ module Rails
         execute_command :rake, command, options
       end
 
-      # Runs the specified Rails command.
+      # Runs the specified \Rails command.
       #
       #   rails_command "db:migrate"
       #   rails_command "db:migrate", env: "production"
@@ -376,7 +376,7 @@ module Rails
       # ==== Options
       #
       # [+:env+]
-      #   The Rails environment in which to run the command. Defaults to
+      #   The \Rails environment in which to run the command. Defaults to
       #   <tt>ENV["RAILS_ENV"] || "development"</tt>.
       #
       # [+:abort_on_failure+]
@@ -402,7 +402,7 @@ module Rails
         end
       end
 
-      # Make an entry in Rails routing file <tt>config/routes.rb</tt>
+      # Make an entry in \Rails routing file <tt>config/routes.rb</tt>
       #
       #   route "root 'welcome#index'"
       #   route "root 'admin#index'", namespace: :admin
@@ -468,16 +468,7 @@ module Rails
             abort_on_failure: options[:abort_on_failure],
           }
 
-          in_root { run("#{sudo}#{extify(executor)} #{command}", config) }
-        end
-
-        # Add an extension to the given name based on the platform.
-        def extify(name) # :doc:
-          if Gem.win_platform?
-            "#{name}.bat"
-          else
-            name
-          end
+          in_root { run("#{sudo}#{Shellwords.escape Gem.ruby} bin/#{executor} #{command}", config) }
         end
 
         # Always returns value in double quotes.

data/lib/rails/generators/active_model.rb

@@ -2,7 +2,7 @@
 
 module Rails
   module Generators
-    # ActiveModel is a class to be implemented by each ORM to allow Rails to
+    # ActiveModel is a class to be implemented by each ORM to allow \Rails to
     # generate customized controller code.
     #
     # The API has the same methods as ActiveRecord, but each method returns a
@@ -32,27 +32,21 @@ module Rails
         @name = name
       end
 
-      # Used for:
-      #
-      # * GET +index+
+      # GET index
       def self.all(klass)
         "#{klass}.all"
       end
 
-      # Used for:
-      #
-      # * GET +show+
-      # * GET +edit+
-      # * PATCH / PUT +update+
-      # * DELETE +destroy+
+      # GET show
+      # GET edit
+      # PATCH/PUT update
+      # DELETE destroy
       def self.find(klass, params = nil)
         "#{klass}.find(#{params})"
       end
 
-      # Used for:
-      #
-      # * GET +new+
-      # * POST +create+
+      # GET new
+      # POST create
       def self.build(klass, params = nil)
         if params
           "#{klass}.new(#{params})"
@@ -61,33 +55,25 @@ module Rails
         end
       end
 
-      # Used for:
-      #
-      # * POST +create+
+      # POST create
       def save
         "#{name}.save"
       end
 
-      # Used for:
-      #
-      # * PATCH / PUT +update+
+      # PATCH/PUT update
       def update(params = nil)
         "#{name}.update(#{params})"
       end
 
-      # Used for:
-      #
-      # * POST +create+
-      # * PATCH / PUT +update+
+      # POST create
+      # PATCH/PUT update
       def errors
         "#{name}.errors"
       end
 
-      # Used for:
-      #
-      # * DELETE +destroy+
+      # DELETE destroy
       def destroy
-        "#{name}.destroy"
+        "#{name}.destroy!"
       end
     end
   end