casted_hash 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 901edabae24fed434f5c0a5c6e83845831ea0163
-  data.tar.gz: 9cc31472995f046c5bbecc736a952a2fdf7b26a4
+  metadata.gz: 5fbb548f016a133c4d10ff789086c7402e956da1
+  data.tar.gz: a77641ba09b64407763ce8e547d252dab608b763
 SHA512:
-  metadata.gz: b6c011883db3dc8da0212b322be8657d6d4b7c89f3833e955d9a85a16fe3d1cc520f70f7e0b4f8703b53e043409132b600df81d0a2a479cc2cd2034d959393b4
-  data.tar.gz: 63d783be719a14ad5317be58abaa0250850be1d7ddb8a4de5e0e7c8227bde4b7c030651727d6f657ee9a6090e9ea59f6db3a22ae2a7a2843e3095dae130b1bc3
+  metadata.gz: 6a36b6e3d4f058eaa52f8c422aacb5f5a82c8a4a8b95dc3df358536790f2de4accf98a74eec20eb2bdcaac65fb9bd241eb3ff3e6fda037122548fbeb24c059b2
+  data.tar.gz: be2f8f407d9cbf209ba84761ca849224c3ef8f124a4ae821ff72dc33b9b29d464a59cf31b87875c15fb5d6d4ba674480f676b11909316ab0d77878c073dde6db

data/lib/casted_hash/value.rb

@@ -2,10 +2,11 @@ class CastedHash
   class Value
     include Equalizer.new(:value)
     attr_reader :value
+    attr_accessor :casted_hash
 
-    def initialize(value, cast_proc)
+    def initialize(value, casted_hash)
       @value = value
-      @cast_proc = cast_proc
+      @casted_hash = casted_hash
     end
 
     def casted_value
@@ -20,7 +21,7 @@ class CastedHash
     def cast!
       return if casted?
 
-      @value = @cast_proc.call(value)
+      @value = casted_hash.cast_proc.call(value)
       @casted = true
     end
   end

data/lib/casted_hash/version.rb

@@ -1,3 +1,3 @@
 class CastedHash
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/lib/casted_hash.rb

@@ -9,11 +9,21 @@ class CastedHash
   attr_reader :cast_proc
 
   def_delegators :@hash, *[:keys, :inject, :key?, :include?]
-  def_delegators :casted_hash, *[:collect]
+  def_delegators :casted_hash, *[:collect, :reject]
+
+  def initialize(constructor = {}, cast_proc = nil)
+    raise ArgumentError, "`cast_proc` required" unless cast_proc
 
-  def initialize(constructor = {}, cast_proc = lambda { |x| x })
     @cast_proc = cast_proc
-    @hash = HashWithIndifferentAccess.new(pack_hash(constructor))
+
+    if constructor.is_a?(Hash)
+      @hash = HashWithIndifferentAccess.new
+      update(constructor)
+    elsif constructor.is_a?(CastedHash)
+      @hash = constructor.pack_hash(self)
+    else
+      raise ArgumentError
+    end
   end
 
   def each
@@ -55,14 +65,24 @@ class CastedHash
     @hash
   end
 
-  def merge(other)
-    other = other.to_hash
-    self.class.new(@hash.merge(other), cast_proc)
+  def pack_hash(casted_hash)
+    @hash.inject(HashWithIndifferentAccess.new) do |hash, (key, value)|
+      hash.merge key => pack(value, casted_hash)
+    end
   end
 
-  def merge!(other)
-    other = pack_hash(other)
-    @hash.merge!(other)
+  def update(other_hash)
+    if other_hash.is_a? CastedHash
+      @hash.update other_hash.pack_hash(self)
+    else
+      other_hash.each_pair { |key, value| store(key, value) }
+    end
+
+    self
+  end
+
+  def merge(other)
+    self.dup.update other
   end
 
   def casted?(key)
@@ -82,6 +102,10 @@ class CastedHash
     end
   end
 
