params_cleaner 0.1.2 → 0.2.0

data/lib/params_cleaner.rb

@@ -5,15 +5,14 @@ require "active_support/hash_with_indifferent_access"
 module ParamsCleaner
   extend ActiveSupport::Concern
 
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 
-  def clean_params(root_params = params)
+  def clean_params(root_params = params, top_level = true)
     cleaned_params = root_params.map do |key, val|
       if val.kind_of?(Hash)
-        clean_values = clean_params(val.slice(*self.class._allowed_params[key.to_sym]))
-        [key, clean_values]
+        _clean_hash(key, val)
       else
-        [key, val]
+        _clean_value(key, val, top_level)
       end
     end
 
@@ -21,13 +20,41 @@ module ParamsCleaner
     HashWithIndifferentAccess.new(cleaned_params_hash)
   end
 
+  def _clean_hash(key, value)
+    allowed_keys = value.slice(*self.class._allowed_nested[key.to_sym])
+    clean_values = clean_params(allowed_keys, false)
+    [key, clean_values]
+  end
+
+  def _clean_value(key, value, top_level)
+    return [key, value] unless top_level
+
+    if self.class._allowed_top_level.include?(key)
+      [key, value]
+    else
+      []
+    end
+  end
+
   module ClassMethods
-    def allowed_params(params_hash)
-      @allowed_params = params_hash
+    def allowed_params(*params_groups)
+      @allowed_top_level = []
+
+      params_groups.each do |params_group|
+        if params_group.is_a?(Hash)
+          @allowed_nested = params_group
+        else
+          @allowed_top_level << params_group
+        end
+      end
+    end
+
+    def _allowed_nested
+      @allowed_nested
     end
 
-    def _allowed_params
-      @allowed_params
+    def _allowed_top_level
+      @allowed_top_level
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: params_cleaner
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-10 00:00:00.000000000 Z
+date: 2012-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70285576499760 !ruby/object:Gem::Requirement
+  requirement: &70105385011580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70285576499760
+  version_requirements: *70105385011580
 description: Rails mass assignment protection in the controller
 email:
 - drew@drewolson.org
@@ -44,7 +44,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4310871954395950718
+      hash: 1896846872677650813
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -53,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4310871954395950718
+      hash: 1896846872677650813
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15