opt_struct 1.4.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 193867b718e2e264678a0ad084fc6ee5d76854203e74d13e6fc64404dfb042e8
-  data.tar.gz: b226650ae4b38741e70de40d8e0ffde6666f6e80f7b6735c316dfd303f74a435
+  metadata.gz: 3513e52f9bdf75f5c2f2b59e2718b3de30cbc5e9720bd6d7b8e22eb3d23975a8
+  data.tar.gz: '0851dbb6109b9eb2b191ae709ae08d47562e457f8dd1375084194aef3d8d00bb'
 SHA512:
-  metadata.gz: 16565e6596e06089f3cc463917af8ee13d573ad8ded530a39f121e3d4d2b1eb05b5b5e3bf308fe770750e7067adf06d08d72b0ef438ff939bdab4ef02605f2be
-  data.tar.gz: 942ccab03a688b1fc8b11db1d571d9cf6d8b96db49243120847f1083a7cb40bbdcedffdd38f252c483db395692f91f1dbfa275f2c876d159bcf2b5a230f533d2
+  metadata.gz: 40875af1558cbe95e6715d58d3dfa100f268d103a5fa1269ccbb7dcca7c2cf23b7670ff1303f5f51d6ce292320f37c7878339c7811ac810ce57ee6fa30777f2a
+  data.tar.gz: 576629818aa2c778194587112b7965182b53b36f346a9606f518d969a57c646d0d60edf5772537600b575d1b6452c10ef5fe28b163d33ceede2e07d99427e862

data/lib/opt_struct/class_methods.rb

@@ -1,16 +1,30 @@
 module OptStruct
   module ClassMethods
     def inherited(subclass)
-      instance_variables.each do |v|
-        ivar = instance_variable_get(v)
-        subclass.send(:instance_variable_set, v, ivar.dup) if ivar
+      # intersection of defined vars and the ones we care about
+      (instance_variables & OptStruct::CLASS_IVARS).each do |ivar|
+        # copy them to the child class
+        subclass.send(:instance_variable_set, ivar, instance_variable_get(ivar).dup)
       end
+      super(subclass)
+    end
+
+    def defined_keys
+      @defined_keys ||= []
     end
 
     def required_keys
       @required_keys ||= []
     end
 
+    def expected_arguments
+      @expected_arguments ||= []
+    end
+
+    def defaults
+      @defaults ||= {}
+    end
+
     def required(*keys, **options)
       required_keys.concat keys
       option_accessor *keys, **options
@@ -33,6 +47,7 @@ module OptStruct
 
     def option_accessor(*keys, **options)
       check_reserved_words(keys)
+      defined_keys.concat keys
       option_reader *keys, **options
       option_writer *keys, **options
     end
@@ -52,20 +67,12 @@ module OptStruct
       end
     end
 
-    def defaults
-      @defaults ||= {}
-    end
-
     def expect_arguments(*arguments)
       required(*arguments)
       expected_arguments.concat(arguments)
     end
     alias_method :expect_argument, :expect_arguments
 
-    def expected_arguments
-      @expected_arguments ||= []
-    end
-
     def init(meth = nil, &blk)
       add_callback(:init, meth || blk)
     end

data/lib/opt_struct/instance_methods.rb

@@ -29,27 +29,24 @@ module OptStruct
     def assign_defaults
       defaults.each do |key, default_value|
         next if options.key?(key)
-        options[key] = read_default_value(default_value)
+        options[key] =
+          case default_value
+          when Proc
+            instance_exec(&default_value)
+          when Symbol
+            respond_to?(default_value) ? send(default_value) : default_value
+          else
+            default_value
+          end
       end
     end
 
     def assign_arguments(args)
-      self.class.expected_arguments.map.with_index do |key, i|
+      self.class.expected_arguments.each_with_index do |key, i|
         options[key] = args[i] if args.length > i
       end
     end
 
-    def read_default_value(default)
-      case default
-      when Proc
-        instance_exec(&default)
-      when Symbol
-        respond_to?(default) ? send(default) : default
-      else
-        default
-      end
-    end
-
     def with_init_callbacks(&init_block)
       callbacks = self.class.all_callbacks
       return yield if callbacks.nil? || callbacks.empty?

data/lib/opt_struct/module_methods.rb

@@ -23,6 +23,7 @@ module OptStruct
       expect_arguments
     ).each do |class_method|
       define_method(class_method) do |*args, **options|
+        @_opt_structs ||= []
         @_opt_structs << [[], {}, -> { send(class_method, *args, **options) }]
       end
     end

data/lib/opt_struct/version.rb

@@ -1,3 +1,3 @@
 module OptStruct
-  VERSION = "1.4.0"
+  VERSION = "1.5.1"
 end

data/lib/opt_struct.rb

@@ -3,17 +3,33 @@ require "opt_struct/module_methods"
 require "opt_struct/instance_methods"
 
 module OptStruct
-  RESERVED_WORDS = %i(class defaults options fetch check_required_args check_required_keys).freeze
+
+  RESERVED_WORDS = [
+    :class, :options,
+    *OptStruct::InstanceMethods.instance_methods,
+    *OptStruct::InstanceMethods.protected_instance_methods,
+    *OptStruct::InstanceMethods.private_instance_methods,
+  ].freeze
+
+  # list of class instance variables defined/tracked by opt_struct
+  CLASS_IVARS = %i[
+    @defined_keys @required_keys @expected_arguments @defaults
+    @_callbacks @_opt_structs
+  ]
 
   # Default value object allows us to distinguish unspecified defaults from nil
   DEFAULT = Object.new
 
   def self._inject_struct(target, source, args = [], **defaults, &callback)
-    structs = Array(source.instance_variable_get(:@_opt_structs)).dup
+    existing = source.instance_variable_get(:@_opt_structs)
+    structs = Array(existing).dup
+
     if args.any? || defaults.any? || block_given?
       structs << [args, defaults, callback]
     end
-    target.instance_variable_set(:@_opt_structs, structs)
+
+    target.instance_variable_set(:@_opt_structs, structs) if existing || structs.any?
+
     if target.is_a?(Class)
       target.instance_exec do
         extend ClassMethods

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opt_struct
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Carl Zulauf
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-23 00:00:00.000000000 Z
+date: 2023-08-31 00:00:00.000000000 Z
 dependencies: []
 description: Struct with support for keyword params and mixin support
 email:
@@ -43,7 +43,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: The Option Struct