railties 6.0.3.7 → 6.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 825ef11e10456c48bb26ab284dceb86ba181a2fcc2cdab59425d4484c9308a75
-  data.tar.gz: 5025c0181c18449220befa25a78ea393ea171b6017184b0a946032c6ce93f0c1
+  metadata.gz: d7bc2b017b91f2d6982e1b6d1d65f3c857b26de18b4c3f8e0da7c89abbba8cd6
+  data.tar.gz: 13915c7088039cf0060c81b65f7d8e42234514ba9fb6db36b05f980eda466028
 SHA512:
-  metadata.gz: a436816ee97c5f0eda5eb9bad31a28437793975858bcb222dcfd1da04c58a7a9dbf59eaeb78f13407ba70396a4d7a5ae1744d3f1c9935443adad81a2c5938141
-  data.tar.gz: 1ebc55b0503a812438a2d9c05ab77983ec5c9007fb9586ff21d55a9bc3a7ef224f6637c4a10927180d0fc9b19899011cb86ccb14051621e12195f01f6b94253d
+  metadata.gz: 622ca0f8a1bcb74791b73b632b3cd3ab9002016516b763075b14a17b5f4dbc788a3a2fe68a7c41584b0a39f6723063428dc70a3881f397bd182b6955fc5ae289
+  data.tar.gz: 9aab295636843b9c4dedebf7142f04994718a93341c07a0e12fe554e8b1fa47cfb2423324e67cb6dafb2d4cfeb3327fda340ff41b956304cbb1b758bebfd699d

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## Rails 6.0.4 (June 15, 2021) ##
+
+*   Allow relative paths with trailing slashes to be passed to `rails test`.
+
+    *Eugene Kenny*
+
+*   Return a 405 Method Not Allowed response when a request uses an unknown HTTP method.
+
+    Fixes #38998.
+
+    *Loren Norman*
+
+
 ## Rails 6.0.3.7 (May 05, 2021) ##
 
 *   No changes.
@@ -13,6 +26,7 @@
 *   No changes.
 
 
+
 ## Rails 6.0.3.4 (October 07, 2020) ##
 
 *   No changes.

data/README.rdoc

@@ -17,7 +17,7 @@ The latest version of Railties can be installed with RubyGems:
 
 Source code can be downloaded as part of the Rails project on GitHub
 
-* https://github.com/rails/rails/tree/master/railties
+* https://github.com/rails/rails/tree/main/railties
 
 == License
 

data/lib/rails/api/task.rb

@@ -189,7 +189,7 @@ module Rails
 
     class EdgeTask < RepoTask
       def rails_version
-        "master@#{`git rev-parse HEAD`[0, 7]}"
+        "main@#{`git rev-parse HEAD`[0, 7]}"
       end
     end
 

data/lib/rails/application.rb

@@ -220,27 +220,27 @@ module Rails
     #       config.middleware.use ExceptionNotifier, config_for(:exception_notification)
     #     end
     def config_for(name, env: Rails.env)
-      if name.is_a?(Pathname)
-        yaml = name
-      else
-        yaml = Pathname.new("#{paths["config"].existent.first}/#{name}.yml")
-      end
+      yaml = name.is_a?(Pathname) ? name : Pathname.new("#{paths["config"].existent.first}/#{name}.yml")
 
       if yaml.exist?
         require "erb"
-        config = YAML.load(ERB.new(yaml.read).result) || {}
-        config = (config["shared"] || {}).merge(config[env] || {})
+        all_configs    = YAML.load(ERB.new(yaml.read).result) || {}
+        config, shared = all_configs[env], all_configs["shared"]
 
-        ActiveSupport::OrderedOptions.new.tap do |options|
-          options.update(NonSymbolAccessDeprecatedHash.new(config))
+        config ||= {} if shared.nil? || shared.is_a?(Hash)
+
+        if config.is_a?(Hash)
+          ActiveSupport::OrderedOptions.new.update(NonSymbolAccessDeprecatedHash.new(shared&.deep_merge(config) || config))
+        else
+          config || shared
         end
       else
         raise "Could not load configuration. No such file - #{yaml}"
       end
