dot_hash 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a348ba75c80c353302b1857142a1c41c4e7cee8
-  data.tar.gz: 9e88b56233a96201a90f0bb6052659fc9188949d
+  metadata.gz: a1b95611ef880619871a9f512c8ade7347246066
+  data.tar.gz: 649c5672f7b315cd5b340ad72eb9a0a6681970ca
 SHA512:
-  metadata.gz: 52ac95b9d2bd388bcb773c032fa2553f0f73b8a127585983d9d22758a5b12ca88b8a9e02af5e212de3759642a45570fee6b0197908b61f8a4e98e9b3173b0d3e
-  data.tar.gz: 7a83b68221204451034086766eb55910a49f9c3b4ce3a83bcb3e605e9b93753261e77f9e264e606732040a2ec122ba02274d0b6a85c281d443c7a9a4ab2f483c
+  metadata.gz: 17e4590a50c2366dd2bc2a24498ab74da204da627d24069012c00250a77c95d1a56939249f2a42f5013ec6d538af9d3838410a0326d112b14c967d6670014eb5
+  data.tar.gz: d402862159c8f3d265d181a0d8dbfcdd63773239e4b853576120354a14683ae25d7ca6b3b83aade014ec10e461dd713b0ed7abe8f5e28db015b4800e044090de

data/lib/dot_hash/properties.rb

@@ -37,17 +37,15 @@ module DotHash
     end
 
     def fetch(key, *args, &block)
-      key = hash.has_key?(key.to_s) ? key.to_s : key.to_sym
-      value = hash.fetch(key, *args, &block)
+      key_sym = key.to_sym
 
-      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)
+      value = cached.fetch(key_sym) do
+        key = hash.has_key?(key_sym) ? key_sym : key.to_s
+        hashify_item hash.fetch(key, *args, &block)
       end
+
+      return value if skip_cache?(key_sym, value)
+      cached[key_sym] = value
     end
 
     def has_key?(key)
@@ -59,7 +57,11 @@ module DotHash
     private
 
     def cached
-      @cached ||= self.class.new({})
+      @cached ||= {}
+    end
+
+    def skip_cache?(key, value)
+      value.nil? or hash.respond_to?(key) or cached.has_key?(key)
     end
 
     def execute(key, *args, &block)

data/lib/dot_hash/settings.rb

@@ -5,7 +5,8 @@ module DotHash
     end
 
     def load(*args)
-      hash.replace Loader.new(hash, *args).hash
+      @cached = {}
+      @hash = Loader.new(hash, *args).hash
     end
 
     class << self

data/lib/dot_hash/version.rb

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

metadata

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