strong_parameters 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68061cec78793c90c4dffaefad764efbe8358313
-  data.tar.gz: 2078326f601731323e69251b4e24b6e22eea19ef
+  metadata.gz: 104655e7dd188f9f5160a59a1be21216bec034a3
+  data.tar.gz: 3f8a99ed1d06fb9514d84354a89930b287293d28
 SHA512:
-  metadata.gz: 8c1f8bf98587698cd24b65cfa12f1aadf2b62ca6d67de48d9c10d254adaf3f3296cbf843d32c462683eb46c1ef4cd4367329d28eec042241545a711143593eb7
-  data.tar.gz: 26e983eb07378e1720ba0cef6e128c52a8dda2ac30ebc7809b9fc12c4531db855bb648d97b645effd8416673cfc7d9544ccea594ef13f2fcd47830314b208f3a
+  metadata.gz: 4ae5b06d01b8220037bb6ea57070905a101babaa6b93a7c4d2bed17ff84d3e2a43d3426484d716501d33eb33ba4dd933dfa6ed5fd5aba911fb185694906e066d
+  data.tar.gz: be45b400d6b951c8c4d137ea469d4a7f50be92592883968a35964232e6f993505b75fad0b5b50ba43dacc2c2d05abfecf0e9102e8d21fb56dc2056b89d419d93

data/lib/action_controller/parameters.rb

@@ -4,6 +4,7 @@ require 'stringio'
 
 require 'active_support/concern'
 require 'active_support/core_ext/hash/indifferent_access'
+require 'active_support/core_ext/array/wrap'
 require 'action_controller'
 require 'action_dispatch/http/upload'
 
@@ -43,8 +44,10 @@ module ActionController
 
     def permit!
       each_pair do |key, value|
-        convert_hashes_to_parameters(key, value)
-        self[key].permit! if self[key].respond_to? :permit!
+        value = convert_hashes_to_parameters(key, value)
+        Array.wrap(value).each do |_|
+          _.permit! if _.respond_to? :permit!
+        end
       end
 
       @permitted = true
@@ -79,7 +82,7 @@ module ActionController
     end
 
     def fetch(key, *args)
-      convert_hashes_to_parameters(key, super)
+      convert_hashes_to_parameters(key, super, false)
     rescue KeyError, IndexError
       raise ActionController::ParameterMissing.new(key)
     end
@@ -110,9 +113,9 @@ module ActionController
 
     private
 
-      def convert_hashes_to_parameters(key, value)
+      def convert_hashes_to_parameters(key, value, assign_if_converted=true)
         converted = convert_value_to_parameters(value)
-        self[key] = converted unless converted.equal?(value)
+        self[key] = converted if assign_if_converted && !converted.equal?(value)
         converted
       end
 

data/lib/strong_parameters/version.rb

@@ -1,3 +1,3 @@
 module StrongParameters
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/test/parameters_permit_test.rb

@@ -334,6 +334,12 @@ class NestedParametersTest < ActiveSupport::TestCase
     assert_equal "prop0", params[:properties]["0"]
   end
 
+  test "fetch with a default value of a hash does not mutate the object" do
+    params = ActionController::Parameters.new({})
+    params.fetch :foo, {}
+    assert_equal nil, params[:foo]
+  end
+
   test 'hashes in array values get wrapped' do
     params = ActionController::Parameters.new(foo: [{}, {}])
     params[:foo].each do |hash|

data/test/parameters_taint_test.rb

@@ -3,9 +3,16 @@ require 'action_controller/parameters'
 
 class ParametersTaintTest < ActiveSupport::TestCase
   setup do
-    @params = ActionController::Parameters.new({ :person => {
-      :age => "32", :name => { :first => "David", :last => "Heinemeier Hansson" }
-    }})
+    @params = ActionController::Parameters.new(
+      person: {
+        age: '32',
+        name: {
+          first: 'David',
+          last: 'Heinemeier Hansson'
+        },
+        addresses: [{city: 'Chicago', state: 'Illinois'}]
+      }
+    )
   end
 
   test "fetch raises ParameterMissing exception" do
@@ -89,5 +96,6 @@ class ParametersTaintTest < ActiveSupport::TestCase
     assert @params.permitted?
     assert @params[:person].permitted?
     assert @params[:person][:name].permitted?
+    assert @params[:person][:addresses][0].permitted?
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: strong_parameters
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-21 00:00:00.000000000 Z
+date: 2014-01-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement