railties 7.1.3.3 → 7.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12b250fd88f8442ccbc5f2cc2bf490e819275dac23cac5c13e5bd10ecde8aba8
-  data.tar.gz: 595d811ee60279b5809efed0197fe6b36ab29c7f298e6d14280a4fdc8568b258
+  metadata.gz: 8866f3e8c17f561a89af9ed456dba62eee93d26ee1c1acdffe0be77b4b5c02dd
+  data.tar.gz: 1f78f4f77ba304da3820061f9fe4f31b50272f475742fabe50129dbc28b55a6d
 SHA512:
-  metadata.gz: 19638e05708b2588e75dbc325796764024e96615a3ca4180f54c26dc91c02abe5109b95fd98736c82d120000f08e9030bd3722be5977298652a1db945a4cf2ae
-  data.tar.gz: fa40a162e772abddc4177c7f01b695f4776ebb55840359ba6b70b071142ac66299089e25be6f7c9ffbd9659f2aeb3f748070ca70435835b9531c1167ebf8713c
+  metadata.gz: b7a5c857425f845fbfb1bf49bc2e0340e6a46c9ff969c0df938c27b88edb16f226cd7a31ec3a9f43aceffb1c0b6d1edca964af93f9e05085ad5ec8191eb474e9
+  data.tar.gz: 3ea3b1f145ad2439d1fcf347ad45c37e13dfe4d29ec40bc0b2159947a4df813ec2397e5f9a219011afb373a5f0a169249512dc284cd06c63ad689b91ea5f4941

data/CHANGELOG.md

@@ -1,3 +1,46 @@
+## Rails 7.1.4 (August 22, 2024) ##
+
+*   Preserve `--asset-pipeline propshaft` when running `app:update`.
+
+    *Zacharias Knudsen*
+
+*   Allow string keys for SQLCommenter.
+
+    *Ngan Pham*
+
+*   Fix derived foreign key to return correctly when association id is part of query constraints.
+
+    *Varun Sharma*
+
+*   Show warning for `secret_key_base` in development too.
+
+    *fatkodima*
+
+*   Fix sanitizer vendor configuration in 7.1 defaults.
+
+    In apps where `rails-html-sanitizer` was not eagerly loaded, the sanitizer default could end up
+    being Rails::HTML4::Sanitizer when it should be set to `Rails::HTML5::Sanitizer`.
+
+    *Mike Dalessio*, *Rafael Mendonça França*
+
+*   Revert the use of `Concurrent.physical_processor_count` in default Puma config
+
+    While for many people this saves one config to set, for many others using
+    a shared hosting solution, this cause the default configuration to spawn
+    way more workers than reasonable.
+
+    There is unfortunately no reliable way to detect how many cores an application
+    can realistically use, and even then, assuming the application should use
+    all the machine resources is often wrong.
+
+    *Jean Boussier*
+
+
+## Rails 7.1.3.4 (June 04, 2024) ##
+
+*   No changes.
+
+
 ## Rails 7.1.3.3 (May 16, 2024) ##
 
 *   No changes.

data/lib/rails/app_updater.rb

@@ -31,10 +31,22 @@ module Rails
           options[:skip_action_cable]   = !defined?(ActionCable::Engine)
           options[:skip_test]           = !defined?(Rails::TestUnitRailtie)
           options[:skip_system_test]    = Rails.application.config.generators.system_tests.nil?
-          options[:skip_asset_pipeline] = !defined?(Sprockets::Railtie) && !defined?(Propshaft::Railtie)
+          options[:asset_pipeline]      = asset_pipeline
+          options[:skip_asset_pipeline] = asset_pipeline.nil?
           options[:skip_bootsnap]       = !defined?(Bootsnap)
           options
         end
+
+        def asset_pipeline
+          case
+          when defined?(Sprockets::Railtie)
+            "sprockets"
+          when defined?(Propshaft::Railtie)
+            "propshaft"
+          else
+            nil
+          end
+        end
     end
   end
 end

data/lib/rails/application/configuration.rb

@@ -320,14 +320,14 @@ module Rails
             action_controller.allow_deprecated_parameters_hash_equality = false
           end
 
-          if defined?(Rails::HTML::Sanitizer) # nested ifs to avoid linter errors
-            if respond_to?(:action_view)
-              action_view.sanitizer_vendor = Rails::HTML::Sanitizer.best_supported_vendor
-            end
+          if respond_to?(:action_view)
+            require "action_view/helpers"
+            action_view.sanitizer_vendor = Rails::HTML::Sanitizer.best_supported_vendor
+          end
 
-            if respond_to?(:action_text)
-              action_text.sanitizer_vendor = Rails::HTML::Sanitizer.best_supported_vendor
-            end
+          if respond_to?(:action_text)
+            require "action_view/helpers"
+            action_text.sanitizer_vendor = Rails::HTML::Sanitizer.best_supported_vendor
           end
         else
           raise "Unknown version #{target_version.to_s.inspect}"

data/lib/rails/application.rb

@@ -476,27 +476,30 @@ module Rails
     # then +credentials.secret_key_base+, and finally +secrets.secret_key_base+. For most applications,
     # the correct place to store it is in the encrypted credentials file.
     def secret_key_base
-      if Rails.env.local? || ENV["SECRET_KEY_BASE_DUMMY"]
-        config.secret_key_base ||= generate_local_secret
-      else
-        validate_secret_key_base(
-          ENV["SECRET_KEY_BASE"] || credentials.secret_key_base || begin
-            secret_skb = secrets_secret_key_base
-
-            if secret_skb.equal?(config.secret_key_base)
-              config.secret_key_base
-            else
-              Rails.deprecator.warn(<<~MSG.squish)
-                Your `secret_key_base` is configured in `Rails.application.secrets`,
-                which is deprecated in favor of `Rails.application.credentials` and
-                will be removed in Rails 7.2.
-              MSG
-
-              secret_skb
+      config.secret_key_base ||=
+        if ENV["SECRET_KEY_BASE_DUMMY"]
+          generate_local_secret
+        else
+          validate_secret_key_base(
+            ENV["SECRET_KEY_BASE"] || credentials.secret_key_base || begin
+              secret_skb = secrets_secret_key_base
+
+              if secret_skb && secret_skb.equal?(config.secret_key_base)
+                config.secret_key_base
+              elsif secret_skb
+                Rails.deprecator.warn(<<~MSG.squish)
+                  Your `secret_key_base` is configured in `Rails.application.secrets`,
+                  which is deprecated in favor of `Rails.application.credentials` and
+                  will be removed in Rails 7.2.
+                MSG
+
+                secret_skb
+              elsif Rails.env.local?
+                generate_local_secret
+              end
             end
-          end
-        )
-      end
+          )
+        end
     end
 
     # Returns an ActiveSupport::EncryptedConfiguration instance for the

data/lib/rails/backtrace_cleaner.rb

@@ -10,9 +10,11 @@ module Rails
 
     def initialize
       super
-      @root = "#{Rails.root}/"
       add_filter do |line|
-        line.start_with?(@root) ? line.from(@root.size) : line
+        # We may be called before Rails.root is assigned.
+        # When that happens we fallback to not truncating.
+        @root ||= Rails.root && "#{Rails.root}/"
+        @root && line.start_with?(@root) ? line.from(@root.size) : line
       end
       add_filter do |line|
         if RENDER_TEMPLATE_PATTERN.match?(line)

data/lib/rails/gem_version.rb

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

data/lib/rails/generators/database.rb

@@ -16,7 +16,7 @@ module Rails
         when "mysql"          then ["mysql2", ["~> 0.5"]]
         when "trilogy"        then ["trilogy", ["~> 2.4"]]
         when "postgresql"     then ["pg", ["~> 1.1"]]
-        when "sqlite3"        then ["sqlite3", ["~> 1.4"]]
+        when "sqlite3"        then ["sqlite3", [">= 1.4"]]
         when "oracle"         then ["activerecord-oracle_enhanced-adapter", nil]
         when "sqlserver"      then ["activerecord-sqlserver-adapter", nil]
         when "jdbcmysql"      then ["activerecord-jdbcmysql-adapter", nil]

data/lib/rails/generators/migration.rb

@@ -7,7 +7,7 @@ module Rails
   module Generators
     # Holds common methods for migrations. It assumes that migrations have the
     # [0-9]*_name format and can be used by other frameworks (like Sequel)
-    # just by implementing the next migration version method.
+    # just by implementing the +next_migration_number+ method.
     module Migration
       extend ActiveSupport::Concern
       attr_reader :migration_number, :migration_file_name, :migration_class_name
@@ -46,10 +46,10 @@ module Rails
       end
 
       # Creates a migration template at the given destination. The difference
-      # to the default template method is that the migration version is appended
+      # to the default template method is that the migration number is prepended
       # to the destination file name.
       #
-      # The migration version, migration file name, migration class name are
+      # The migration number, migration file name, migration class name are
       # available as instance variables in the template to be rendered.
       #
       #   migration_template "migration.rb", "db/migrate/add_foo_to_bar.rb"

data/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_7_1.rb.tt

@@ -241,7 +241,6 @@
 # this file):
 #   config.active_support.cache_format_version = 7.1
 
-
 ###
 # Configure Action View to use HTML5 standards-compliant sanitizers when they are supported on your
 # platform.
@@ -253,7 +252,6 @@
 #++
 # Rails.application.config.action_view.sanitizer_vendor = Rails::HTML::Sanitizer.best_supported_vendor
 
-
 ###
 # Configure Action Text to use an HTML5 standards-compliant sanitizer when it is supported on your
 # platform.
@@ -265,14 +263,12 @@
 #++
 # Rails.application.config.action_text.sanitizer_vendor = Rails::HTML::Sanitizer.best_supported_vendor
 
-
 ###
 # Configure the log level used by the DebugExceptions middleware when logging
 # uncaught exceptions during requests.
 #++
 # Rails.application.config.action_dispatch.debug_exception_log_level = :error
 
-
 ###
 # Configure the test helpers in Action View, Action Dispatch, and rails-dom-testing to use HTML5
 # parsers.

data/lib/rails/generators/rails/app/templates/config/puma.rb.tt

@@ -11,13 +11,22 @@ max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
 min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count }
 threads min_threads_count, max_threads_count
 
-# Specifies that the worker count should equal the number of processors in production.
-if ENV["RAILS_ENV"] == "production"
-  require "concurrent-ruby"
-  worker_count = Integer(ENV.fetch("WEB_CONCURRENCY") { Concurrent.physical_processor_count })
-  workers worker_count if worker_count > 1
-end
+rails_env = ENV.fetch("RAILS_ENV") { "development" }
 
+if rails_env == "production"
+  # If you are running more than 1 thread per process, the workers count
+  # should be equal to the number of processors (CPU cores) in production.
+  #
+  # It defaults to 1 because it's impossible to reliably detect how many
+  # CPU cores are available. Make sure to set the `WEB_CONCURRENCY` environment
+  # variable to match the number of processors.
+  worker_count = Integer(ENV.fetch("WEB_CONCURRENCY") { 1 })
+  if worker_count > 1
+    workers worker_count
+  else
+    preload_app!
+  end
+end
 # Specifies the `worker_timeout` threshold that Puma will use to wait before
 # terminating a worker in development environments.
 worker_timeout 3600 if ENV.fetch("RAILS_ENV", "development") == "development"
@@ -26,7 +35,7 @@ worker_timeout 3600 if ENV.fetch("RAILS_ENV", "development") == "development"
 port ENV.fetch("PORT") { 3000 }
 
 # Specifies the `environment` that Puma will run in.
-environment ENV.fetch("RAILS_ENV") { "development" }
+environment rails_env
 
 # Specifies the `pidfile` that Puma will use.
 pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" }

data/lib/rails.rb

@@ -24,7 +24,7 @@ silence_warnings do
   Encoding.default_internal = Encoding::UTF_8
 end
 
-# :include: railties/README.rdoc
+# :include: ../README.rdoc
 module Rails
   extend ActiveSupport::Autoload
   extend ActiveSupport::Benchmarkable

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railties
 version: !ruby/object:Gem::Version
-  version: 7.1.3.3
+  version: 7.1.4
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-16 00:00:00.000000000 Z
+date: 2024-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.3.3
+        version: 7.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.3.3
+        version: 7.1.4
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.3.3
+        version: 7.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.3.3
+        version: 7.1.4
 - !ruby/object:Gem::Dependency
   name: rackup
   requirement: !ruby/object:Gem::Requirement
@@ -120,14 +120,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.3.3
+        version: 7.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.3.3
+        version: 7.1.4
 description: 'Rails internals: application bootup, plugins, generators, and rake tasks.'
 email: david@loudthinking.com
 executables:
@@ -459,10 +459,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v7.1.3.3/railties/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.1.3.3/
+  changelog_uri: https://github.com/rails/rails/blob/v7.1.4/railties/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.1.4/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.1.3.3/railties
+  source_code_uri: https://github.com/rails/rails/tree/v7.1.4/railties
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options:
@@ -481,7 +481,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.10
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Tools for creating, working with, and running Rails applications.