actionpack 4.2.4 → 4.2.5.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27bfdee6c3cdd08df027171d707b66968712b5da
-  data.tar.gz: 6cde1ccb704e4fedcc061e9369572a94bfba77a6
+  metadata.gz: 5cf81b19b1ccd127cbbc5b8b2a57fdbf71191e3c
+  data.tar.gz: 608599f2b673102ed1304fbc2c52619ebefc8012
 SHA512:
-  metadata.gz: f63a7c3b24d8b59bcf9f07a73f7a63dfae4c39e93368f53344f469eb5c4eda7efa7aff45d9aa7adcbc956eaa2f476a4a32f05743e659b07f87d5a7f18f054558
-  data.tar.gz: ef77b90e8f8c5356566741a418173068e31aad5c19fe0a3a19906e3730b6e4f94d4e3d28920630a7d2d44ee9a188b3a91ba2fdfa9ce6107abee6db0c4f6c87fa
+  metadata.gz: 7385abbf457e62d15562e05ab31acf1bb3cf772484fbaca94c56cad31561299bbb43666c5b963e50ff7c55ec1c1d8e191e390b180995ba2af4d5461b9d4cfb02
+  data.tar.gz: 5cd1cb3919c9167840e6cd8bf486336e6e119f7702498f510857fb9e0e5470847a5a212b2770b4aed4f801169fe65f89e6f76dd15d0fa91d2b9ce920512607e6

data/CHANGELOG.md

@@ -1,3 +1,32 @@
+## Rails 4.2.5.rc1 (October 30, 2015) ##
+
+*   `ActionController::TestCase` can teardown gracefully if an error is raised
+    early in the `setup` chain.
+
+    *Yves Senn*
+
+*   Parse RSS/ATOM responses as XML, not HTML.
+
+    *Alexander Kaupanin*
+
+*   Fix regression in mounted engine named routes generation for app deployed to
+    a subdirectory. `relative_url_root` was prepended to the path twice (e.g.
+    "/subdir/subdir/engine_path" instead of "/subdir/engine_path")
+
+    Fixes #20920. Fixes #21459.
+
+    *Matthew Erhard*
+
+*   `url_for` does not modify its arguments when generating polymorphic URLs.
+
+    *Bernerd Schaefer*
+
+*   Update `ActionController::TestSession#fetch` to behave more like
+    `ActionDispatch::Request::Session#fetch` when using non-string keys.
+
+    *Jeremy Friesen*
+
+
 ## Rails 4.2.4 (August 24, 2015) ##
 
 *   ActionController::TestSession now accepts a default value as well as

data/lib/action_controller/test_case.rb

@@ -55,6 +55,8 @@ module ActionController
     end
 
     def teardown_subscriptions
+      return unless defined?(@_subscribers)
+
       @_subscribers.each do |subscriber|
         ActiveSupport::Notifications.unsubscribe(subscriber)
       end
@@ -327,8 +329,8 @@ module ActionController
       clear
     end
 
-    def fetch(*args, &block)
-      @data.fetch(*args, &block)
+    def fetch(key, *args, &block)
+      @data.fetch(key.to_s, *args, &block)
     end
 
     private

data/lib/action_dispatch/http/url.rb

@@ -5,7 +5,7 @@ module ActionDispatch
   module Http
     module URL
       IP_HOST_REGEXP  = /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/
-      HOST_REGEXP     = /(^[^:]+:\/\/)?([^:]+)(?::(\d+$))?/
+      HOST_REGEXP     = /(^[^:]+:\/\/)?(\[[^\]]+\]|[^:]+)(?::(\d+$))?/
       PROTOCOL_REGEXP = /^([^:]+)(:)?(\/\/)?$/
 
       mattr_accessor :tld_length

data/lib/action_dispatch/routing/mapper.rb

@@ -632,6 +632,7 @@ module ActionDispatch
                   super(options)
                 else
                   prefix_options = options.slice(*_route.segment_keys)
+                  prefix_options[:relative_url_root] = ''.freeze
                   # 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/route_set.rb

@@ -485,14 +485,6 @@ module ActionDispatch
       end
 
       def url_helpers(supports_path = true)
-        if supports_path
-          @url_helpers_with_paths ||= generate_url_helpers(supports_path)
-        else
-          @url_helpers_without_paths ||= generate_url_helpers(supports_path)
-        end
-      end
-
-      def generate_url_helpers(supports_path)
         routes = self
 
         Module.new do
@@ -763,14 +755,18 @@ module ActionDispatch
 
       RESERVED_OPTIONS = [:host, :protocol, :port, :subdomain, :domain, :tld_length,
                           :trailing_slash, :anchor, :params, :only_path, :script_name,
-                          :original_script_name]
+                          :original_script_name, :relative_url_root]
 
       def optimize_routes_generation?
         default_url_options.empty?
       end
 
       def find_script_name(options)
-        options.delete(:script_name) || relative_url_root || ''
+        options.delete(:script_name) || find_relative_url_root(options) || ''
+      end
+
+      def find_relative_url_root(options)
+        options.delete(:relative_url_root) || relative_url_root
       end
 
       def path_for(options, route_name = nil)

data/lib/action_dispatch/routing/url_for.rb

@@ -160,7 +160,8 @@ module ActionDispatch
         when Symbol
           HelperMethodBuilder.url.handle_string_call self, options
         when Array
-          polymorphic_url(options, options.extract_options!)
+          components = options.dup
+          polymorphic_url(components, components.extract_options!)
         when Class
           HelperMethodBuilder.url.handle_class_call self, options
         else

data/lib/action_dispatch/testing/assertions.rb

@@ -12,7 +12,7 @@ module ActionDispatch
     include Rails::Dom::Testing::Assertions
 
     def html_document
-      @html_document ||= if @response.content_type === Mime::XML
+      @html_document ||= if @response.content_type.to_s =~ /xml$/
         Nokogiri::XML::Document.parse(@response.body)
       else
         Nokogiri::HTML::Document.parse(@response.body)

data/lib/action_pack/gem_version.rb

@@ -7,8 +7,8 @@ module ActionPack
   module VERSION
     MAJOR = 4
     MINOR = 2
-    TINY  = 4
-    PRE   = nil
+    TINY  = 5
+    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.4
+  version: 4.2.5.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2015-10-30 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.4
+        version: 4.2.5.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.4
+        version: 4.2.5.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.4
+        version: 4.2.5.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.4
+        version: 4.2.5.rc1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.4
+        version: 4.2.5.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.4
+        version: 4.2.5.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,15 +294,14 @@ 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.4.7
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Web-flow and rendering framework putting the VC in MVC (part of Rails).
 test_files: []
-has_rdoc: