dot_hash 1.1.3 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d5f5b5bc01c1658cb038945ccda5d6338021934
-  data.tar.gz: a138603a469cafba4ca1d925546a993d30d91a50
+  metadata.gz: 204c2956dd13177e9bda794e4b1f335fa2e86f15
+  data.tar.gz: 8d194f674b666d999e7435c2c4ba6dc8d32dbe85
 SHA512:
-  metadata.gz: d08a88ae42624709175af9b7566ca88f786a680e88e255c28c587049f8f538c655dda4d1378fb17d93d21849bd5b989a036cda2f54f7b0d6ca061640a27df76e
-  data.tar.gz: 718c33b9a6031bceac6f2cdbd382174236c4da920b500027699fee040f3c643f4834231fd190f6b8d05685c6cfb280c3e98ff0570f5227f0a59583d2a6cb387e
+  metadata.gz: 11a3a166c97133802ce7f236bd5755460fec4fe17d20c2c4fe297baf63498aa270875a0a67abdca3d60fc2b589918f788bd0e2c404d9f4824d769d20d5b22b9d
+  data.tar.gz: 74c27217e04d9037b129ee265b71a3022d94db8d693ebae4943a0714c15844cc8bc2cbbc359178ef548c47c49399e1be2df7ff9187155666a7611080cdaf5a38

data/lib/dot_hash/properties.rb

@@ -20,7 +20,7 @@ module DotHash
     end
 
     def ==(other)
-      super || other.to_hash == hash
+      super(other) or other.to_hash == hash
     end
 
     def to_s
@@ -32,10 +32,16 @@ module DotHash
     end
 
     def [](key)
-      get_value(key)
+      fetch(key, nil)
     end
 
-    private
+    def fetch(key, *args, &block)
+      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
+    end
 
     def has_key?(key)
       hash.has_key?(key.to_s) or
@@ -43,8 +49,10 @@ module DotHash
         hash.respond_to?(key)
     end
 
+    private
+
     def execute(key, *args, &block)
-      get_value(key) do
+      fetch(key) do
         hash.public_send(key, *args) do |*values|
           block.call(*hashify_args(values))
         end
@@ -52,23 +60,14 @@ module DotHash
     end
 
     def hashify_args(args)
-      args.map do |a|
-        if a.is_a?(Hash)
-          self.class.new(a)
-        elsif a.is_a?(Array)
-          hashify_args(a)
-        else
-          a
-        end
+      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
       end
     end
-
-    def get_value(key, &fallback)
-      key = hash.has_key?(key.to_s) ? key.to_s : key.to_sym
-      value = hash.fetch(key) { fallback ? fallback.call : nil }
-
-      return value unless value.is_a?(Hash)
-      hash[key] = self.class.new value
-    end
   end
 end

data/lib/dot_hash/version.rb

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

data/test/dot_hash/properties_test.rb

@@ -74,6 +74,14 @@ module DotHash
 
           assert_equal result, Properties.new({ninja: 'Naruto'})
         end
+
+        it '#each_with_object goes nested on on array' do
+          result = properties.each_with_object([]) do |(k, v), acc|
+            acc.push v.name
+          end
+
+          assert_equal result, ['Naruto']
+        end
       end
     end
 

metadata

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