dot_hash 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 204c2956dd13177e9bda794e4b1f335fa2e86f15
-  data.tar.gz: 8d194f674b666d999e7435c2c4ba6dc8d32dbe85
+  metadata.gz: 3a348ba75c80c353302b1857142a1c41c4e7cee8
+  data.tar.gz: 9e88b56233a96201a90f0bb6052659fc9188949d
 SHA512:
-  metadata.gz: 11a3a166c97133802ce7f236bd5755460fec4fe17d20c2c4fe297baf63498aa270875a0a67abdca3d60fc2b589918f788bd0e2c404d9f4824d769d20d5b22b9d
-  data.tar.gz: 74c27217e04d9037b129ee265b71a3022d94db8d693ebae4943a0714c15844cc8bc2cbbc359178ef548c47c49399e1be2df7ff9187155666a7611080cdaf5a38
+  metadata.gz: 52ac95b9d2bd388bcb773c032fa2553f0f73b8a127585983d9d22758a5b12ca88b8a9e02af5e212de3759642a45570fee6b0197908b61f8a4e98e9b3173b0d3e
+  data.tar.gz: 7a83b68221204451034086766eb55910a49f9c3b4ce3a83bcb3e605e9b93753261e77f9e264e606732040a2ec122ba02274d0b6a85c281d443c7a9a4ab2f483c

data/lib/dot_hash/properties.rb

@@ -20,7 +20,8 @@ module DotHash
     end
 
     def ==(other)
-      super(other) or other.to_hash == hash
+      super(other) ||
+        (other.respond_to?(:to_hash) && other.to_hash == hash)
     end
 
     def to_s
@@ -39,8 +40,14 @@ module DotHash
       key = hash.has_key?(key.to_s) ? key.to_s : key.to_sym
       value = hash.fetch(key, *args, &block)
 
-      return value unless value.is_a?(Hash)
-      hash[key] = self.class.new value
+      if value.nil? or hash.respond_to?(key)
+        hashify_item value
+      elsif cached.has_key?(key)
+        value
+      else
+        cached[key] = true
+        hash[key] = hashify_item(value)
+      end
     end
 
     def has_key?(key)
@@ -51,22 +58,33 @@ module DotHash
 
     private
 
+    def cached
+      @cached ||= self.class.new({})
+    end
+
     def execute(key, *args, &block)
       fetch(key) do
-        hash.public_send(key, *args) do |*values|
-          block.call(*hashify_args(values))
+        if block
+          hash.public_send(key, *args) do |*values|
+            block.call(*hashify_list(values))
+          end
+        else
+          hash.public_send(key, *args)
         end
       end
     end
 
-    def hashify_args(args)
+    def hashify_list(args)
       args.each_with_index do |a, i|
-        args[i] =
-          case a
-          when Hash then self.class.new(a)
-          when Array then hashify_args(a)
-          else a
-          end
+        args[i] = hashify_item(a)
+      end
+    end
+
+    def hashify_item(item)
+      case item
+      when Hash then self.class.new(item)
+      when Array then hashify_list(item)
+      else item
       end
     end
   end

data/lib/dot_hash/version.rb

@@ -1,3 +1,3 @@
 module DotHash
-  VERSION = "1.1.5"
+  VERSION = "1.1.6"
 end

data/test/dot_hash/properties_test.rb

@@ -54,13 +54,35 @@ module DotHash
         end
       end
 
-      describe 'method delegation' do
+      describe 'with method delegation' do
         before do
           @properties = Properties.new({
             ninja: {name: 'Naruto'}
           })
         end
 
+        it 'does not cache method calls' do
+          assert_equal(
+            properties.map { |k, v| v },
+            [{name: 'Naruto'}]
+          )
+
+          assert_equal(
+            properties.map { |k, v| {k => v.name} },
+            [{ninja: 'Naruto'}]
+          )
+        end
+
+        it '#merge! without crashing' do
+          properties.merge!({hero: 'One Punch'})
+          properties.merge!({hero: 'One Punch 2'})
+
+          assert_equal(properties, {
+            hero: 'One Punch 2',
+            ninja: {name: 'Naruto'}
+          })
+        end
+
         it '#map sets inner-hashes to Properties' do
           result = properties.map { |k, v| "#{k}: #{v.name}" }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dot_hash
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Marcelo Eden