re_sorcery 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37fc462892cc20c02ed1a1dd5d3aaeaf8712bfd2708cccdfbe026944015adc66
-  data.tar.gz: ac6f04c6ad4992e8d0babcb9de137702eb62ec489fa336c708e9b4a5700e2c99
+  metadata.gz: f72b419777c7c5f2f57db936293ccb8fd1fbc7fd4b2ca5de14c21ac4be9ee7f7
+  data.tar.gz: 88d0385f9d01c64b0ad1e95fcb6350bb78ea301d0b6f291c0cb967b99d17a46e
 SHA512:
-  metadata.gz: 833577165a1a176f7b3237d59f8bf55339dfc3709bab21a20ce3d463385ab6a98b1184dbb7bb3eb872d8f7f299072050caf0f2fe1f98bedb4744d522c175b343
-  data.tar.gz: e65b27a43d44d32d0ca27b13e1f058f3972448353874f50aecf259c9378644e2fbd781aa21a192c554d8ebf4b110645b03a6058407dde36db97cea48a8561e12
+  metadata.gz: 4fff11e2b74ec4c68f5c6de80815495583097d5fda2994a016382b93deaf4f0abe7492f292cf8a1831b514c0a68cd296680196051ca94be3b9c81a98f205489b
+  data.tar.gz: b4446f2fec6609d8a5042ced152cee096bbd44d3d041de781275017ee7153f6633e5eeef917f8ea8daac131f9750853d756013c4fae48bb98410a95e56f2164e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    re_sorcery (0.2.0)
+    re_sorcery (0.3.0)
       addressable (~> 2.8, >= 2.8.1)
 
 GEM

data/lib/re_sorcery/fielded.rb

@@ -26,6 +26,10 @@ module ReSorcery
 
         (@fields ||= {})[name] = { type: is(type), pro: pro }
       end
+
+      def fields
+        (superclass&.include?(Fielded) ? superclass.send(:fields) : {}).merge(@fields || {})
+      end
     end
 
     def self.included(base)
@@ -39,7 +43,7 @@ module ReSorcery
     #
     # @return [Result<String, Hash>]
     def fields
-      self.class.instance_exec { @fields ||= [] }.inject(ok({})) do |result_hash, (name, field_hash)|
+      self.class.send(:fields).inject(ok({})) do |result_hash, (name, field_hash)|
         result_hash.assign(name) do
           field_hash[:type].test(instance_exec(&field_hash[:pro]))
             .and_then { |tested| ExpandInternalFields.expand(tested) }

data/lib/re_sorcery/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: re_sorcery
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Spencer Christiansen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-10 00:00:00.000000000 Z
+date: 2023-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable