params_cleaner 0.4.2 → 0.4.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9fec59b6d039921eab9c77a26f36fa73227173fe
+  data.tar.gz: 7b8cb6e72c5d6b0fe9d9d63ea7c9b5d840e629fc
+SHA512:
+  metadata.gz: 86796d222afe4f2b8abe94f9f15351ed14c4175af060f8040c679e68bce7e59de6a30409bea8b48c3df2a49dbd6c337a379d15e6b0b700ad48ac0173f3da5341
+  data.tar.gz: a93da4692d51e0d0358a642872f153d4152f7c6009e70526a9eabaf71c75d6d82ec48e093fcbb2533ab3a656d98fe2e026945b0d506d683ac89ca67dfaf3595b

data/lib/params_cleaner/version.rb

@@ -1,3 +1,3 @@
 module ParamsCleaner
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/lib/params_cleaner/whitelist.rb

@@ -4,60 +4,37 @@ module ParamsCleaner
       @whitelist = whitelist
     end
 
-    def sanitize(params, top_level = true)
-      cleaned_params = params.map do |key, value|
-        if value.kind_of?(Hash)
-          _clean_hash(key, value)
-        elsif value.kind_of?(Array)
-          _clean_array(key, value)
-        else
-          _clean_value(key, value, top_level)
-        end
+    def sanitize(item, parent = nil)
+      if item.kind_of?(Hash)
+        _sanitize_hash(item, parent)
+      elsif item.kind_of?(Array)
+        item.map { |item| sanitize(item, parent) }
+      else
+        item
       end
-
-      cleaned_params_hash = Hash[cleaned_params]
-      HashWithIndifferentAccess.new(cleaned_params_hash)
     end
 
-    def _allowed_nested
-      @whitelist.detect { |params_group| params_group.is_a?(Hash) } || {}
-    end
+    def _sanitize_hash(hash, parent)
+      valid_keys = _valid_keys_for_parent(parent)
+      valid_pairs = hash.select { |key, value| valid_keys.include?(key.to_sym) }
+      sanitized_pairs = valid_pairs.map { |key, value| [key, sanitize(value, key.to_sym)] }
 
-    def _allowed_top_level
-      params_groups = []
-      @whitelist.each do |params_group|
-        unless params_group.is_a?(Hash)
-          params_groups << params_group
-        end
-      end
-      params_groups
+      HashWithIndifferentAccess.new(Hash[sanitized_pairs])
     end
 
-    def _clean_array(key, value)
-      cleaned_values = value.map do |sub_value|
-        if sub_value.is_a?(Hash)
-          _clean_hash(key, sub_value).last
-        else
-          sub_value
-        end
-      end
-      [key, cleaned_values]
+    def _top_level_keys
+      @top_level_keys ||= @whitelist.reject { |item| item.kind_of?(Hash) }
     end
 
-    def _clean_hash(key, value)
-      allowed_keys = value.slice(*_allowed_nested[key.to_sym])
-      clean_values = sanitize(allowed_keys, false)
-      [key, clean_values]
+    def _valid_keys_for_parent(parent)
+      _whitelist_hash.keys.tap do |keys|
+        keys.concat(_top_level_keys) if parent.nil?
+        keys.concat(_whitelist_hash[parent]) if _whitelist_hash.has_key?(parent)
+      end
     end
 
-    def _clean_value(key, value, top_level)
-      return [key, value] unless top_level
-
-      if _allowed_top_level.include?(key.to_sym)
-        [key, value]
-      else
-        []
-      end
+    def _whitelist_hash
+      @whitelist_hash ||= @whitelist.last.is_a?(Hash) ? @whitelist.last : {}
     end
   end
 end

metadata

@@ -1,32 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: params_cleaner
 version: !ruby/object:Gem::Version
-  version: 0.4.2
-  prerelease: 
+  version: 0.4.3
 platform: ruby
 authors:
 - Drew Olson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-11 00:00:00.000000000 Z
+date: 2013-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
 description: Rails mass assignment protection in the controller
 email:
 - drew@drewolson.org
@@ -39,32 +36,25 @@ files:
 - lib/params_cleaner.rb
 homepage: https://github.com/drewolson/params_cleaner
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2059744410745176612
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2059744410745176612
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rails mass assignment protection in the controller
 test_files: []