datastruct 0.0.7 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8586b78a00a992565165d8302c2a05eab5e0efce
-  data.tar.gz: ba8064a0cc5803ca41de9ad332437e1dd4fad641
+SHA256:
+  metadata.gz: b51c076f8c802f2a12cd89fcc2af06b92f3053162ab921740add779a7e4309f8
+  data.tar.gz: 34a738845f300ad3adfdcade00be8d4aaca1a40570bdaf0333ee8e6837eed321
 SHA512:
-  metadata.gz: 3e6fff90d7f9a74ab5155367cb78ecb72ff5c4789e014cb9b4d558b846edc360fa269d071f998b0ebab09ef5222ac7e097f3e786f1149c6f8761719d2fa1261e
-  data.tar.gz: 69af720cb5c40f90e03441bfc7a1226cc46f079d4ee0783d0ab575e1575d1918ae4e881d95be079c7482ed2e1994cbad2ff0bf0bee90164fe2f89237fc8b6de2
+  metadata.gz: f0fd224d50f9ac1be0aa52e3a884a3941855ed5a50ced72f48eea91370a8b98f4e48d8171380378c0d435b164ed76d18e18229b21704bf91f585bdd715a439e4
+  data.tar.gz: 2da68207c31897bb736b4729c720ae6f5ff25a4a123a6f40d17c6bfa171eeaa33dd28534d08e80e447670affb0e8b8378532f56187f5bb8d4ad512bd1e0efb97

data/lib/datastruct.rb

@@ -178,7 +178,9 @@ class DataStruct
   # @return [Hash]
   #
   def to_hash(string_keys: false, deep: false)
-    return @data.dup if not string_keys and not deep
+    # Builds a hash using property getters. This allows getters to override the
+    # output of this function.
+    data = Hash[self.class::PROPERTIES.map { |key| [key, self.get(key)] }]
 
     hashify = lambda { |obj|
       if obj.is_a? DataStruct and deep
@@ -190,7 +192,7 @@ class DataStruct
         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
+          key = key.to_s if string_keys and obj.equal? data
 
           out[key] = hashify[value]
         }
@@ -205,7 +207,8 @@ class DataStruct
       end
     }
 
-    return hashify[@data]
+    return data if not string_keys and not deep
+    return hashify[data]
   end
 
   alias_method :to_h, :to_hash
@@ -218,7 +221,7 @@ class DataStruct
   # @return [String]
   #
   def to_json(*args)
-    @data.to_json(*args)
+    self.to_hash.to_json(*args)
   end
 
   ##
@@ -229,7 +232,7 @@ class DataStruct
   # @return [String]
   #
   def to_yaml(*args)
-    @data.to_yaml(*args)
+    self.to_hash.to_yaml(*args)
   end
 
   ##

metadata

@@ -1,113 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: datastruct
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors:
 - Tomas Sandven
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-18 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
+date: 2018-02-06 00:00:00.000000000 Z
+dependencies: []
 description: |2
       Datastruct is made to be a more feature rich alternative to Ruby's Struct
       class. It defines several methods common for data structures, like hash
@@ -138,9 +40,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: A great base class for data structures
 test_files: []
-has_rdoc: