railties 7.0.0 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cb58ddc9e6fbbf28a0fb9c625cecec9cd282d59ccd697cf37cd1f78f7d25811
-  data.tar.gz: b6304f9dfa982671da582fb01c63f310b76d3d043aca2826ff5c54acecc7f90c
+  metadata.gz: '02971c2aea82d6438c050e658cf682158f9942bd3b2d37a957af8e9869e6e26e'
+  data.tar.gz: f448cdadd24a8c84fded45c69536d451ba1e7921bcde12aafd6dc0ef33c44b0b
 SHA512:
-  metadata.gz: febb1c2b1fc87226219dc2cf5870c236b801624c9a4d8c62b0853a1e3e033fbfec76e5b418de34774e069aa0b60d8b2c687c68ab729cc7165806974f16373b40
-  data.tar.gz: a6305f03e1ed58b3afd6a9647b6fb43a48007c08370db1e066c15e135ce159c9adc7ac84c318033264e1c18cafdf2d9446d3e08341e4922c46fb7c7b83a81ff7
+  metadata.gz: d199f6437a4650717d50a7a42c76ec847017809ffe1c53e0720c2ae6c9938fbaab00b491c9de61e482b8dca0f10b1c81be3f8d69edfbfd1fdeb9a52322dc89e5
+  data.tar.gz: b076e654baa6d781d0c7668e2f034facc363d14fc4245207e586dcf74fe8fc0c18410b1fdd230d979976b42f53beeef5ac47a05dc9f89b1b69259e246aac49d0

data/CHANGELOG.md

@@ -1,3 +1,30 @@
+## Rails 7.0.1 (January 06, 2022) ##
+
+*   Prevent duplicate entries in plugin Gemfile.
+
+    *Jonathan Hefner*
+
+*   Fix asset pipeline errors for plugin dummy apps.
+
+    *Jonathan Hefner*
+
+*   Fix generated route revocation.
+
+    *Jonathan Hefner*
+
+*   Addresses an issue in which Sidekiq jobs could not reload certain
+    namespaces.
+
+    See [fxn/zeitwerk#198](https://github.com/fxn/zeitwerk/issues/198) for
+    details.
+
+    *Xavier Noria*
+
+*   Fix plugin generator to a plugin that pass all the tests.
+
+    *Rafael Mendonça França*
+
+
 ## Rails 7.0.0 (December 15, 2021) ##
 
 *   No changes.

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2021 David Heinemeier Hansson
+Copyright (c) 2004-2022 David Heinemeier Hansson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/rails/application/finisher.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "zeitwerk"
 require "active_support/core_ext/string/inflections"
 require "active_support/core_ext/array/conversions"
 require "active_support/descendants_tracker"

data/lib/rails/application.rb

@@ -10,6 +10,7 @@ require "active_support/hash_with_indifferent_access"
 require "active_support/configuration_file"
 require "rails/engine"
 require "rails/secrets"
+require "rails/autoloaders"
 
 module Rails
   # An Engine with the responsibility of coordinating the whole boot process.
@@ -95,7 +96,7 @@ module Rails
 
     attr_accessor :assets, :sandbox
     alias_method :sandbox?, :sandbox
-    attr_reader :reloaders, :reloader, :executor
+    attr_reader :reloaders, :reloader, :executor, :autoloaders
 
     delegate :default_url_options, :default_url_options=, to: :routes
 
@@ -117,6 +118,8 @@ module Rails
       @reloader          = Class.new(ActiveSupport::Reloader)
       @reloader.executor = @executor
 
+      @autoloaders = Rails::Autoloaders.new
+
       # are these actually used?
       @initial_variable_values = initial_variable_values
       @block = block

data/lib/rails/autoloaders/inflector.rb

@@ -3,7 +3,7 @@
 require "active_support/inflector"
 
 module Rails
-  module Autoloaders
+  class Autoloaders
     module Inflector # :nodoc:
       # Concurrent::Map is not needed. This is a private class, and overrides
       # must be defined while the application boots.

data/lib/rails/autoloaders.rb

@@ -1,44 +1,48 @@
 # frozen_string_literal: true
 
-require "zeitwerk"
-
 module Rails
-  module Autoloaders # :nodoc:
+  class Autoloaders # :nodoc:
     require_relative "autoloaders/inflector"
 
-    class << self
-      include Enumerable
-
-      def main
-        @main ||= Zeitwerk::Loader.new.tap do |loader|
-          loader.tag = "rails.main"
-          loader.inflector = Inflector
-        end
-      end
-
-      def once
-        @once ||= Zeitwerk::Loader.new.tap do |loader|
-          loader.tag = "rails.once"
-          loader.inflector = Inflector
-        end
-      end
-
-      def each
-        yield main
-        yield once
-      end
-
-      def logger=(logger)
-        each { |loader| loader.logger = logger }
-      end
-
-      def log!
-        each(&:log!)
-      end
-
-      def zeitwerk_enabled?
-        true
-      end
+    include Enumerable
+
+    attr_reader :main, :once
+
+    def initialize
+      # This `require` delays loading the library on purpose.
+      #
+      # In Rails 7.0.0, railties/lib/rails.rb loaded Zeitwerk as a side-effect,
+      # but a couple of edge cases related to Bundler and Bootsnap showed up.
+      # They had to do with order of decoration of `Kernel#require`, something
+      # the three of them do.
+      #
+      # Delaying this `require` up to this point is a convenient trade-off.
+      require "zeitwerk"
+
+      @main = Zeitwerk::Loader.new
+      @main.tag = "rails.main"
+      @main.inflector = Inflector
+
+      @once = Zeitwerk::Loader.new
+      @once.tag = "rails.once"
+      @once.inflector = Inflector
+    end
+
+    def each
+      yield main
+      yield once
+    end
+
+    def logger=(logger)
+      each { |loader| loader.logger = logger }
+    end
+
+    def log!
+      each(&:log!)
+    end
+
+    def zeitwerk_enabled?
+      true
     end
   end
 end

data/lib/rails/commands/dbconsole/dbconsole_command.rb

@@ -97,15 +97,18 @@ module Rails
     def db_config
       return @db_config if defined?(@db_config)
 
-      # We need to check whether the user passed the database the
-      # first time around to show a consistent error message to people
-      # relying on 2-level database configuration.
-
-      @db_config = configurations.configs_for(env_name: environment, name: database, include_hidden: true)
+      # If the user provided a database, use that. Otherwise find
+      # the first config in the database.yml
+      if database
+        @db_config = configurations.configs_for(env_name: environment, name: database, include_hidden: true)
+      else
+        @db_config = configurations.find_db_config(environment)
+      end
 
       unless @db_config
+        missing_db = database ? "'#{database}' database is not" : "No databases are"
         raise ActiveRecord::AdapterNotSpecified,
-          "'#{database}' database is not configured for '#{environment}'. Available configuration: #{configurations.inspect}"
+          "#{missing_db} configured for '#{environment}'. Available configuration: #{configurations.inspect}"
       end
 
       @db_config
@@ -116,7 +119,7 @@ module Rails
     end
 
     def database
-      @options.fetch(:database, "primary")
+      @options[:database]
     end
 
     private

data/lib/rails/gem_version.rb

@@ -9,7 +9,7 @@ module Rails
   module VERSION
     MAJOR = 7
     MINOR = 0
-    TINY  = 0
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

data/lib/rails/generators/actions.rb

@@ -279,26 +279,32 @@ module Rails
       #   route "root 'welcome#index'"
       #   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#{optimize_indentation(code, 2)}end"
+        namespace = Array(namespace)
+        namespace_pattern = route_namespace_pattern(namespace)
+        routing_code = namespace.reverse.reduce(routing_code) do |code, name|
+          "namespace :#{name} do\n#{rebase_indentation(code, 2)}end"
         end
 
         log :route, routing_code
 
-        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
-          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
+          if namespace_match = match_file("config/routes.rb", namespace_pattern)
+            base_indent, *, existing_block_indent = namespace_match.captures.compact.map(&:length)
+            existing_line_pattern = /^[ ]{,#{existing_block_indent}}\S.+\n?/
+            routing_code = rebase_indentation(routing_code, base_indent + 2).gsub(existing_line_pattern, "")
+            namespace_pattern = /#{Regexp.escape namespace_match.to_s}/
           end
 
-          inject_into_file "config/routes.rb", routing_code, after: after_pattern, verbose: false, force: false
+          inject_into_file "config/routes.rb", routing_code, after: namespace_pattern, verbose: false, force: false
+
+          if behavior == :revoke && namespace.any? && namespace_match
+            empty_block_pattern = /(#{namespace_pattern})((?:\s*end\n){1,#{namespace.size}})/
+            gsub_file "config/routes.rb", empty_block_pattern, verbose: false, force: true do |matched|
+              beginning, ending = empty_block_pattern.match(matched).captures
+              ending.sub!(/\A\s*end\n/, "") while !ending.empty? && beginning.sub!(/^[ ]*namespace .+ do\n\s*\z/, "")
+              beginning + ending
+            end
+          end
         end
       end
 
@@ -363,6 +369,7 @@ module Rails
           return "#{value}\n" unless value.is_a?(String)
           "#{value.strip_heredoc.indent(amount).chomp}\n"
         end
+        alias rebase_indentation optimize_indentation
 
         # Indent the +Gemfile+ to the depth of @indentation
         def indentation # :doc:
@@ -387,6 +394,16 @@ module Rails
         def match_file(path, pattern)
           File.read(path).match(pattern) if File.exist?(path)
         end
+
+        def route_namespace_pattern(namespace)
+          namespace.each_with_index.reverse_each.reduce(nil) do |pattern, (name, i)|
+            cummulative_margin = "\\#{i + 1}[ ]{2}"
+            blank_or_indented_line = "^[ ]*\n|^#{cummulative_margin}.*\n"
+            "(?:(?:#{blank_or_indented_line})*?^(#{cummulative_margin})namespace :#{name} do\n#{pattern})?"
+          end.then do |pattern|
+            /^([ ]*).+\.routes\.draw do[ ]*\n#{pattern}/
+          end
+        end
     end
   end
 end

data/lib/rails/generators/app_base.rb

@@ -108,16 +108,18 @@ module Rails
 
     private
       def gemfile_entries # :doc:
-        [rails_gemfile_entry,
-         asset_pipeline_gemfile_entry,
-         database_gemfile_entry,
-         web_server_gemfile_entry,
-         javascript_gemfile_entry,
-         hotwire_gemfile_entry,
-         css_gemfile_entry,
-         jbuilder_gemfile_entry,
-         psych_gemfile_entry,
-         cable_gemfile_entry].flatten.find_all(&@gem_filter)
+        [
+          rails_gemfile_entry,
+          asset_pipeline_gemfile_entry,
+          database_gemfile_entry,
+          web_server_gemfile_entry,
+          javascript_gemfile_entry,
+          hotwire_gemfile_entry,
+          css_gemfile_entry,
+          jbuilder_gemfile_entry,
+          psych_gemfile_entry,
+          cable_gemfile_entry,
+        ].flatten.compact.select(&@gem_filter)
       end
 
       def builder # :doc:
@@ -159,7 +161,8 @@ module Rails
       end
 
       def database_gemfile_entry # :doc:
-        return [] if options[:skip_active_record]
+        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"
@@ -170,15 +173,13 @@ module Rails
       end
 
       def asset_pipeline_gemfile_entry
-        return [] if options[:skip_asset_pipeline]
+        return if options[:skip_asset_pipeline]
 
         if options[:asset_pipeline] == "sprockets"
           GemfileEntry.floats "sprockets-rails",
             "The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]"
         elsif options[:asset_pipeline] == "propshaft"
           GemfileEntry.floats "propshaft", "The modern asset pipeline for Rails [https://github.com/rails/propshaft]"
-        else
-          []
         end
       end
 
@@ -264,20 +265,13 @@ module Rails
           new(name, nil, comment, path: path)
         end
 
-        def version
-          version = super
-
-          if version.is_a?(Array)
-            version.join('", "')
-          else
-            version
-          end
-        end
-
         def to_s
-          [ ("# #{comment}\n" if comment),
-            ("# " if commented_out), "gem \"#{name}\"", (", \"#{version}\"" if version),
-            *options.map { |key, val| ", #{key}: #{val.inspect}" }
+          [
+            (comment.gsub(/^/, "# ").chomp + "\n" if comment),
+            ("# " if commented_out),
+            "gem \"#{name}\"",
+            *Array(version).map { |constraint| ", \"#{constraint}\"" },
+            *options.map { |key, value| ", #{key}: #{value.inspect}" },
           ].compact.join
         end
       end
@@ -314,12 +308,12 @@ module Rails
       end
 
       def jbuilder_gemfile_entry
-        return [] if options[:skip_jbuilder]
+        return if options[:skip_jbuilder]
         GemfileEntry.new "jbuilder", nil, "Build JSON APIs with ease [https://github.com/rails/jbuilder]", {}, options[:api]
       end
 
       def javascript_gemfile_entry
-        return [] if options[:skip_javascript]
+        return if options[:skip_javascript]
 
         if adjusted_javascript_option == "importmap"
           GemfileEntry.floats "importmap-rails", "Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails]"
@@ -329,7 +323,7 @@ module Rails
       end
 
       def hotwire_gemfile_entry
-        return [] if options[:skip_javascript] || options[:skip_hotwire]
+        return if options[:skip_javascript] || options[:skip_hotwire]
 
         turbo_rails_entry =
           GemfileEntry.floats "turbo-rails", "Hotwire's SPA-like page accelerator [https://turbo.hotwired.dev]"
@@ -355,7 +349,7 @@ module Rails
       end
 
       def css_gemfile_entry
-        return [] unless options[:css]
+        return unless options[:css]
 
         if !using_node? && options[:css] == "tailwind"
           GemfileEntry.floats "tailwindcss-rails", "Use Tailwind CSS [https://github.com/rails/tailwindcss-rails]"
@@ -365,7 +359,7 @@ module Rails
       end
 
       def psych_gemfile_entry
-        return [] unless defined?(Rubinius)
+        return unless defined?(Rubinius)
 
         comment = "Use Psych as the YAML engine, instead of Syck, so serialized " \
                   "data can be read safely from different rubies (see http://git.io/uuLVag)"
@@ -373,11 +367,10 @@ module Rails
       end
 
       def cable_gemfile_entry
-        return [] if options[:skip_action_cable]
+        return if options[:skip_action_cable]
+
         comment = "Use Redis adapter to run Action Cable in production"
-        gems = []
-        gems << GemfileEntry.new("redis", "~> 4.0", comment, {}, true)
-        gems
+        GemfileEntry.new("redis", "~> 4.0", comment, {}, true)
       end
 
       def bundle_command(command, env = {})

data/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt

@@ -8,7 +8,7 @@ require "active_support/core_ext/integer/time"
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
-  # Turn false under Spring and add config.action_view.cache_template_loading = true
+  # Turn false under Spring and add config.action_view.cache_template_loading = true.
   config.cache_classes = true
 
   # Eager loading loads your whole application. When running a single test locally,

data/lib/rails/generators/rails/plugin/plugin_generator.rb

@@ -226,6 +226,10 @@ module Rails
       def initialize(*args)
         @dummy_path = nil
         super
+
+        if !engine? || !with_dummy_app?
+          self.options = options.merge(skip_asset_pipeline: true).freeze
+        end
       end
 
       public_task :set_default_accessors!
@@ -309,6 +313,33 @@ module Rails
       end
 
     private
+      def gemfile_entries
+        [
+          rails_gemfile_entry,
+          simplify_gemfile_entries(
+            database_gemfile_entry,
+            asset_pipeline_gemfile_entry,
+          ),
+        ].flatten.compact
+      end
+
+      def rails_gemfile_entry
+        if options[:skip_gemspec]
+          super
+        elsif rails_prerelease?
+          super.dup.tap do |entry|
+            entry.comment = <<~COMMENT
+              Your gem is dependent on a prerelease version of Rails. Once you can lock this
+              dependency down to a specific version, move it to your gemspec.
+            COMMENT
+          end
+        end
+      end
+
+      def simplify_gemfile_entries(*gemfile_entries)
+        gemfile_entries.flatten.compact.map { |entry| GemfileEntry.floats(entry.name) }
+      end
+
       def create_dummy_app(path = nil)
         dummy_path(path) if path
 

data/lib/rails/generators/rails/plugin/templates/Gemfile.tt

@@ -1,32 +1,19 @@
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+<% unless options[:skip_gemspec] -%>
 
-<% if options[:skip_gemspec] -%>
-<%= "# " if rails_prerelease? -%>gem "rails", "<%= Array(rails_version_specifier).join("', '") %>"
-<% else -%>
 # Specify your gem's dependencies in <%= name %>.gemspec.
 gemspec
 <% end -%>
-<% unless options[:skip_active_record] -%>
-
-group :development do
-  gem "<%= gem_for_database[0] %>"
-end
-<% end -%>
-
-<% if rails_prerelease? -%>
-# Your gem is dependent on a prerelease version of Rails. Once you can lock this
-# dependency down to a specific version, move it to your gemspec.
-<% gemfile_entries.each do |gemfile_entry| -%>
+<% gemfile_entries.each do |gemfile_entry| %>
 <%= gemfile_entry %>
-<% end -%>
-
 <% end -%>
 <% if RUBY_ENGINE == "ruby" -%>
-# Start debugger with binding.b -- Read more: https://github.com/ruby/debug
-# gem "debug", ">= 1.0.0", group: %i[ development test ]
+
+# Start debugger with binding.b [https://github.com/ruby/debug]
+# gem "debug", ">= 1.0.0"
 <% end -%>
-<% if RUBY_PLATFORM.match(/bccwin|cygwin|emx|mingw|mswin|wince|java/) -%>
+<% if RUBY_PLATFORM.match?(/bccwin|cygwin|emx|mingw|mswin|wince|java/) -%>
 
-gem "tzinfo-data", platforms: %i[ mingw mswin x64_mingw jruby]
+gem "tzinfo-data", platforms: %i[ mingw mswin x64_mingw jruby ]
 <% end -%>

data/lib/rails.rb

@@ -12,7 +12,6 @@ require "active_support/core_ext/object/blank"
 
 require "rails/application"
 require "rails/version"
-require "rails/autoloaders"
 
 require "active_support/railtie"
 require "action_dispatch/railtie"
@@ -115,7 +114,7 @@ module Rails
     end
 
     def autoloaders
-      Autoloaders
+      application.autoloaders
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railties
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.0.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-15 00:00:00.000000000 Z
+date: 2022-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.0.1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.0.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.0.1
 description: 'Rails internals: application bootup, plugins, generators, and rake tasks.'
 email: david@loudthinking.com
 executables:
@@ -422,10 +422,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v7.0.0/railties/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.0.0/
+  changelog_uri: https://github.com/rails/rails/blob/v7.0.1/railties/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.0.1/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.0.0/railties
+  source_code_uri: https://github.com/rails/rails/tree/v7.0.1/railties
   rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: