actionpack 4.1.11 → 4.1.12.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfc829c25fe49d56dfd1aaf91327bc833106b3b7
-  data.tar.gz: 766a51edd477789dcb067194f604434b46552c36
+  metadata.gz: e42d591221eee2e8e61459f5084abd011defc820
+  data.tar.gz: b38e29ced280f632625dd6c384b693557f3239a9
 SHA512:
-  metadata.gz: da9011724a5043a5371d35aee38783507cdb08e29ade5442cd1e6f9deb32dc001193dab165ed1962ebbeadd7e9a6f9184b5f494634cc09b50d6425371c52f2d1
-  data.tar.gz: c054a3bd931e2367187ca594804d44e246234475c498b04d0490669a4b648272959e7bdcfe0742da76946f9061aba170444e8c9e0a1109fdc74adb7fd5ab0287
+  metadata.gz: 0d2c966133767324a1d5bc91309fe43a007943cf2fa927293fe82a0d1b56ae617f71f3590dfdb1b49f438b657867f856644ef98470f0e585f553f08a999610d3
+  data.tar.gz: 13e7c19a77a0cc38b0af94605c9e487177a57c75bb9a926d6e37f0b8386bfc3958b80711331387289d0268b9e9944191c820a0401f2c8ba0e98a9f3c7b435fa8

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## Rails 4.1.12 (June 22, 2015) ##
+
+*   Fix handling of empty X_FORWARDED_HOST header in raw_host_with_port
+
+    Previously, an empty X_FORWARDED_HOST header would cause
+    Actiondispatch::Http:URL.raw_host_with_port to return nil, causing
+    Actiondispatch::Http:URL.host to raise a NoMethodError.
+
+    *Adam Forsyth*
+
+*   Fix regression in functional tests. Responses should have default headers
+    assigned.
+
+    See #18423.
+
+    *Jeremy Kemper*, *Yves Senn*
+
+
 ## Rails 4.1.11 (June 16, 2015) ##
 
 *   No changes.

data/lib/action_dispatch/http/response.rb

@@ -110,10 +110,11 @@ module ActionDispatch # :nodoc:
     # The underlying body, as a streamable object.
     attr_reader :stream
 
-    def initialize(status = 200, header = {}, body = [])
+    def initialize(status = 200, header = {}, body = [], options = {})
       super()
 
-      header = merge_default_headers(header, self.class.default_headers)
+      default_headers = options.fetch(:default_headers, self.class.default_headers)
+      header = merge_default_headers(header, default_headers)
 
       self.body, self.header, self.status = body, header, status
 
@@ -308,9 +309,7 @@ module ActionDispatch # :nodoc:
     end
 
     def merge_default_headers(original, default)
-      return original unless default.respond_to?(:merge)
-
-      default.merge(original)
+      default.respond_to?(:merge) ? default.merge(original) : original
     end
 
     def build_buffer(response, body)

data/lib/action_dispatch/http/url.rb

@@ -165,7 +165,7 @@ module ActionDispatch
 
       # Returns the \host for this request, such as "example.com".
       def raw_host_with_port
-        if forwarded = env["HTTP_X_FORWARDED_HOST"]
+        if forwarded = env["HTTP_X_FORWARDED_HOST"].presence
           forwarded.split(/,\s?/).last
         else
           env['HTTP_HOST'] || "#{env['SERVER_NAME'] || env['SERVER_ADDR']}:#{env['SERVER_PORT']}"

data/lib/action_dispatch/journey/routes.rb

@@ -15,6 +15,10 @@ module ActionDispatch
         @simulator          = nil
       end
 
+      def empty?
+        routes.empty?
+      end
+
       def length
         routes.length
       end

data/lib/action_dispatch/testing/integration.rb

@@ -311,7 +311,7 @@ module ActionDispatch
           @request_count += 1
           @request  = ActionDispatch::Request.new(session.last_request.env)
           response = _mock_session.last_response
-          @response = ActionDispatch::TestResponse.new(response.status, response.headers, response.body)
+          @response = ActionDispatch::TestResponse.from_response(response)
           @html_document = nil
           @url_options = nil
 

data/lib/action_dispatch/testing/test_response.rb

@@ -7,11 +7,7 @@ module ActionDispatch
   # See Response for more information on controller response objects.
   class TestResponse < Response
     def self.from_response(response)
-      new.tap do |resp|
-        resp.status  = response.status
-        resp.headers = response.headers
-        resp.body    = response.body
-      end
+      new response.status, response.headers, response.body, default_headers: nil
     end
 
     # Was the response successful?
@@ -25,12 +21,5 @@ 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  = 11
-    PRE   = nil
+    TINY  = 12
+    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.11
+  version: 4.1.12.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-16 00:00:00.000000000 Z
+date: 2015-06-22 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.11
+        version: 4.1.12.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.11
+        version: 4.1.12.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.11
+        version: 4.1.12.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.11
+        version: 4.1.12.rc1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.11
+        version: 4.1.12.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.11
+        version: 4.1.12.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: