tainted_hash 0.1.0 → 0.2.0

data/lib/tainted_hash.rb

@@ -1,7 +1,7 @@
 require 'set'
 
 class TaintedHash < Hash
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 
   class UnexposedError < StandardError
     # Builds an exception when a TaintedHash has some unexposed keys.  Useful
@@ -41,13 +41,14 @@ class TaintedHash < Hash
   #
   def initialize(hash = nil, new_class = nil)
     @new_class = new_class || (hash && hash.class) || self.class.default_hash_class
-    (@original_hash = hash || @new_class.new).keys.each do |key|
+    @original_hash = hash || @new_class.new
+    @exposed_nothing = true
+
+    @original_hash.keys.each do |key|
       key_s = key.to_s
       next if key_s == key
       @original_hash[key_s] = @original_hash.delete(key)
     end
-
-    @exposed_nothing = true
   end
 
   # Public: Exposes one or more keys for the hash.
@@ -102,12 +103,7 @@ class TaintedHash < Hash
     key_s = key.to_s
     return if !@original_hash.key?(key_s)
 
-    case value = @original_hash[key_s]
-    when TaintedHash then value
-    when Hash
-      value = @original_hash[key_s] = self.class.new(value, @new_class)
-    else value
-    end
+    get_original_hash_value(key_s)
   end
 
   # Public: Attempts to set the key of a frozen hash.
@@ -118,11 +114,7 @@ class TaintedHash < Hash
   # Returns nothing
   def []=(key, value)
     key_s = key.to_s
-    super(key_s, @original_hash[key_s] = case value
-      when TaintedHash then value
-      when Hash then self.class.new(value, @new_class)
-      else value
-      end)
+    super(key_s, set_original_hash_value(key_s, value))
   end
 
   # Public: Deletes the value from both the internal and current Hash.
@@ -205,10 +197,27 @@ class TaintedHash < Hash
     hash
   end
 
+  def with_indifferent_access
+    self
+  end
+
   def inspect
     %(#<#{self.class}:#{object_id} @hash=#{@original_hash.inspect} @exposed=#{keys.inspect}>)
   end
 
+private
+  def get_original_hash_value(key_s)
+    set_original_hash_value(key_s, @original_hash[key_s])
+  end
+
+  def set_original_hash_value(key_s, value)
+    if value.is_a?(Hash) && !value.is_a?(TaintedHash)
+      value = self.class.new(value, @new_class)
+    end
+
+    @original_hash[key_s] = value
+  end
+
   module RailsMethods
     def self.included(base)
       base.send :alias_method, :stringify_keys!, :stringify_keys

data/lib/tainted_hash/rails.rb

@@ -11,7 +11,3 @@ end
 if defined?(ActionController::Base)
   ActionController::Base.send :include, TaintedHash::Controller
 end
-
-if defined?(HashWithIndifferentAccess)
-  TaintedHash.default_hash_class = HashWithIndifferentAccess
-end

data/tainted_hash.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'tainted_hash'
-  s.version           = '0.1.0'
-  s.date              = '2013-05-21'
+  s.version           = '0.2.0'
+  s.date              = '2013-07-16'
   s.rubyforge_project = 'tainted_hash'
 
   ## Make sure your summary is short. The description may be as long

data/test/tainted_hash_test.rb

@@ -12,6 +12,13 @@ class TaintedHashTest < Test::Unit::TestCase
     @tainted = TaintedHash.new @hash
   end
 
+  def test_accessing_sub_hash_memoized_tainted_hash
+    c = @tainted[:c]
+    assert_kind_of TaintedHash, c
+
+    assert_equal @tainted[:c].object_id, c.object_id
+  end
+
   def test_exposes_no_keys_by_default
     assert !@tainted.include?('a')
     assert !@tainted.include?('b')
@@ -182,4 +189,3 @@ class TaintedHashTest < Test::Unit::TestCase
     assert_equal({'a' => 1}, slice.to_hash)
   end
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tainted_hash
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit