actionpack 4.2.8 → 4.2.9.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42469ddb1692c79021861df1836523862e33430e
-  data.tar.gz: d60612dcb485b977ff0b839337d771a1d11c41be
+  metadata.gz: 0e841eab7dc1deda39efeb67df352266e71fb2b7
+  data.tar.gz: 97b7a5e00da2c6c114f0b1abe00538fccc62aabd
 SHA512:
-  metadata.gz: a1f20abd182c006e347cd835cebfbf46ca5973e8510e49488bb7b7d599f35c6d3185f455a54bedf47601e48ba680a147b6366a6e907d9367cca9718c66e1d1c3
-  data.tar.gz: 56aadc387182132fa4908501068f2ff2fd77b35fb9c8cd92bb92b1ccc93563d6f1add5bb2a62984810d832d28a1968039ebf8cecf3ad2b7cc482adda1b2e1ec3
+  metadata.gz: 40f9137027de48b4a57193e58fa3654ca054089202346cd0f714640195b2ab6e9f06536ab2a418afc485fac60169bd9390fa12a1f7afaf9ed4c8c11a38d17e08
+  data.tar.gz: 3bb2873bf78a83dd2bb053417ad7490518661260b4135dc49271f33daa5e6162150808a8f6a46f750e1bed1c815c9200fd3f3485cb065711f09d12f22639b813

data/CHANGELOG.md

@@ -1,3 +1,32 @@
+## Rails 4.2.9.rc1 (June 13, 2017) ##
+
+*   Use more specific check for :format in route path
+
+    The current check for whether to add an optional format to the path is very lax
+    and will match things like `:format_id` where there are nested resources, e.g:
+
+    ``` ruby
+    resources :formats do
+      resources :items
+    end
+    ```
+
+    Fix this by using a more restrictive regex pattern that looks for the patterns
+    `(.:format)`, `.:format` or `/` at the end of the path. Note that we need to
+    allow for multiple closing parenthesis since the route may be of this form:
+
+    ``` ruby
+    get "/books(/:action(.:format))", controller: "books"
+    ```
+
+    This probably isn't what's intended since it means that the default index action
+    route doesn't support a format but we have a test for it so we need to allow it.
+
+    Fixes #28517.
+
+    *Andrew White*
+
+
 ## Rails 4.2.8 (February 21, 2017) ##
 
 *   No changes.

data/lib/action_dispatch/journey/router/utils.rb

@@ -13,11 +13,13 @@ module ActionDispatch
         #   normalize_path("")      # => "/"
         #   normalize_path("/%ab")  # => "/%AB"
         def self.normalize_path(path)
+          encoding = path.encoding
           path = "/#{path}"
           path.squeeze!('/')
           path.sub!(%r{/+\Z}, '')
           path.gsub!(/(%[a-f0-9]{2})/) { $1.upcase }
-          path = '/' if path == ''
+          path = "/" if path == "".freeze
+          path.force_encoding(encoding)
           path
         end
 

data/lib/action_dispatch/routing/mapper.rb

@@ -60,6 +60,7 @@ module ActionDispatch
 
       class Mapping #:nodoc:
         ANCHOR_CHARACTERS_REGEX = %r{\A(\\A|\^)|(\\Z|\\z|\$)\Z}
+        OPTIONAL_FORMAT_REGEX = %r{(?:\(\.:format\)+|\.:format|/)\Z}
 
         attr_reader :requirements, :conditions, :defaults
         attr_reader :to, :default_controller, :default_action, :as, :anchor
@@ -144,7 +145,7 @@ module ActionDispatch
           end
 
           def optional_format?(path, format)
-            format != false && !path.include?(':format') && !path.end_with?('/')
+            format != false && path !~ OPTIONAL_FORMAT_REGEX
           end
 
           def normalize_options!(options, formatted, path_params, path_ast, modyoule)

data/lib/action_pack/gem_version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionpack
 version: !ruby/object:Gem::Version
-  version: 4.2.8
+  version: 4.2.9.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-21 00:00:00.000000000 Z
+date: 2017-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.8
+        version: 4.2.9.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.8
+        version: 4.2.9.rc1
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -98,28 +98,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.8
+        version: 4.2.9.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.8
+        version: 4.2.9.rc1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.8
+        version: 4.2.9.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.8
+        version: 4.2.9.rc1
 description: Web apps on Rails. Simple, battle-tested conventions for building and
   testing MVC web applications. Works with any Rack-compatible server.
 email: david@loudthinking.com
@@ -294,13 +294,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Web-flow and rendering framework putting the VC in MVC (part of Rails).