casted_hash 0.8.4 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e0fdde9d0be05ae67fc01e13efb414a6391f440
-  data.tar.gz: 05fd32baa77c4e96a67a6b09b2b0bf5eb3d20e64
+  metadata.gz: c5c39bef30e00f8e9271c14a2f670c885b302235
+  data.tar.gz: 20954b45304a2d3b80ef2b8ed179a2759dffc192
 SHA512:
-  metadata.gz: f5a65a41fdb982bc127128715d6e4a3fa8ce2de31069d230a5fc5f61bf7165da5c9da46691c2d7f4697c49014e98c2944fd4432cca7010ab6f23110179008570
-  data.tar.gz: 7ca40f81878b5399d013e9f4f0d75d3424a56eb499c745eeacc9888bfc8e13b9a325d33287ec100394061c4ed565b5ab52fa56a0e68c83e754f22158fcad8460
+  metadata.gz: 4c9a20a7693c337031c66de360d8975962191d1daee1677a2bb7c40d65b298a581348c87cd6c52990db938536032c829bb0c33424ccd9355e6c823ad77c31a5a
+  data.tar.gz: 082d300b4df4ebc59befe661e091f14666540136fd18a3c3b60d04df968f114caeab139baa06628e99011e73d77ccb096194604b5b5079b511ad5669bc95c409

data/lib/casted_hash.rb

@@ -1,22 +1,22 @@
 class CastedHash < Hash
-  VERSION = "0.8.4"
+  VERSION = "0.9.0"
 
   def initialize(constructor = {}, cast_proc = nil)
     raise ArgumentError, "`cast_proc` required" unless cast_proc
 
     @cast_proc = cast_proc
-    @casting_keys = []
+    @casting_keys = Set.new
 
     if constructor.is_a?(CastedHash)
       @casted_keys = constructor.instance_variable_get(:@casted_keys).dup
       super()
       update(constructor)
     elsif constructor.is_a?(Hash)
-      @casted_keys = []
+      @casted_keys = Set.new
       super()
       update(constructor)
     else
-      @casted_keys = []
+      @casted_keys = Set.new
       super(constructor)
     end
   end
@@ -70,7 +70,7 @@ class CastedHash < Hash
       regular_writer converted_key, value
 
       if other_hash.is_a?(CastedHash) && other_hash.casted?(key)
-        casted!(key)
+        casted!(key, true)
       elsif casted?(key)
         uncast!(converted_key)
       end
@@ -81,8 +81,9 @@ class CastedHash < Hash
 
   alias_method :merge!, :update
 
-  def key?(key)
-    super(convert_key(key))
+  def key?(key, converted = false)
+    key = convert_key(key) unless converted
+    super(key)
   end
 
   alias_method :include?, :key?
@@ -122,12 +123,9 @@ class CastedHash < Hash
     self
   end
 
-  def casted?(key)
-    @casted_keys.include?(convert_key(key))
-  end
-
-  def casting?(key)
-    @casting_keys.include?(convert_key(key))
+  def casted?(key, converted = false)
+    key = convert_key(key) unless converted
+    @casted_keys.include?(key)
   end
 
   def to_hash
@@ -146,15 +144,11 @@ class CastedHash < Hash
     end
   end
 
-  def casted!(*keys)
+  def casted!(keys, converted = false)
+    keys = [keys] unless keys.is_a?(Array)
     keys.each do |key|
-      @casted_keys << convert_key(key) if key?(key)
-    end
-  end
-
-  def casting!(*keys)
-    keys.each do |key|
-      @casting_keys << convert_key(key) if key?(key)
+      key = convert_key(key) unless converted
+      @casted_keys << key if key?(key, converted)
     end
   end
 
@@ -165,8 +159,8 @@ protected
   end
 
   def cast!(key)
-    return unless key?(key)
-    return regular_reader(key) if casted?(key)
+    return unless key?(key, true)
+    return regular_reader(key) if casted?(key, true)
     raise SystemStackError, "already casting #{key}" if casting?(key)
 
     casting! key
@@ -183,13 +177,21 @@ protected
 
     value = regular_writer(key, value)
 
-    casted! key
+    casted! key, true
 
     value
   ensure
     @casting_keys.delete key
   end
 
+  def casting!(key)
+    @casting_keys << key
+  end
+
+  def casting?(key)
+    @casting_keys.include?(key)
+  end
+
   def cast_all!
     keys.each{|key| cast! key}
   end

data/test/test_casted_hash.rb

@@ -32,6 +32,18 @@ describe CastedHash do
     assert_equal "3", hash[:bar]
   end
 
+  it "does not mark key multiple times as casted" do
+    hash = CastedHash.new({:a => 1, :b => 2}, lambda {|x| x + 10 })
+    assert_equal [], hash.instance_variable_get(:@casted_keys).to_a
+    assert_equal 11, hash[:a]
+    assert_equal ["a"], hash.instance_variable_get(:@casted_keys).to_a
+    hash.casted! :a
+    hash.casted! :b
+    hash.casted! :b
+    hash.casted! :c
+    assert_equal ["a", "b"], hash.instance_variable_get(:@casted_keys).to_a
+  end
+
   it "does not loop when refering to itself" do
     @hash = CastedHash.new({:a => 1}, lambda {|x| @hash[:a] + 1 })
     error = assert_raises(SystemStackError) do
@@ -40,7 +52,7 @@ describe CastedHash do
     assert_equal "already casting a", error.message
     assert_empty @hash.casted
     assert !@hash.casted?(:a)
-    assert !@hash.casting?(:a)
+    assert_equal [], @hash.instance_variable_get(:@casting_keys).to_a
   end
 
   it "can check size without casting" do
@@ -277,7 +289,7 @@ describe CastedHash do
 
   it "allows bypassing of casting" do
     hash = CastedHash.new({:a => 1, :b => 2, :c => 3}, lambda {|x|x + 1})
-    hash.casted! "a", :b
+    hash.casted! ["a", :b]
     assert_equal 1, hash[:a]
     assert_equal 2, hash[:b]
     assert_equal 4, hash[:c]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: casted_hash
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.9.0
 platform: ruby
 authors:
 - Stephan Kaag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-02 00:00:00.000000000 Z
+date: 2016-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler