resource-struct 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07376a21fe1fd7e877cdd8755e5a269e8336d1ac9906cf046e2aa39947938117
-  data.tar.gz: 070d252877489353d147fc93ee84d3ab0e74608f24d82d6d08163e9acd65c97f
+  metadata.gz: f9513a73bc3c6331f8174bd02c30c72fcbc655fb2e00c8d88cb1cd80fa3c60ae
+  data.tar.gz: 3d1355e235d443b74098434f453a482d090790a25f57c65ce8a57f931813863a
 SHA512:
-  metadata.gz: b72654d78fbdb3df534c058a4e1df047f0ed8c40a063dbfc77ff869b8123d370f34277878354fe5d537802637fec52490d89374428e1bd5a937455bf59b4f0a1
-  data.tar.gz: c3673ddd8220bc52a130ccfd5a512dd1f03dd3c7bfcadde3d28b075ba6b2619f2d8bfa346c853fbe20103ae35630cc6f8a6224bd6d67335a0a31ec63a16abfea
+  metadata.gz: 88f21e99bce0cf3620cf0644f240176af22bd64f99a51781c293cd407467062cbe784d50274115e4214443801f34d10c79858a27910e9bf54556356e5e95d753
+  data.tar.gz: bfa0b4576f987a5a5a7d39d62abcc7ac4f00fd6f2d27c8bb20d124fbf092914bab0212c8c4987451a86d47e3c06d31ab3452c777f0f25cb29a128e6ca048e3cf

data/.rubocop.yml

@@ -15,6 +15,15 @@ Layout/LineLength:
 Metrics/MethodLength:
   Max: 20
 
+Metrics/AbcSize:
+  Max: 25
+
+Metrics/CyclomaticComplexity:
+  Max: 15
+
+Metrics/PerceivedComplexity:
+  Max: 15
+
 Naming/FileName:
   Enabled: true
   Exclude:

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [0.2.0] - 2022-01-01
+### Changed
+- Indifferent access support for input hash (support for symbol-based hashes in initializer)
+
 ## [0.1.0] - 2021-12-14
 
 - Initial release

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    resource-struct (0.1.0)
+    resource-struct (0.2.0)
 
 GEM
   remote: https://rubygems.org/
@@ -48,6 +48,7 @@ GEM
 
 PLATFORMS
   x86_64-darwin-18
+  x86_64-darwin-19
 
 DEPENDENCIES
   rake (~> 13.0)
@@ -58,4 +59,4 @@ DEPENDENCIES
   rubocop-rspec
 
 BUNDLED WITH
-   2.2.33
+   2.3.4

data/lib/resource_struct/firm_struct.rb

@@ -29,7 +29,7 @@ module ResourceStruct
 
     def method_missing(name, *args, &blk)
       return self[name] if ___key?(name)
-      return !!self[___convert_key(name[...-1])] if name.end_with?("?")
+      return !!self[name[...-1]] if name.end_with?("?")
 
       super
     end
@@ -55,17 +55,20 @@ module ResourceStruct
     end
 
     def ==(other)
-      @hash == other.instance_variable_get(:@hash)
+      other.is_a?(Hash) && ___all_keys_equal(other) ||
+        (other.is_a?(LooseStruct) || other.is_a?(FirmStruct)) && ___all_keys_equal(other.instance_variable_get(:@hash))
     end
 
-    def [](key, *sub_keys)
+    def dig(key, *sub_keys)
       ckey = ___convert_key(key)
 
       result =
         if @ro_struct.key?(ckey)
           @ro_struct[ckey]
+        elsif key.is_a?(String)
+          @ro_struct[ckey] = ___convert_value(@hash[key] || @hash[key.to_sym])
         else
-          @ro_struct[ckey] = ___convert_value(@hash[ckey])
+          @ro_struct[ckey] = ___convert_value(@hash[key] || @hash[ckey])
         end
 
       return result if sub_keys.empty?
@@ -76,7 +79,7 @@ module ResourceStruct
 
       result.dig(*sub_keys)
     end
-    alias dig []
+    alias [] dig
 
     private
 
@@ -92,11 +95,24 @@ module ResourceStruct
     end
 
     def ___key?(key)
-      @hash.key?(___convert_key(key))
+      @hash.key?(key) || @hash.key?(___convert_key(key))
     end
 
     def ___convert_key(key)
       key.is_a?(::Symbol) ? key.to_s : key
     end
+
+    def ___all_keys_equal(other)
+      return false unless @hash.count == other.count
+
+      @hash.reduce(true) do |acc, (k, v)|
+        if other.key?(k)
+          acc && other[k] == v
+        else
+          ck = ___convert_key(k)
+          acc && other.key?(ck) && other[ck] == v
+        end
+      end
+    end
   end
 end

data/lib/resource_struct/loose_struct.rb

@@ -26,7 +26,7 @@ module ResourceStruct
 
     def method_missing(name, *_args)
       return self[name] if ___key?(name)
-      return !!self[___convert_key(name[...-1])] if name.end_with?("?")
+      return !!self[name[...-1]] if name.end_with?("?")
 
       nil
     end
@@ -52,17 +52,20 @@ module ResourceStruct
     end
 
     def ==(other)
-      @hash == other.instance_variable_get(:@hash)
+      other.is_a?(Hash) && ___all_keys_equal(other) ||
+        (other.is_a?(LooseStruct) || other.is_a?(FirmStruct)) && ___all_keys_equal(other.instance_variable_get(:@hash))
     end
 
-    def [](key, *sub_keys)
+    def dig(key, *sub_keys)
       ckey = ___convert_key(key)
 
       result =
         if @ro_struct.key?(ckey)
           @ro_struct[ckey]
+        elsif key.is_a?(String)
+          @ro_struct[ckey] = ___convert_value(@hash[key] || @hash[key.to_sym])
         else
-          @ro_struct[ckey] = ___convert_value(@hash[ckey])
+          @ro_struct[ckey] = ___convert_value(@hash[key] || @hash[ckey])
         end
 
       return result if sub_keys.empty?
@@ -73,7 +76,7 @@ module ResourceStruct
 
       result.dig(*sub_keys)
     end
-    alias dig []
+    alias [] dig
 
     private
 
@@ -89,11 +92,24 @@ module ResourceStruct
     end
 
     def ___key?(key)
-      @hash.key?(___convert_key(key))
+      @hash.key?(key) || @hash.key?(___convert_key(key))
     end
 
     def ___convert_key(key)
       key.is_a?(::Symbol) ? key.to_s : key
     end
+
+    def ___all_keys_equal(other)
+      return false unless @hash.count == other.count
+
+      @hash.reduce(true) do |acc, (k, v)|
+        if other.key?(k)
+          acc && other[k] == v
+        else
+          ck = ___convert_key(k)
+          acc && other.key?(ck) && other[ck] == v
+        end
+      end
+    end
   end
 end

data/lib/resource_struct/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ResourceStruct
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resource-struct
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Alex Riedler
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-16 00:00:00.000000000 Z
+date: 2022-01-01 00:00:00.000000000 Z
 dependencies: []
 description: Openstruct like access without all the headaches of Hash method overrides
   etc...
@@ -55,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Ruby structs for resource responses