+  def dup
+    self.class.new(self, @cast_proc)
+  end
+
 private
 
   def raw
@@ -94,17 +118,13 @@ private
     end
   end
 
-  def pack(value)
+  def pack(value, casted_hash = self)
     if value.is_a?(Value)
+      value.casted_hash =  casted_hash
       value
     else
-      Value.new(value, cast_proc)
+      Value.new(value, casted_hash)
     end
   end
 
-  def pack_hash(hash)
-    hash.inject({}) do |hash, (key, value)|
-      hash.merge key => pack(value)
-    end if hash
-  end
 end

data/test/test_casted_hash.rb

@@ -44,7 +44,7 @@ class TestCastedHash < Minitest::Test
     end
 
     it "should inspect casted values" do
-      hash = CastedHash.new(nil, lambda { |x| "foobar" })
+      hash = CastedHash.new({}, lambda { |x| "foobar" })
 
       assert_equal("#<CastedHash hash={}>", hash.inspect)
 
@@ -87,15 +87,33 @@ class TestCastedHash < Minitest::Test
       assert_equal 12, hash[:b]
     end
 
-    it "should merge! values" do
-      hash = CastedHash.new({:a => 1, :b => 2}, lambda {|x| x + 10 })
-      assert_equal 11, hash[:a]
-      assert_equal 12, hash[:b]
-      
-      hash.merge!({:a => 3})
+    it "should take over scope when merging two casted hashes" do
+      hash1 = CastedHash.new({:a => 1, :b => 2}, lambda {|x| x + 10 })
+      hash2 = CastedHash.new({:c => 3, :d => 4}, lambda {|x| x + 100 })
 
-      assert_equal 13, hash[:a]
-      assert_equal 12, hash[:b]
+      assert_equal 11, hash1[:a]
+      assert_equal 12, hash1[:b]
+      assert hash1.casted?(:a)
+      assert hash1.casted?(:b)
+
+      cast_proc1_object_id = hash1.cast_proc.object_id
+      assert_equal [hash1.object_id], hash1.send(:raw).values.map{|v|v.casted_hash.object_id}.uniq
+
+      hash3 = hash1.merge hash2
+
+      assert_equal [hash3.object_id], hash3.send(:raw).values.map{|v|v.casted_hash.object_id}.uniq
+      assert_equal hash3.cast_proc.object_id, cast_proc1_object_id
+
+      assert_equal ["a", "b", "c", "d"], hash3.keys
+      assert hash3.casted?(:a)
+      assert hash3.casted?(:b)
+      assert !hash3.casted?(:c)
+      assert !hash3.casted?(:d)
+
+      assert_equal 11, hash3[:a]
+      assert_equal 12, hash3[:b]
+      assert_equal 13, hash3[:c]
+      assert_equal 14, hash3[:d]
     end
 
     it "should not cast all values when merging hashes" do
@@ -106,12 +124,6 @@ class TestCastedHash < Minitest::Test
       assert !hash.casted?(:b)
       assert !hash.casted?(:c)
 
-      hash.merge! :c => 3
-
-      assert !hash.casted?(:a)
-      assert !hash.casted?(:b)
-      assert !hash.casted?(:c)
-
       other_hash = CastedHash.new({:c => 1, :d => 2}, lambda {|x| x + 10 })
       hash = hash.merge other_hash
 
@@ -120,15 +132,6 @@ class TestCastedHash < Minitest::Test
       assert !hash.casted?(:c)
       assert !other_hash.casted?(:c)
       assert !other_hash.casted?(:d)
-
-      other_hash = CastedHash.new({:c => 1, :d => 2}, lambda {|x| x + 10 })
-      hash.merge! other_hash
-
-      assert !hash.casted?(:a)
-      assert !hash.casted?(:b)
-      assert !hash.casted?(:c)
-      assert !other_hash.casted?(:c)
-      assert !other_hash.casted?(:d)
     end
 
     it "should define a hash method" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: casted_hash
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Stephan Kaag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-31 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equalizer