actionpack 3.1.10 → 3.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: 90968dc970e80ff89a11d7d2aa97c5cfa67bbf7b
-  data.tar.gz: 0d05b45c288729d7a5e17cd7df18fe652f1d6429
-!binary "U0hBNTEy":
-  metadata.gz: e3ab880006ca03db0c7f425582637ff5aa4f00680d80fcf4007f60645f5c1a20d96635332ea3a1592fcef55f35a9e184177df6ef43e2f9f97a79842885f2823d
-  data.tar.gz: ce0c161b8ac8343f61f5dba717f7028340d8a5c833d238fb9b33faa3d2b1cc862dc708d08cd8fe036ecc1b8056b32b7a90ad47d752772f4d3bc0d8f1694f5e48
+SHA1:
+  metadata.gz: 3e37bbcafb1b07b0732f02113ac4d8a0b50dccf9
+  data.tar.gz: 3741c6f652f01ea438825ce7a8d72874b5183332
+SHA512:
+  metadata.gz: e27fb48371aadb9db7d34b68bae46c9b17509695d3387ea55817bfb6007648e3b607f7e0a855c800449d67f1f5e567b99b37921f42c1a177f397d01ddbe21139
+  data.tar.gz: bf22b6ca891c7b117257330d8277696c37a6e251c24bd09f1ceeb646dbccf19c275d901f74e4afaf63788878bec672052b7c8792f00a692cc0eb3f9c4c121359

data/CHANGELOG.md

@@ -1,8 +1,14 @@
-## Rails 3.1.10
+## Rails 3.1.11 (unreleased)
+
+* Fixed JSON params parsing regression for non-object JSON content.
+
+## Rails 3.1.10 (Jan 8, 2013)
 
 * Strip nils from collections on JSON and XML posts. [CVE-2013-0155]
 
-## Rails 3.1.9
+## Rails 3.1.9 (Jan 2, 2013)
+
+*   No changes.
 
 ## Rails 3.1.8 (Aug 9, 2012)
 
@@ -45,7 +51,7 @@
 
 ## Rails 3.1.4 (unreleased) ##
 
-*   :subdomain can now be specified with a value of false in url_for, 
+*   :subdomain can now be specified with a value of false in url_for,
     allowing for subdomain(s) removal from the host during link generation. GH #4083
 
     *Arun Agrawal*

data/lib/action_controller/caching/fragments.rb

@@ -1,11 +1,11 @@
 module ActionController #:nodoc:
   module Caching
-    # Fragment caching is used for caching various blocks within 
+    # Fragment caching is used for caching various blocks within
     # views without caching the entire action as a whole. This is
-    # useful when certain elements of an action change frequently or 
-    # depend on complicated state while other parts rarely change or 
+    # useful when certain elements of an action change frequently or
+    # depend on complicated state while other parts rarely change or
     # can be shared amongst multiple parties. The caching is done using
-    # the <tt>cache</tt> helper available in the Action View. A 
+    # the <tt>cache</tt> helper available in the Action View. A
     # template with fragment caching might look like:
     #
     #   <b>Hello <%= @name %></b>
@@ -16,21 +16,21 @@ module ActionController #:nodoc:
     #   <% end %>
     #
     # This cache will bind the name of the action that called it, so if
-    # this code was part of the view for the topics/list action, you 
+    # this code was part of the view for the topics/list action, you
     # would be able to invalidate it using:
-    #   
+    #
     #   expire_fragment(:controller => "topics", :action => "list")
     #
-    # This default behavior is limited if you need to cache multiple 
-    # fragments per action or if the action itself is cached using 
-    # <tt>caches_action</tt>. To remedy this, there is an option to 
-    # qualify the name of the cached fragment by using the 
+    # This default behavior is limited if you need to cache multiple
+    # fragments per action or if the action itself is cached using
+    # <tt>caches_action</tt>. To remedy this, there is an option to
+    # qualify the name of the cached fragment by using the
     # <tt>:action_suffix</tt> option:
     #
     #   <% cache(:action => "list", :action_suffix => "all_topics") do %>
     #
-    # That would result in a name such as 
-    # <tt>/topics/list/all_topics</tt>, avoiding conflicts with the 
+    # That would result in a name such as
+    # <tt>/topics/list/all_topics</tt>, avoiding conflicts with the
     # action cache and with any fragments that use a different suffix.
     # Note that the URL doesn't have to really exist or be callable
     # - the url_for system is just used to generate unique cache names
@@ -38,21 +38,21 @@ module ActionController #:nodoc:
     #
     # The expiration call for this example is:
     #
-    #   expire_fragment(:controller => "topics", 
-    #                   :action => "list", 
+    #   expire_fragment(:controller => "topics",
+    #                   :action => "list",
     #                   :action_suffix => "all_topics")
     module Fragments
       # Given a key (as described in <tt>expire_fragment</tt>), returns
-      # a key suitable for use in reading, writing, or expiring a 
+      # a key suitable for use in reading, writing, or expiring a
       # cached fragment. If the key is a hash, the generated key is the
-      # return value of url_for on that hash (without the protocol). 
+      # return value of url_for on that hash (without the protocol).
       # All keys are prefixed with <tt>views/</tt> and uses
       # ActiveSupport::Cache.expand_cache_key for the expansion.
       def fragment_cache_key(key)
         ActiveSupport::Cache.expand_cache_key(key.is_a?(Hash) ? url_for(key).split("://").last : key, :views)
       end
 
-      # Writes <tt>content</tt> to the location signified by 
+      # Writes <tt>content</tt> to the location signified by
       # <tt>key</tt> (see <tt>expire_fragment</tt> for acceptable formats).
       def write_fragment(key, content, options = nil)
         return content unless cache_configured?
@@ -77,7 +77,7 @@ module ActionController #:nodoc:
         end
       end
 
-      # Check if a cached fragment from the location signified by 
+      # Check if a cached fragment from the location signified by
       # <tt>key</tt> exists (see <tt>expire_fragment</tt> for acceptable formats)
       def fragment_exist?(key, options = nil)
         return unless cache_configured?
@@ -109,7 +109,6 @@ module ActionController #:nodoc:
       def expire_fragment(key, options = nil)
         return unless cache_configured?
         key = fragment_cache_key(key) unless key.is_a?(Regexp)
-        message = nil
 
         instrument_fragment_cache :expire_fragment, key do
           if key.is_a?(Regexp)

data/lib/action_controller/metal/http_authentication.rb

@@ -426,7 +426,7 @@ module ActionController
       # Returns an Array of [String, Hash] if a token is present.
       # Returns nil if no token is found.
       def token_and_options(request)
-        if header = request.authorization.to_s[/^Token (.*)/]
+        if request.authorization.to_s[/^Token (.*)/]
           values = Hash[$1.split(',').map do |value|
             value.strip!                      # remove any spaces between commas and values
             key, value = value.split(/\=\"?/) # split key=value pairs

data/lib/action_dispatch/http/filter_parameters.rb

@@ -26,8 +26,6 @@ module ActionDispatch
     module FilterParameters
       extend ActiveSupport::Concern
 
-      @@parameter_filter_for  = {}
-
       # Return a hash of parameters with all sensitive data replaced.
       def filtered_parameters
         @filtered_parameters ||= parameter_filter.filter(parameters)
@@ -54,7 +52,7 @@ module ActionDispatch
       end
 
       def parameter_filter_for(filters)
-        @@parameter_filter_for[filters] ||= ParameterFilter.new(filters)
+        ParameterFilter.new(filters)
       end
 
       KV_RE   = '[^&;=]+'

data/lib/action_dispatch/http/response.rb

@@ -33,7 +33,8 @@ module ActionDispatch # :nodoc:
   #    end
   #  end
   class Response
-    attr_accessor :request, :header, :status
+    attr_accessor :request, :header
+    attr_reader :status
     attr_writer :sending_file
 
     alias_method :headers=, :header=

data/lib/action_dispatch/middleware/head.rb

@@ -8,7 +8,7 @@ module ActionDispatch
       if env["REQUEST_METHOD"] == "HEAD"
         env["REQUEST_METHOD"] = "GET"
         env["rack.methodoverride.original_method"] = "HEAD"
-        status, headers, body = @app.call(env)
+        status, headers, _ = @app.call(env)
         [status, headers, []]
       else
         @app.call(env)

data/lib/action_dispatch/middleware/params_parser.rb

@@ -44,10 +44,10 @@ module ActionDispatch
         when :yaml
           YAML.load(request.raw_post)
         when :json
-          data = request.deep_munge ActiveSupport::JSON.decode(request.body)
+          data = ActiveSupport::JSON.decode(request.body)
           request.body.rewind if request.body.respond_to?(:rewind)
           data = {:_json => data} unless data.is_a?(Hash)
-          data.with_indifferent_access
+          request.deep_munge(data).with_indifferent_access
         else
           false
         end

data/lib/action_dispatch/testing/integration.rb

@@ -215,9 +215,6 @@ module ActionDispatch
                            "*/*;q=0.5"
 
         unless defined? @named_routes_configured
-          # install the named routes in this session instance.
-          klass = singleton_class
-
           # the helpers are made protected by default--we make them public for
           # easier access during testing and troubleshooting.
           @named_routes_configured = true

data/lib/action_pack/version.rb

@@ -2,7 +2,7 @@ module ActionPack
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
-    TINY  = 10
+    TINY  = 11
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/lib/action_view/helpers/debug_helper.rb

@@ -30,7 +30,7 @@ module ActionView
         begin
           Marshal::dump(object)
           "<pre class='debug_dump'>#{h(object.to_yaml).gsub("  ", "&nbsp; ")}</pre>".html_safe
-        rescue Exception => e  # errors from Marshal or YAML
+        rescue Exception # errors from Marshal or YAML
           # Object couldn't be dumped, perhaps because of singleton methods -- this is the fallback
           "<code class='debug_dump'>#{h(object.inspect)}</code>".html_safe
         end

data/lib/action_view/renderer/template_renderer.rb

@@ -64,7 +64,7 @@ module ActionView
           layout =~ /^\// ?
             with_fallbacks { find_template(layout, nil, false, keys) } : find_template(layout, nil, false, keys)
         end
-      rescue ActionView::MissingTemplate => e
+      rescue ActionView::MissingTemplate
         update_details(:formats => nil) do
           raise unless template_exists?(layout)
         end

data/lib/action_view/template/error.rb

@@ -31,7 +31,6 @@ module ActionView
     def initialize(paths, path, prefixes, partial, details, *)
       @path = path
       prefixes = Array.wrap(prefixes)
-      display_paths = paths.compact.map{ |p| p.to_s.inspect }.join(", ")
       template_type = if partial
         "partial"
       elsif path =~ /layouts/i

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionpack
 version: !ruby/object:Gem::Version
-  version: 3.1.10
+  version: 3.1.11
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-08 00:00:00.000000000 Z
+date: 2013-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.10
+        version: 3.1.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.10
+        version: 3.1.11
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.10
+        version: 3.1.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.10
+        version: 3.1.11
 - !ruby/object:Gem::Dependency
   name: rack-cache
   requirement: !ruby/object:Gem::Requirement
@@ -379,7 +379,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.0.0.preview3
+rubygems_version: 2.0.0.rc.2
 signing_key: 
 specification_version: 4
 summary: Web-flow and rendering framework putting the VC in MVC (part of Rails).