-    rescue Psych::SyntaxError => e
+    rescue Psych::SyntaxError => error
       raise "YAML syntax error occurred while parsing #{yaml}. " \
         "Please note that YAML must be consistently indented using spaces. Tabs are not allowed. " \
-        "Error: #{e.message}"
+        "Error: #{error.message}"
     end
 
     # Stores some of the Rails initial environment parameters which

data/lib/rails/commands/notes/notes_command.rb

@@ -5,7 +5,7 @@ require "rails/source_annotation_extractor"
 module Rails
   module Command
     class NotesCommand < Base # :nodoc:
-      class_option :annotations, aliases: "-a", desc: "Filter by specific annotations, e.g. Foobar TODO", type: :array, default: Rails::SourceAnnotationExtractor::Annotation.tags
+      class_option :annotations, aliases: "-a", desc: "Filter by specific annotations, e.g. Foobar TODO", type: :array
 
       def perform(*)
         require_application_and_environment!
@@ -16,7 +16,7 @@ module Rails
 
       private
         def display_annotations
-          annotations = options[:annotations]
+          annotations = options[:annotations] || Rails::SourceAnnotationExtractor::Annotation.tags
           tag = (annotations.length > 1)
 
           Rails::SourceAnnotationExtractor.enumerate annotations.join("|"), tag: tag, dirs: directories

data/lib/rails/gem_version.rb

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

data/lib/rails/generators/app_base.rb

@@ -286,7 +286,7 @@ module Rails
         else
           [GemfileEntry.version("rails",
                             rails_version_specifier,
-                            "Bundle edge Rails instead: gem 'rails', github: 'rails/rails'")]
+                            "Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main'")]
         end
       end
 

data/lib/rails/rack/logger.rb

@@ -47,7 +47,7 @@ module Rails
         # Started GET "/session/new" for 127.0.0.1 at 2012-09-26 14:51:42 -0700
         def started_request_message(request) # :doc:
           'Started %s "%s" for %s at %s' % [
-            request.request_method,
+            request.raw_request_method,
             request.filtered_path,
             request.remote_ip,
             Time.now.to_default_s ]

data/lib/rails/railtie.rb

@@ -192,6 +192,7 @@ module Rails
             super
           end
         end
+        ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
 
         # receives an instance variable identifier, set the variable value if is
         # blank and append given block to value, which will be used later in

data/lib/rails/test_unit/runner.rb

@@ -61,7 +61,7 @@ module Rails
         private
           def extract_filters(argv)
             # Extract absolute and relative paths but skip -n /.*/ regexp filters.
-            argv.select { |arg| arg =~ %r%^/?\w+/% && !arg.end_with?("/") }.map do |path|
+            argv.select { |arg| path_argument?(arg) && !regexp_filter?(arg) }.map do |path|
               case
               when /(:\d+)+$/.match?(path)
                 file, *lines = path.split(":")
@@ -75,6 +75,14 @@ module Rails
               end
             end
           end
+
+          def regexp_filter?(arg)
+            arg.start_with?("/") && arg.end_with?("/")
+          end
+
+          def path_argument?(arg)
+            %r%^/?\w+/%.match?(arg)
+          end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railties
 version: !ruby/object:Gem::Version
-  version: 6.0.3.7
+  version: 6.0.4
 platform: ruby
 authors:
 - David Heinemeier Hansson
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-05 00:00:00.000000000 Z
+date: 2021-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.3.7
+        version: 6.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.3.7
+        version: 6.0.4
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.3.7
+        version: 6.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.3.7
+        version: 6.0.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.3.7
+        version: 6.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.3.7
+        version: 6.0.4
 description: 'Rails internals: application bootup, plugins, generators, and rake tasks.'
 email: david@loudthinking.com
 executables:
@@ -432,11 +432,11 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v6.0.3.7/railties/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.0.3.7/
+  changelog_uri: https://github.com/rails/rails/blob/v6.0.4/railties/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.0.4/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v6.0.3.7/railties
-post_install_message:
+  source_code_uri: https://github.com/rails/rails/tree/v6.0.4/railties
+post_install_message: 
 rdoc_options:
 - "--exclude"
 - "."
@@ -454,7 +454,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Tools for creating, working with, and running Rails applications.
 test_files: []