datastruct 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d87f5724b107fd84295b0128e69c50902894204c
-  data.tar.gz: bec01b7ffc717fde3401eefe4890f7278e484d78
+  metadata.gz: 8586b78a00a992565165d8302c2a05eab5e0efce
+  data.tar.gz: ba8064a0cc5803ca41de9ad332437e1dd4fad641
 SHA512:
-  metadata.gz: 4e449b0ff8418176f11d5699e13de2a9c6b34facf2abb012b4ec44b697657d763939703588e91af9431a4c44d2759c17d56e650943543cdf6257e162b3575403
-  data.tar.gz: f68a909dba3b9f79a05e70016c1793534f7798a612b38ce6b25c69f24b23d8c41fe823645bf5849cc36a5ea48b216a8c613ffa53c980870dabef7dff82ee2b29
+  metadata.gz: 3e6fff90d7f9a74ab5155367cb78ecb72ff5c4789e014cb9b4d558b846edc360fa269d071f998b0ebab09ef5222ac7e097f3e786f1149c6f8761719d2fa1261e
+  data.tar.gz: 69af720cb5c40f90e03441bfc7a1226cc46f079d4ee0783d0ab575e1575d1918ae4e881d95be079c7482ed2e1994cbad2ff0bf0bee90164fe2f89237fc8b6de2

data/lib/datastruct.rb

@@ -172,24 +172,40 @@ class DataStruct
   ##
   # Returns the properties of the object as a hash
   #
+  # @param [Boolean] string_keys Return keys as strings instead of symbols
+  # @param [Boolean] deep Go deep and serialize all DataStruct instances found
+  #
   # @return [Hash]
   #
   def to_hash(string_keys: false, deep: false)
     return @data.dup if not string_keys and not deep
 
-    out = {}
+    hashify = lambda { |obj|
+      if obj.is_a? DataStruct and deep
+        return obj.to_hash(string_keys: string_keys, deep: deep)
 
-    @data.each_pair { |key, value|
-      key = key.to_s if string_keys
+      elsif obj.is_a? Hash
+        out = {}
 
-      if deep and value.is_a? DataStruct
-        value = value.to_hash(string_keys: string_keys, deep: true)
-      end
+        obj.each_pair { |key, value|
+          # Only stringify the keys of the *top level* of the structure. We have
+          # no business messing with the keys of nested hashes.
+          key = key.to_s if string_keys and obj.equal? @data
+
+          out[key] = hashify[value]
+        }
+
+        return out
 
-      out[key] = value
+      elsif obj.is_a? Array
+        return obj.map { |x| hashify[x] }
+
+      else
+        return obj
+      end
     }
 
-    return out
+    return hashify[@data]
   end
 
   alias_method :to_h, :to_hash

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datastruct
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Tomas Sandven
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-16 00:00:00.000000000 Z
+date: 2016-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake