strong_parameters 0.1.4 → 0.1.5

data/README.rdoc

@@ -50,4 +50,4 @@ every model you want protected.
 
 == Compatibility
 
-Due to a testing issue, this plugin is only fully compatible with rails/3-2-stable rev 275ee0dc7b and forward as well as rails/master rev b49a7ddce1 and forward.
+This plugin is only fully compatible with Rails versions 3.1 and 3.2 but not 4.0+, as it is part of Rails Core in 4.0.

data/lib/action_controller/parameters.rb

@@ -22,6 +22,11 @@ module ActionController
     end
 
     def permit!
+      each_pair do |key, value|
+        convert_hashes_to_parameters(key, value)
+        self[key].permit! if self[key].respond_to? :permit!
+      end
+
       @permitted = true
       self
     end
@@ -39,6 +44,7 @@ module ActionController
         case filter
         when Symbol, String then
           params[filter] = self[filter] if has_key?(filter)
+          keys.grep(/\A#{Regexp.escape(filter)}\(\d+[if]?\)\z/).each { |key| params[key] = self[key] }
         when Hash then
           self.slice(*filter.keys).each do |key, value|
             return unless value
@@ -80,6 +86,17 @@ module ActionController
       end
     end
 
+    protected
+      def convert_value(value)
+        if value.class == Hash
+          self.class.new_from_hash_copying_default(value)
+        elsif value.is_a?(Array)
+          value.dup.replace(value.map { |e| convert_value(e) })
+        else
+          value
+        end
+      end
+
     private
       def convert_hashes_to_parameters(key, value)
         if value.is_a?(Parameters) || !value.is_a?(Hash)

data/lib/strong_parameters/version.rb

@@ -1,3 +1,3 @@
 module StrongParameters
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/test/controller_generator_test.rb

@@ -8,6 +8,7 @@ class StrongParametersControllerGeneratorTest < Rails::Generators::TestCase
   setup :prepare_destination
 
   def test_controller_content
+    Rails.stubs(:application).returns(nil)
     run_generator
 
     assert_file "app/controllers/users_controller.rb" do |content|

data/test/multi_parameter_attributes_test.rb

@@ -0,0 +1,39 @@
+require 'test_helper'
+require 'action_controller/parameters'
+
+class MultiParameterAttributesTest < ActiveSupport::TestCase
+  test "permitted multi-parameter attribute keys" do
+    params = ActionController::Parameters.new({
+      book: {
+        "shipped_at(1i)"   => "2012",
+        "shipped_at(2i)"   => "3",
+        "shipped_at(3i)"   => "25",
+        "shipped_at(4i)"   => "10",
+        "shipped_at(5i)"   => "15",
+        "published_at(1i)" => "1999",
+        "published_at(2i)" => "2",
+        "published_at(3i)" => "5",
+        "price(1)"         => "R$",
+        "price(2f)"        => "2.02"
+      }
+    })
+
+    permitted = params.permit book: [ :shipped_at, :price ]
+
+    assert permitted.permitted?
+
+    assert_equal "2012", permitted[:book]["shipped_at(1i)"]
+    assert_equal "3", permitted[:book]["shipped_at(2i)"]
+    assert_equal "25", permitted[:book]["shipped_at(3i)"]
+    assert_equal "10", permitted[:book]["shipped_at(4i)"]
+    assert_equal "15", permitted[:book]["shipped_at(5i)"]
+
+    assert_equal "R$", permitted[:book]["price(1)"]
+    assert_equal "2.02", permitted[:book]["price(2f)"]
+
+    assert_nil permitted[:book]["published_at(1i)"]
+    assert_nil permitted[:book]["published_at(2i)"]
+    assert_nil permitted[:book]["published_at(3i)"]
+  end
+end
+

data/test/parameters_taint_test.rb

@@ -58,4 +58,11 @@ class ParametersTaintTest < ActiveSupport::TestCase
     @params.permit!
     assert_equal @params.permitted?, @params.dup.permitted?
   end
+
+  test "permit is recursive" do
+    @params.permit!
+    assert @params.permitted?
+    assert @params[:person].permitted?
+    assert @params[:person][:name].permitted?
+  end
 end

data/test/test_helper.rb

@@ -3,6 +3,7 @@ ENV["RAILS_ENV"] = "test"
 
 require 'test/unit'
 require 'strong_parameters'
+require 'mocha'
 
 module ActionController
   SharedTestRoutes = ActionDispatch::Routing::RouteSet.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strong_parameters
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,44 +9,75 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-21 00:00:00.000000000 Z
+date: 2012-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &2164465820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2164465820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &2164465300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2164465300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &2164464820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2164464820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2164464440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +85,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164464440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - david@heinemeierhansson.com
@@ -77,6 +113,7 @@ files:
 - test/action_controller_tainted_params_test.rb
 - test/active_model_mass_assignment_taint_protection_test.rb
 - test/controller_generator_test.rb
+- test/multi_parameter_attributes_test.rb
 - test/nested_parameters_test.rb
 - test/parameters_require_test.rb
 - test/parameters_taint_test.rb
@@ -101,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Permitted and required parameters for Action Pack
@@ -110,6 +147,7 @@ test_files:
 - test/action_controller_tainted_params_test.rb
 - test/active_model_mass_assignment_taint_protection_test.rb
 - test/controller_generator_test.rb
+- test/multi_parameter_attributes_test.rb
 - test/nested_parameters_test.rb
 - test/parameters_require_test.rb
 - test/parameters_taint_test.rb