actionpack 4.1.9 → 4.1.10.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db10782d837eef0e09b1e170e4f44fc747a5ac69
-  data.tar.gz: 08366ec637eee7308307e4bb95e443b28ff9d8cc
+  metadata.gz: 9ff1846274fffd434b5c9726d31e059befafe52f
+  data.tar.gz: 52f39796bc3785ab7519c08e5484cfde22390c7a
 SHA512:
-  metadata.gz: 4062ad340cd1a94d719fb2aa978a19456dbc9863177120fd3473ba36f1624e52391eae5cd04a997cffd5db750a1f63c8fab373b06bc4d5ccc480406cd2724c67
-  data.tar.gz: 6f10b6e27d69b0d9f4365b49d7660c7cbcf1d1a898b72d213890937aa2184805df51f7f52756bb67be387f37ef8d561f90a25e42db7192f8b132c40803df5723
+  metadata.gz: 91b73ecea8b7e94750998e0819f5383be20d7b5db133f075244d727c7c43b38407286ca563e7a4e7aab3224493907aed51e24915e64e6f893a1b418ec7b920f4
+  data.tar.gz: 2c7e9279ab25749193a6441f64c37c430e05fce12ff3bfcf6d14466948d42ec2b93f7a78b368a27563019458c4b4231d4e3097d96f653a926c91c1e06e81a808

data/CHANGELOG.md

@@ -1,3 +1,30 @@
+*   Preserve default format when generating URLs
+
+    Fixes an issue that would cause the format set in default_url_options to be
+    lost when generating URLs with fewer positional arguments than parameters in
+    the route definition.
+
+    Backport of #18627
+
+    *Tekin Suleyman*, *Dominic Baggott*
+
+*   Default headers, removed in controller actions, are no longer reapplied on
+    the test response.
+
+    *Jonas Baumann*
+
+*   Ensure `append_info_to_payload` is called even if an exception is raised.
+
+    Fixes an issue where when an exception is raised in the request the additonal
+    payload data is not available.
+
+    See:
+    * #14903
+    * https://github.com/roidrage/lograge/issues/37
+
+    *Dieter Komendera*, *Margus Pärt*
+
+
 ## Rails 4.1.9 (January 6, 2015) ##
 
 *   Fixed handling of positional url helper arguments when `format: false`.

data/lib/action_controller/metal/instrumentation.rb

@@ -28,10 +28,13 @@ module ActionController
       ActiveSupport::Notifications.instrument("start_processing.action_controller", raw_payload.dup)
 
       ActiveSupport::Notifications.instrument("process_action.action_controller", raw_payload) do |payload|
-        result = super
-        payload[:status] = response.status
-        append_info_to_payload(payload)
-        result
+        begin
+          result = super
+          payload[:status] = response.status
+          result
+        ensure
+          append_info_to_payload(payload)
+        end
       end
     end
 

data/lib/action_dispatch/routing/route_set.rb

@@ -247,7 +247,14 @@ module ActionDispatch
                 keys -= options.keys
               end
               keys -= inner_options.keys
-              result.merge!(Hash[keys.zip(args)])
+
+              keys.each do |key|
+                value = inner_options.fetch(key) { args.shift }
+
+                unless key == :format && value.nil?
+                  result[key] = value
+                end
+              end
             end
 
             result.merge!(inner_options)

data/lib/action_dispatch/testing/test_response.rb

@@ -25,5 +25,12 @@ module ActionDispatch
 
     # Was there a server-side error?
     alias_method :error?, :server_error?
+
+    def merge_default_headers(original, *args)
+      # Default headers are already applied, no need to merge them a second time.
+      # This makes sure that default headers, removed in controller actions, will
+      # not be reapplied to the test response.
+      original
+    end
   end
 end

data/lib/action_pack/gem_version.rb

@@ -7,8 +7,8 @@ module ActionPack
   module VERSION
     MAJOR = 4
     MINOR = 1
-    TINY  = 9
-    PRE   = nil
+    TINY  = 10
+    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.1.9
+  version: 4.1.10.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.9
+        version: 4.1.10.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.9
+        version: 4.1.10.rc1
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.9
+        version: 4.1.10.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.9
+        version: 4.1.10.rc1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.9
+        version: 4.1.10.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.9
+        version: 4.1.10.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
@@ -252,9 +252,9 @@ 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: