saneitized 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7c7d693f5788a72925fc71286dbb0763beec6bb
-  data.tar.gz: f8af45cfe6328a8ceca644fba63b876b77a505a4
+  metadata.gz: 1ab347d813be1f3280e082c1c98ac2c2239658a6
+  data.tar.gz: 11878e23a57706b167dd112921aa433ef1b18eb9
 SHA512:
-  metadata.gz: 4e785b779cf22c52d537d00eed01ce80b38303da62a511d323fbe5d7cbe6af87184f4f9419aaa7c30475612afa7dc2d9291910192b956f78655b47b3eeac762b
-  data.tar.gz: 78039489fec19a1f3ac16562e20894d2602f1ecc4c3e0ef3acf3814ce3b5094c81eca7016dd0a0ed22d220503b94b85c758dd74cb671cfa3c986a07f3a4d2887
+  metadata.gz: 13e249df3f2bdce3dc78bde0de6f22df736eb4ce82b38e5c92b99ebfe58633547ae470fb3542e0a8ddba365d3b9a611082cc7e53b49dec1933f4cf488b2f7fec
+  data.tar.gz: 49dae3f6dd291f4a1385128e57dcd7045c925b6d13d8f9ee6906bd1044618796021a59b2d944e28162b9d17836f6fa4ccb5168397f3248d86bdf5061e13269ff

data/lib/saneitized/array.rb

@@ -3,17 +3,18 @@ module Saneitized
 
   class Array < SimpleDelegator
 
-    def initialize(array = [])
-      super(array.map{|item| Saneitized.convert(item)})
+    def initialize(array = [], options = {})
+      @options = options
+      super(array.map{|item| Saneitized.convert(item, options)})
       self
     end
 
     def []=(index, value)
-      super index, Saneitized.convert(value)
+      super index, Saneitized.convert(value, @options)
     end
 
     def << (value)
-      super Saneitized.convert(value)
+      super Saneitized.convert(value, @options)
     end
 
     def push(*args)

data/lib/saneitized/converter.rb

@@ -5,15 +5,16 @@ module Saneitized
 
   def self.convert(unknown, options = {})
     options[:blacklist] ||= nil
-    return Saneitized::Hash.new(unknown) if unknown.is_a? ::Hash
-    return Saneitized::Array.new(unknown) if unknown.is_a? ::Array
+
+    return Saneitized::Hash.new(unknown, options) if unknown.is_a? ::Hash
+    return Saneitized::Array.new(unknown, options) if unknown.is_a? ::Array
     return unknown unless unknown.is_a? String #Only attempt to convert string
     return unknown if Array(options[:blacklist]).include?(unknown)
 
     %w(true false nil integer float json time).each do |type|
       value = Converter.send(type + '?', unknown)
       next if value == :nope
-      return (type == 'json') ? convert(value) : value
+      return (type == 'json') ? convert(value, options) : value
     end
 
     unknown

data/lib/saneitized/hash.rb

@@ -2,15 +2,16 @@ module Saneitized
 
   class Hash < SimpleDelegator
 
-    def initialize(hash = {})
+    def initialize(hash = {}, options = {})
+      @options = options
       new_hash = {}
-      hash.each do |key, value| new_hash[key] = Saneitized.convert(value) end
+      hash.each do |key, value| new_hash[key] = Saneitized.convert(value, options) end
       super(new_hash)
       self
     end
 
     def []=(key, value)
-      super key, Saneitized.convert(value)
+      super key, Saneitized.convert(value, @options)
     end
 
     def merge!(*args, &block)

data/lib/saneitized/version.rb

@@ -1,3 +1,3 @@
 module Saneitized
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

data/spec/saneitized/converter_spec.rb

@@ -68,13 +68,19 @@ describe Saneitized do
       end
     end
 
-    it 'should respect blacklist' do
-      expect(Saneitized.convert('day', blacklist:'day')).to eql 'day'
-    end
+    context 'with blacklist' do 
+      it 'should not convertet blacklisted item' do
+        expect(Saneitized.convert('day', blacklist:'day')).to eql 'day'
+      end
 
-    it 'should respect array blacklist' do
-      expect(Saneitized.convert('day', blacklist:%w(hour day))).to eql 'day'
-    end
+      it 'should not converter item in blacklist array' do
+        expect(Saneitized.convert('day', blacklist:%w(hour day))).to eql 'day'
+      end
 
+      it 'should not convert item in hash in blacklist' do
+        expected = { 'today' => ['day', 'month', 'week'] }
+        expect(Saneitized.convert('{"today":["day","month","week"]}', blacklist:%w(day month week))).to eq expected
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saneitized
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Benjamin Guest