casted_hash 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e74cebfdf5a17231faffc0fd84d81649e03ebc2
-  data.tar.gz: 6e73d43bd3338e2d2f7f29954d26f26faa54af62
+  metadata.gz: a1417da9dece7f7c45f0ada321d3a8323cd9d870
+  data.tar.gz: 58bf74f4889f564454b40aa08cc1904d611b4478
 SHA512:
-  metadata.gz: 86f80bc590f0705ae084ed8d2b2c5f42ae860da57fb2243625431f282e5b412fe58135e902ce223104dac202645583b134f5239851c140b22d20ba0aeb5434b3
-  data.tar.gz: 69a9513a358a264f7a649427d8151e930de231598a79d050a5870a0d7c557f0518b608654c3885af0a6aa218ea7afe46ace06378f981d2df7209a9f83d3dff34
+  metadata.gz: 78a0cd7f8705a8b389e1ebd5e051444e34c300fceba7bbfe4b751537f68547b27b6cbbdc06c17c0f28ce7480a681d2ea9c7e2e8cae8daa56ac5b221ce70f4b30
+  data.tar.gz: 05cd9e5be0896c45a755aecb64bdb5e70778e40fcda9b191dfc314bd756c4b40a519561cb21797e6c9c1e8046e0e1ffb4d00457c8f36e4b0051ecce62f045197

data/lib/casted_hash.rb

@@ -1,5 +1,5 @@
 class CastedHash < Hash
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 
   def initialize(constructor = {}, cast_proc = nil)
     raise ArgumentError, "`cast_proc` required" unless cast_proc
@@ -148,31 +148,33 @@ protected
 
   def uncast!(*keys)
     @casted_keys.delete *keys.map(&:to_s)
-    @casting_keys.delete *keys.map(&:to_s)
   end
 
   def cast!(key)
+    key = convert_key(key)
     return unless key?(key)
-    return regular_reader(convert_key(key)) if casted?(key)
-    raise SystemStackError if casting?(key)
+    return regular_reader(key) if casted?(key)
+    raise SystemStackError, "already casting #{key}" if casting?(key)
 
     casting! key
 
     value = if @cast_proc.arity == 1
-      @cast_proc.call regular_reader(convert_key(key))
+      @cast_proc.call regular_reader(key)
     elsif @cast_proc.arity == 2
-      @cast_proc.call self, regular_reader(convert_key(key))
+      @cast_proc.call self, regular_reader(key)
     elsif @cast_proc.arity == 3
-      @cast_proc.call self, key, regular_reader(convert_key(key))
+      @cast_proc.call self, key, regular_reader(key)
     else
       @cast_proc.call
     end
 
-    value = regular_writer(convert_key(key), value)
+    value = regular_writer(key, value)
 
     casted! key
 
     value
+  ensure
+    @casting_keys.delete convert_key(key)
   end
 
   def cast_all!

data/test/test_casted_hash.rb

@@ -17,9 +17,13 @@ describe CastedHash do
 
   it "does not loop when refering to itself" do
     @hash = CastedHash.new({:a => 1}, lambda {|x| @hash[:a] + 1 })
-    assert_raises(SystemStackError) do
+    error = assert_raises(SystemStackError) do
       @hash[:a]
     end
+    assert_equal "already casting a", error.message
+    assert_empty @hash.casted
+    assert !@hash.casted?(:a)
+    assert !@hash.casting?(:a)
   end
 
   it "can check size without casting" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: casted_hash
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Stephan Kaag