actionpack 4.2.2 → 4.2.3.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1b9fd8b7fa33ccdadcb8ae1588c35d692339b13
-  data.tar.gz: c5d0dd5f7d5dbf3350d5daba0df09d265f8d9204
+  metadata.gz: f657e8aa0b1e7d37a531dd67f65500889f60999c
+  data.tar.gz: 6804ce0b2869e278603ff9cbb63c0dcf1c587219
 SHA512:
-  metadata.gz: 69275363448785182bbf4f5120f83cdeb856ac4569cce472b010c3b8b84f726dcf3e80a3b527961d7922baa64d6d2f89c165335740ef399e92accc09c8e22fae
-  data.tar.gz: 75e1b804fb68e93e0def2b7ccd18c67084404c1a75f17d1c188db119646d5d67f06fc73bc571e59329c1126e6868e496e0e4ecb4983711067c150266774efb44
+  metadata.gz: b47635795e0d214430dd501e36f2e11c5aafcc285ae1232e7096936de3dd76ee64ccabab4971e5cdbc6e2404ac16d79795a8ef174e98a16809cb405eee8c2531
+  data.tar.gz: b38ecd9fc4064c2eb1649d93c22063a5709bfeb204616731c1b189477c685cdcfae3f6686eacd3a49a58d999eb10d9a8bef40d7da762ad558dee5330d2649280

data/CHANGELOG.md

@@ -1,9 +1,51 @@
+## Rails 4.2.3 (June 22, 2015) ##
+
+*   Fix rake routes not showing the right format when
+    nesting multiple routes.
+
+    See #18373.
+
+    *Ravil Bayramgalin*
+
+*   Fix regression where a gzip file response would have a Content-type,
+    even when it was a 304 status code.
+
+    See #19271.
+
+    *Kohei Suzuki*
+
+*   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*
+
+*   Fallback to `ENV['RAILS_RELATIVE_URL_ROOT']` in `url_for`.
+
+    Fixed an issue where the `RAILS_RELATIVE_URL_ROOT` environment variable is not
+    prepended to the path when `url_for` is called. If `SCRIPT_NAME` (used by Rack)
+    is set, it takes precedence.
+
+    Fixes #5122.
+
+    *Yasyf Mohamedali*
+
+*   Fix regression in functional tests. Responses should have default headers
+    assigned.
+
+    See #18423.
+
+    *Jeremy Kemper*, *Yves Senn*
+
+
 ## Rails 4.2.2 (June 16, 2015) ##
 
 * No Changes *
 
 
-## Rails 4.2.1 (March 19, 2014) ##
+## Rails 4.2.1 (March 19, 2015) ##
 
 *   Non-string authenticity tokens do not raise NoMethodError when decoding
     the masked token.

data/lib/action_controller/metal/strong_parameters.rb

@@ -24,11 +24,13 @@ module ActionController
     end
   end
 
-  # Raised when a supplied parameter is not expected.
+  # Raised when a supplied parameter is not expected and
+  # ActionController::Parameters.action_on_unpermitted_parameters
+  # is set to <tt>:raise</tt>.
   #
   #   params = ActionController::Parameters.new(a: "123", b: "456")
   #   params.permit(:c)
-  #   # => ActionController::UnpermittedParameters: found unexpected keys: a, b
+  #   # => ActionController::UnpermittedParameters: found unpermitted parameters: a, b
   class UnpermittedParameters < IndexError
     attr_reader :params # :nodoc:
 

data/lib/action_dispatch/http/response.rb

@@ -115,10 +115,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
 
@@ -324,9 +325,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

@@ -184,7 +184,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/formatter.rb

@@ -40,7 +40,7 @@ module ActionDispatch
           return [route.format(parameterized_parts), params]
         end
 
-        message = "No route matches #{Hash[constraints.sort].inspect}"
+        message = "No route matches #{Hash[constraints.sort_by{|k,v| k.to_s}].inspect}"
         message << " missing required keys: #{missing_keys.sort.inspect}" unless missing_keys.empty?
 
         raise ActionController::UrlGenerationError, message

data/lib/action_dispatch/journey/route.rb

@@ -36,7 +36,7 @@ module ActionDispatch
 
       def requirements # :nodoc:
         # needed for rails `rake routes`
-        path.requirements.merge(@defaults).delete_if { |_,v|
+        @defaults.merge(path.requirements).delete_if { |_,v|
           /.+?/ == v
         }
       end

data/lib/action_dispatch/journey/router.rb

@@ -121,7 +121,6 @@ module ActionDispatch
         end
 
         def match_head_routes(routes, req)
-          routes.delete_if { |route| route.verb == // }
           head_routes = match_routes(routes, req)
 
           if head_routes.empty?

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/middleware/cookies.rb

@@ -181,7 +181,7 @@ module ActionDispatch
     # to the Message{Encryptor,Verifier} allows us to handle the
     # (de)serialization step within the cookie jar, which gives us the
     # opportunity to detect and migrate legacy cookies.
-    module VerifyAndUpgradeLegacySignedMessage
+    module VerifyAndUpgradeLegacySignedMessage # :nodoc:
       def initialize(*args)
         super
         @legacy_verifier = ActiveSupport::MessageVerifier.new(@options[:secret_token], serializer: ActiveSupport::MessageEncryptor::NullSerializer)
@@ -392,7 +392,7 @@ module ActionDispatch
       end
     end
 
-    class JsonSerializer
+    class JsonSerializer # :nodoc:
       def self.load(value)
         ActiveSupport::JSON.decode(value)
       end
@@ -402,7 +402,7 @@ module ActionDispatch
       end
     end
 
-    module SerializedCookieJars
+    module SerializedCookieJars # :nodoc:
       MARSHAL_SIGNATURE = "\x04\x08".freeze
 
       protected

data/lib/action_dispatch/middleware/static.rb

@@ -29,7 +29,7 @@ module ActionDispatch
       }
 
       if match = paths.detect { |p|
-        path = File.join(@root, p)
+        path = File.join(@root, p.force_encoding('UTF-8'))
         begin
           File.file?(path) && File.readable?(path)
         rescue SystemCallError
@@ -48,6 +48,9 @@ module ActionDispatch
       if gzip_path && gzip_encoding_accepted?(env)
         env['PATH_INFO']            = gzip_path
         status, headers, body       = @file_server.call(env)
+        if status == 304
+          return [status, headers, body]
+        end
         headers['Content-Encoding'] = 'gzip'
         headers['Content-Type']     = content_type(path)
       else

data/lib/action_dispatch/railtie.rb

@@ -40,6 +40,8 @@ module ActionDispatch
       ActionDispatch::Cookies::CookieJar.always_write_cookie = config.action_dispatch.always_write_cookie
 
       ActionDispatch.test_app = app
+
+      ActionDispatch::Routing::RouteSet.relative_url_root = app.config.relative_url_root
     end
   end
 end

data/lib/action_dispatch/routing/mapper.rb

@@ -291,7 +291,7 @@ module ActionDispatch
             when String
               ActiveSupport::Deprecation.warn(<<-MSG.squish)
                 Defining a route where `to` is a controller without an action is deprecated.
-                Please change `to: :#{to}` to `controller: :#{to}`.
+                Please change `to: '#{to}'` to `controller: '#{to}'`.
               MSG
 
               [to, nil]

data/lib/action_dispatch/routing/route_set.rb

@@ -21,6 +21,8 @@ module ActionDispatch
       # alias inspect to to_s.
       alias inspect to_s
 
+      mattr_accessor :relative_url_root
+
       class Dispatcher < Routing::Endpoint
         def initialize(defaults)
           @defaults = defaults
@@ -252,7 +254,7 @@ module ActionDispatch
             end
 
             def raise_generation_error(args, missing_keys)
-              constraints = Hash[@route.requirements.merge(args).sort]
+              constraints = Hash[@route.requirements.merge(args).sort_by{|k,v| k.to_s}]
               message = "No route matches #{constraints.inspect}"
               message << " missing required keys: #{missing_keys.sort.inspect}"
 
@@ -768,7 +770,7 @@ module ActionDispatch
       end
 
       def find_script_name(options)
-        options.delete(:script_name) || ''
+        options.delete(:script_name) || relative_url_root || ''
       end
 
       def path_for(options, route_name = nil)

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 =~ /xml$/
+      @html_document ||= if @response.content_type === Mime::XML
         Nokogiri::XML::Document.parse(@response.body)
       else
         Nokogiri::HTML::Document.parse(@response.body)

data/lib/action_dispatch/testing/integration.rb

@@ -299,7 +299,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 = 2
-    TINY  = 2
-    PRE   = nil
+    TINY  = 3
+    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.2
+  version: 4.2.3.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.2.2
+        version: 4.2.3.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.2
+        version: 4.2.3.rc1
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -61,7 +61,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -71,7 +71,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: rails-dom-testing
   requirement: !ruby/object:Gem::Requirement
@@ -98,28 +98,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.2
+        version: 4.2.3.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.2
+        version: 4.2.3.rc1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.2
+        version: 4.2.3.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.2
+        version: 4.2.3.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,9 +294,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: