resource-struct 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c1790e36a2600fddc519f1f9fdd47a2bdf9f07003f7205f0584be5455867446
-  data.tar.gz: f916a4b4a6bb2c27d727d9914732c5a33ce35617246814bfbe8e9743150c89c1
+  metadata.gz: 81f9dfcc67f4c1670776860dd53c7d0885eb1b1d53ca7b9bae7202c782cbad85
+  data.tar.gz: ae36515a1e79be8653e2b4497dee9ab5f8d522e740cfcafe93681d946a5e528e
 SHA512:
-  metadata.gz: c2db5d94ea2c816e8bb7a2279709380e43f6a7f0a1f1e7ceb3c027e1f07d5b5ffc308014eeef7ef44bd815ca8f9d9a43c46540af890a60c8f515e2e477536841
-  data.tar.gz: eb0426c1c8667be29487125496681cba12c2b25fabc68475675500ea997aec898639cd826ce2370f888f9d0ffca9427ad6e348de3713eeb9d67bed3e1b350605
+  metadata.gz: 835d23cd09aa4a26cce6cf30378e749f5eee0a9439501fd1120ee3ac6f77f6adaed05ea688632e23dce09dd7bee8616859176fbc135b2d027c388aa3eec10e1b
+  data.tar.gz: 102bada15cf4151340c2fd95c5927335e19ec9bd637a2e74ba3b1e2193ead54a3a3a5af8d451caf364f0465caf5663079eeeaf72e3b7c7acc7b1ef7c847e3f95

data/.rubocop.yml

@@ -16,7 +16,7 @@ Metrics/MethodLength:
   Max: 20
 
 Metrics/AbcSize:
-  Max: 25
+  Max: 30
 
 Metrics/CyclomaticComplexity:
   Max: 15

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 ## [Unreleased]
 
+## [0.4.0] - 2022-01-09
+### Feature
+- Better support for `ArgumentError` on `FlexStruct`
+
+## [0.3.3] - 2022-01-05
+### Fix
+- Support false values correctly, instead of returning nil
+- Support `respond_to?` properly on `FlexStruct`
+
+## [0.3.2] - 2022-01-05
+### Fix
+- Support for proper marshalling of object
+
+## [0.3.1] - 2022-01-05
+### Fix
+- Support nil meaning empty hash as first argument to `FlexStruct` and `StrictStruct`
+
 ## [0.3.0] - 2022-01-04
 ### Feature
 - Support for `as_json` and `to_json`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    resource-struct (0.3.0)
+    resource-struct (0.4.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/resource_struct/extensions/indifferent_lookup.rb

@@ -16,7 +16,7 @@ module ResourceStruct
         @hash = hash || {}
         @ro_struct = {}
 
-        raise ::ArgumentError, "first argument must be a Hash, found #{hash.class.name}" unless hash.is_a?(Hash)
+        raise ::ArgumentError, "first argument must be a Hash, found #{@hash.class.name}" unless @hash.is_a?(Hash)
       end
 
       def inspect
@@ -35,10 +35,12 @@ module ResourceStruct
         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[key] || @hash[ckey])
+          elsif @hash.key?(key)
+            @ro_struct[ckey] = ___convert_value(@hash[key])
+          elsif key.is_a?(String) && @hash.key?(key.to_sym)
+            @ro_struct[ckey] = ___convert_value(@hash[key.to_sym])
+          elsif key.is_a?(Symbol) && @hash.key?(key.to_s)
+            @ro_struct[ckey] = ___convert_value(@hash[key.to_s])
           end
 
         return result if sub_keys.empty?
@@ -51,6 +53,17 @@ module ResourceStruct
       end
       alias [] dig
 
+      def marshal_dump
+        {
+          data: @hash
+        }
+      end
+
+      def marshal_load(obj)
+        @ro_struct = {}
+        @hash = obj[:data]
+      end
+
       private
 
       def ___convert_value(value)
@@ -65,7 +78,9 @@ module ResourceStruct
       end
 
       def ___key?(key)
-        @hash.key?(key) || @hash.key?(___convert_key(key))
+        @hash.key?(key) ||
+          @hash.key?(___convert_key(key)) ||
+          key.is_a?(String) && @hash.key?(key.to_sym)
       end
 
       def ___convert_key(key)

data/lib/resource_struct/flex_struct.rb

@@ -27,24 +27,31 @@ module ResourceStruct
 
       if @hash.key?(key)
         @hash[key] = value
-      elsif key.is_a?(String) || key.is_a?(Symbol) && @hash.key?(key.to_sym)
+      elsif key.is_a?(String) && @hash.key?(key.to_sym)
         @hash[key.to_sym] = value
+      elsif key.is_a?(Symbol) && @hash.key?(key.to_s)
+        @hash[key.to_s] = value
       else
         @hash[key] = value
       end
     end
 
     def method_missing(name, *args)
-      args_length = args.length
-      return self[name] if ___key?(name) && args_length.zero?
-      return !!self[name[...-1]] if name.end_with?("?") && args_length.zero?
-      return self[name[...-1]] = args.first if name.end_with?("=") && args_length == 1
+      if name.end_with?("=")
+        return self[name[...-1]] = args.first if args.length == 1
 
-      nil
+        raise ArgumentError, "expected 1 argument received #{args.length} arguments"
+      elsif name.end_with?("?")
+        return !!self[name[...-1]] if args.empty?
+      elsif args.empty?
+        return self[name]
+      end
+
+      raise ArgumentError, "expected 0 arguments received #{args.length} arguments"
     end
 
-    def respond_to_missing?(_name, _include_private = false)
-      true
+    def respond_to_missing?(name, include_private = false)
+      ___key?(name) || ___key?(name.to_s.chomp("?")) || super
     end
   end
   LooseStruct = FlexStruct

data/lib/resource_struct/strict_struct.rb

@@ -31,7 +31,7 @@ module ResourceStruct
     end
 
     def respond_to_missing?(name, include_private = false)
-      ___key?(name) || name.end_with?("?") || super
+      ___key?(name) || ___key?(name.to_s.chomp("?")) || super
     end
   end
   FirmStruct = StrictStruct

data/lib/resource_struct/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resource-struct
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Alex Riedler
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-05 00:00:00.000000000 Z
+date: 2022-01-10 00:00:00.000000000 Z
 dependencies: []
 description: Openstruct like access without all the headaches of Hash method overrides
   etc...