actionpack 4.2.3 → 4.2.4.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb27aa921a192b3ae2127f0e4f09268c5fc51d19
-  data.tar.gz: dcbb4d299559381126c3cd9dc2578bf730cd19b8
+  metadata.gz: 34266592872f3b5676772eed123aee591b6c95bc
+  data.tar.gz: a0a550c6651e01b968c7a2219fef02f2d297f40e
 SHA512:
-  metadata.gz: 6dfec8a6f25c5fd23de5fce88a22ef5827fb3dcf82bed5ab33c801ee1373b9f690ae0ad4618cdd4bdafbbeac468a6e5d1c965d625cf1a5376b71362bf860083a
-  data.tar.gz: 81b0bfe00462d88f6c2f148a4e55343f3cbf291889a36c3e606a4775dd0d244f17b0b57b6deb9eb5e52b708cd0982e9bea714ee5a5ab877176fc28d3cd09583f
+  metadata.gz: bce1dcca8c7d543125c79fe4bb6f6422567e4d5c16946ccb0d30fbe05f4a242eee8201acf3b108cbeb71aa87b75858c868941833ee19d4c11bc92ad11c7214d5
+  data.tar.gz: e884f90c1a246c79ca0355fb4f3c5a99c77abea132e5b2543f185ae158e888e19f6c011df6ace3f3f888b8782762b584d6d1d6c375c49bccb4e6a0441852fee7

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## Rails 4.2.4 (August 14, 2015) ##
+
+*   ActionController::TestSession now accepts a default value as well as
+    a block for generating a default value based off the key provided.
+
+    This fixes calls to session#fetch in ApplicationController instances that
+    take more two arguments or a block from raising `ArgumentError: wrong
+    number of arguments (2 for 1)` when performing controller tests.
+
+    *Matthew Gerrior*
+
+*   Fix to keep original header instance in `ActionDispatch::SSL`
+
+    `ActionDispatch::SSL` changes headers to `Hash`.
+    So some headers will be broken if there are some middlewares
+    on `ActionDispatch::SSL` and if it uses `Rack::Utils::HeaderHash`.
+
+    *Fumiaki Matsushima*
+
+
 ## Rails 4.2.3 (June 25, 2015) ##
 
 *   Fix rake routes not showing the right format when

data/lib/action_controller/base.rb

@@ -183,7 +183,7 @@ module ActionController
     # Shortcut helper that returns all the modules included in
     # ActionController::Base except the ones passed as arguments:
     #
-    #   class MetalController
+    #   class MyBaseController < ActionController::Metal
     #     ActionController::Base.without_modules(:ParamsWrapper, :Streaming).each do |left|
     #       include left
     #     end

data/lib/action_controller/metal/mime_responds.rb

@@ -4,6 +4,7 @@ module ActionController #:nodoc:
   module MimeResponds
     extend ActiveSupport::Concern
 
+    # :stopdoc:
     module ClassMethods
       def respond_to(*)
         raise NoMethodError, "The controller-level `respond_to' feature has " \
@@ -21,6 +22,7 @@ module ActionController #:nodoc:
         "  gem 'responders', '~> 2.0'\n" \
         "Consult the Rails upgrade guide for details."
     end
+    # :startdoc:
 
     # Without web-service support, an action which collects the data for displaying a list of people
     # might look something like this:

data/lib/action_controller/metal/params_wrapper.rb

@@ -5,8 +5,8 @@ require 'active_support/core_ext/struct'
 require 'action_dispatch/http/mime_type'
 
 module ActionController
-  # Wraps the parameters hash into a nested hash. This will allow clients to submit
-  # POST requests without having to specify any root elements.
+  # Wraps the parameters hash into a nested hash. This will allow clients to
+  # submit requests without having to specify any root elements.
   #
   # This functionality is enabled in +config/initializers/wrap_parameters.rb+
   # and can be customized. If you are upgrading to \Rails 3.1, this file will
@@ -16,7 +16,7 @@ module ActionController
   # a non-empty array:
   #
   #     class UsersController < ApplicationController
-  #       wrap_parameters format: [:json, :xml]
+  #       wrap_parameters format: [:json, :xml, :url_encoded_form, :multipart_form]
   #     end
   #
   # If you enable +ParamsWrapper+ for +:json+ format, instead of having to

data/lib/action_controller/test_case.rb

@@ -327,6 +327,10 @@ module ActionController
       clear
     end
 
+    def fetch(*args, &block)
+      @data.fetch(*args, &block)
+    end
+
     private
 
       def load!
@@ -601,6 +605,7 @@ module ActionController
         parameters = paramify_values(parameters) if html_format?(parameters)
 
         @html_document = nil
+        @html_scanner_document = nil
 
         unless @controller.respond_to?(:recycle!)
           @controller.extend(Testing::Functional)

data/lib/action_dispatch/http/upload.rb

@@ -28,7 +28,13 @@ module ActionDispatch
         raise(ArgumentError, ':tempfile is required') unless @tempfile
 
         @original_filename = hash[:filename]
-        @original_filename &&= @original_filename.encode "UTF-8"
+        if @original_filename
+          begin
+            @original_filename.encode!(Encoding::UTF_8)
+          rescue EncodingError
+            @original_filename.force_encoding(Encoding::UTF_8)
+          end
+        end
         @content_type      = hash[:type]
         @headers           = hash[:head]
       end

data/lib/action_dispatch/journey/router.rb

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

data/lib/action_dispatch/middleware/ssl.rb

@@ -22,7 +22,7 @@ module ActionDispatch
 
       if request.ssl?
         status, headers, body = @app.call(env)
-        headers = hsts_headers.merge(headers)
+        headers.reverse_merge!(hsts_headers)
         flag_cookies_as_secure!(headers)
         [status, headers, body]
       else

data/lib/action_dispatch/testing/assertions/routing.rb

@@ -165,7 +165,7 @@ module ActionDispatch
 
       # ROUTES TODO: These assertions should really work in an integration context
       def method_missing(selector, *args, &block)
-        if defined?(@controller) && @controller && @routes && @routes.named_routes.route_defined?(selector)
+        if defined?(@controller) && @controller && defined?(@routes) && @routes && @routes.named_routes.route_defined?(selector)
           @controller.send(selector, *args, &block)
         else
           super

data/lib/action_dispatch/testing/integration.rb

@@ -301,6 +301,7 @@ module ActionDispatch
           response = _mock_session.last_response
           @response = ActionDispatch::TestResponse.from_response(response)
           @html_document = nil
+          @html_scanner_document = nil
           @url_options = nil
 
           @controller = session.last_request.env['action_controller.instance']
@@ -338,6 +339,7 @@ module ActionDispatch
           # reset the html_document variable, except for cookies/assigns calls
           unless method == 'cookies' || method == 'assigns'
             @html_document = nil
+            @html_scanner_document = nil
             reset_template_assertion
           end
 

data/lib/action_pack/gem_version.rb

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