opt_struct 1.5.0 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29701f52f41c942f328cc7a9303a72baa59d96cc1b0b8d9e803e9a80bac6aef3
-  data.tar.gz: 91c84c884b3a4ea3833db8c80083217efb8d942983aa0cb1072fd0b177c135b5
+  metadata.gz: d997efd436a127ccf51efc19590c55f4671c087e61ed085174a273a723d9fc66
+  data.tar.gz: 87f2650397718c6dad69871202ea303de8626c94d98cab01b1e14ce6e78de82e
 SHA512:
-  metadata.gz: 27ceba23b7146f571232215d3228c59d9d6632e0628b694ded56fb8f308ad9257182c0f29edf41bbb9dc151570e5b855f40412ad066b33abfe042d18a3342344
-  data.tar.gz: 74f73309afd32192f9ea1b7d48f193e209f0e056381d20762001f57ec6b113387d11a8e9532a713b28855e2e052f210a8f0cff1df9b1c1319e8701934e9d0687
+  metadata.gz: 8ba6acba66bd8d059d3cc210b5102908929458b6665972e7ba3c049fed4eb6ab1031edf987b0e1d30ba61130d72cf0cdd075587319016924445e075cae4e4a83
+  data.tar.gz: 9dd91af6395c02a480a9ffe413c1912dba17f30fc7f7e3f175f0b681d485aee8f9cbf91ac136158f6bf82942bd137e3e68082bd9d2d7ac8ba1c2d44e541f7d29

data/lib/opt_struct/class_methods.rb

@@ -1,10 +1,19 @@
 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 each to the child class
+        value =
+          case ivar
+          when :@_callbacks # Hash that we need to duplicate deeper
+            instance_variable_get(ivar).transform_values(&:dup)
+          else
+            instance_variable_get(ivar).dup
+          end
+        subclass.send(:instance_variable_set, ivar, value)
       end
+      super(subclass)
     end
 
     def defined_keys

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.5.0"
+  VERSION = "1.5.2"
 end

data/lib/opt_struct.rb

@@ -11,15 +11,25 @@ module OptStruct
     *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.5.0
+  version: 1.5.2
 platform: ruby
 authors:
 - Carl Zulauf
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-25 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: