actionpack 5.1.3.rc1 → 5.1.3.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebb4cff7e815dc558be31f6bde9c09189d2c4d3e
-  data.tar.gz: b65b7b309ec1899127650936e4213ca313fee55d
+  metadata.gz: 8980492ed9c00c4d0875fa8c6a4f57cf66c77f44
+  data.tar.gz: 3a90031baef8f3b8ac32d4540249c1c47cc9ec12
 SHA512:
-  metadata.gz: c99db076703a8fed396d063202cf6501afaca25fb33e8b4e415ef010cec2bb5edc36fce5790a9754bfaba66ffe1454608c4c58e146210d270ea3ccd6349a2dee
-  data.tar.gz: c158dd8319e7c9d96ec741fe2c55af255e921f847d5bed04178f8d4d8c9dc5285856b70ee57cbbda87d6d33862249b1a4bdda7c7df5491c872006073c745f17e
+  metadata.gz: cfe6ab8c76ece8f065a3e0dff7a407dacf694d4d666f8fe498610ed68fb9eb89b45a53744a7f20fe5bd702f971eba5a56d832656025262a1295e83859e43d9e2
+  data.tar.gz: b5b36564f07f65c7af2365d2df4e149e33b6de60a23a856f2688e341ca7dd8ccc3d5343d84e8cc1b37fc3cbf76d25a9cbb7d9a9f1a81edbee336ec3654bee084

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Rails 5.1.3.rc2 (July 25, 2017) ##
+
+*   No changes.
+
+
 ## Rails 5.1.3.rc1 (July 19, 2017) ##
 
 *   No changes.

data/lib/action_dispatch/routing/mapper.rb

@@ -656,6 +656,11 @@ module ActionDispatch
             script_namer = ->(options) do
               prefix_options = options.slice(*_route.segment_keys)
               prefix_options[:relative_url_root] = "".freeze
+
+              if options[:_recall]
+                prefix_options.reverse_merge!(options[:_recall].slice(*_route.segment_keys))
+              end
+
               # We must actually delete prefix segment keys to avoid passing them to next url_for.
               _route.segment_keys.each { |k| options.delete(k) }
               _routes.url_helpers.send("#{name}_path", prefix_options)

data/lib/action_dispatch/routing/routes_proxy.rb

@@ -30,7 +30,14 @@ module ActionDispatch
             def #{method}(*args)
               options = args.extract_options!
               options = url_options.merge((options || {}).symbolize_keys)
-              options.reverse_merge!(script_name: @script_namer.call(options)) if @script_namer
+
+              if @script_namer
+                options[:script_name] = merge_script_names(
+                  options[:script_name],
+                  @script_namer.call(options)
+                )
+              end
+
               args << options
               @helpers.#{method}(*args)
             end
@@ -40,6 +47,20 @@ module ActionDispatch
           super
         end
       end
+
+      # Keeps the part of the script name provided by the global
+      # context via ENV["SCRIPT_NAME"], which `mount` doesn't know
+      # about since it depends on the specific request, but use our
+      # script name resolver for the mount point dependent part.
+      def merge_script_names(previous_script_name, new_script_name)
+        return new_script_name unless previous_script_name
+
+        resolved_parts = new_script_name.count("/")
+        previous_parts = previous_script_name.count("/")
+        context_parts = previous_parts - resolved_parts + 1
+
+        (previous_script_name.split("/").slice(0, context_parts).join("/")) + new_script_name
+      end
     end
   end
 end

data/lib/action_pack/gem_version.rb

@@ -8,7 +8,7 @@ module ActionPack
     MAJOR = 5
     MINOR = 1
     TINY  = 3
-    PRE   = "rc1"
+    PRE   = "rc2"
 
     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: 5.1.3.rc1
+  version: 5.1.3.rc2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-19 00:00:00.000000000 Z
+date: 2017-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.3.rc1
+        version: 5.1.3.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.3.rc1
+        version: 5.1.3.rc2
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -92,28 +92,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.3.rc1
+        version: 5.1.3.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.3.rc1
+        version: 5.1.3.rc2
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.3.rc1
+        version: 5.1.3.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.3.rc1
+        version: 5.1.3.rc2
 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