strong_parameters 0.1.0 → 0.1.1

data/README.rdoc

@@ -29,13 +29,13 @@ In addition, parameters can be marked as required and flow through a predefined
         end
     end
 
-Thanks to Nick Kallen for the permit idea!
+You can also use permit on nested parameters, like:
 
-== Todos
+    params.permit(:name, friends: [ :name, { family: [ :name ] }])
 
-* Make this play nice with nested parameters [???]. Design:
+Thanks to Nick Kallen for the permit idea!
 
-    params.permit(:name, friends: [ :name, { family: [ :name ] }])
+== Todos
 
 * Automatically permit parameters coming from a signed form [Yehuda]
 

data/lib/action_controller/parameters.rb

@@ -30,8 +30,32 @@ module ActionController
       self[key].presence || raise(ActionController::ParameterMissing.new(key))
     end
 
-    def permit(*keys)
-      slice(*keys).permit!
+    def permit(*filters)
+      params = self.class.new
+
+      filters.each do |filter|
+        case filter
+        when Symbol then
+          params[filter] = self[filter]
+        when Hash then
+          self.slice(*filter.keys).each do |key, value|
+            return unless value
+
+            key = key.to_sym
+
+            params[key] = each_element(value) do |value|
+              # filters are a Hash, so we expect value to be a Hash too
+              next if filter.is_a?(Hash) && !value.is_a?(Hash)
+
+              value = self.class.new(value) if !value.respond_to?(:permit)
+
+              value.permit(*Array.wrap(filter[key]))
+            end
+          end
+        end
+      end
+
+      params.permit!
     end
 
     def [](key)
@@ -59,13 +83,23 @@ module ActionController
           self[key] = self.class.new(value)
         end
       end
+
+      def each_element(object)
+        if object.is_a?(Array)
+          object.map { |el| yield el }.compact
+        else
+          yield object
+        end
+      end
   end
 
   module StrongParameters
     extend ActiveSupport::Concern
 
     included do
-      rescue_from(ActionController::ParameterMissing) { head :bad_request }
+      rescue_from(ActionController::ParameterMissing) do |parameter_missing_exception|
+        render text: "Required parameter missing: #{parameter_missing_exception.param}", status: :bad_request
+      end
     end
 
     def params

data/lib/strong_parameters/version.rb

@@ -1,3 +1,3 @@
 module StrongParameters
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/test/action_controller_required_params_test.rb

@@ -22,4 +22,9 @@ class ActionControllerRequiredParamsTest < ActionController::TestCase
     post :create, { book: { name: "Mjallo!" } }
     assert_response :ok
   end
+  
+  test "missing parameters will be mentioned in the return" do
+    post :create, { magazine: { name: "Mjallo!" } }
+    assert_equal "Required parameter missing: book", response.body
+  end
 end

data/test/nested_parameters_test.rb

@@ -0,0 +1,80 @@
+require 'test_helper'
+require 'action_controller/parameters'
+
+class NestedParametersTest < ActiveSupport::TestCase
+  test "permitted nested parameters" do
+    params = ActionController::Parameters.new({
+      book: {
+        title: "Romeo and Juliet",
+        authors: [{
+          name: "William Shakespeare",
+          born: "1564-04-26"
+        }, {
+          name: "Christopher Marlowe"
+        }],
+        details: {
+          pages: 200,
+          genre: "Tragedy"
+        }
+      },
+      magazine: "Mjallo!"
+    })
+
+    permitted = params.permit book: [ :title, { authors: [ :name ] }, { details: :pages } ]
+
+    assert permitted.permitted?
+    assert_equal "Romeo and Juliet", permitted[:book][:title]
+    assert_equal "William Shakespeare", permitted[:book][:authors][0][:name]
+    assert_equal "Christopher Marlowe", permitted[:book][:authors][1][:name]
+    assert_equal 200, permitted[:book][:details][:pages]
+    assert_nil permitted[:book][:details][:genre]
+    assert_nil permitted[:book][:authors][1][:born]
+    assert_nil permitted[:magazine]
+  end
+
+  test "nested arrays with strings" do
+    params = ActionController::Parameters.new({
+      book: {
+        genres: ["Tragedy"]
+      }
+    })
+
+    permitted = params.permit book: :genres
+    assert_equal ["Tragedy"], permitted[:book][:genres]
+  end
+
+  test "nested array with strings that should be hashes" do
+    params = ActionController::Parameters.new({
+      book: {
+        genres: ["Tragedy"]
+      }
+    })
+
+    permitted = params.permit book: { genres: :type }
+    assert_empty permitted[:book][:genres]
+  end
+
+  test "nested array with strings that should be hashes and additional values" do
+    params = ActionController::Parameters.new({
+      book: {
+        title: "Romeo and Juliet",
+        genres: ["Tragedy"]
+      }
+    })
+
+    permitted = params.permit book: [ :title, { genres: :type } ]
+    assert_equal "Romeo and Juliet", permitted[:book][:title]
+    assert_empty permitted[:book][:genres]
+  end
+
+  test "nested string that should be a hash" do
+    params = ActionController::Parameters.new({
+      book: {
+        genre: "Tragedy"
+      }
+    })
+
+    permitted = params.permit book: { genre: :type }
+    assert_nil permitted[:book][:genre]
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strong_parameters
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-21 00:00:00.000000000 Z
+date: 2012-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70323933135920 !ruby/object:Gem::Requirement
+  requirement: &70365015572120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70323933135920
+  version_requirements: *70365015572120
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70323933135420 !ruby/object:Gem::Requirement
+  requirement: &70365015570760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70323933135420
+  version_requirements: *70365015570760
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70323933135040 !ruby/object:Gem::Requirement
+  requirement: &70365015568980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70323933135040
+  version_requirements: *70365015568980
 description: 
 email:
 - david@heinemeierhansson.com
@@ -63,6 +63,7 @@ files:
 - test/active_model_mass_assignment_taint_protection_test.rb
 - test/dummy/db/test.sqlite3
 - test/dummy/log/test.log
+- test/nested_parameters_test.rb
 - test/parameters_require_test.rb
 - test/parameters_taint_test.rb
 - test/test_helper.rb
@@ -96,6 +97,7 @@ test_files:
 - test/active_model_mass_assignment_taint_protection_test.rb
 - test/dummy/db/test.sqlite3
 - test/dummy/log/test.log
+- test/nested_parameters_test.rb
 - test/parameters_require_test.rb
 - test/parameters_taint_test.rb
 - test/test_helper.rb