opt_struct 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 824012017028badde180165fa6280f398cbf138f09f8600319625e92fbaf67ed
-  data.tar.gz: 2c612d601c220eb88aaaf656917cd06d0edc7a87b70f84c67cda6b17e6cbbe94
+  metadata.gz: 193867b718e2e264678a0ad084fc6ee5d76854203e74d13e6fc64404dfb042e8
+  data.tar.gz: b226650ae4b38741e70de40d8e0ffde6666f6e80f7b6735c316dfd303f74a435
 SHA512:
-  metadata.gz: f7cf9e8c1d9e0b9c40a2f08c1f32784fa61b38a14edac39f4bef3f887845827a57f9b813e2f8df6dbb0436734c8f5895d7b25f45adb2bff3fa82eb7e87766fee
-  data.tar.gz: aea1084efba08f15951e7d8629c1a8211d66bddd720dfee19a1c1ec5a8eb52d6c73f047ac4ae8c5b7a969912113b0093249f48f991415ca932170d64e69b956d
+  metadata.gz: 16565e6596e06089f3cc463917af8ee13d573ad8ded530a39f121e3d4d2b1eb05b5b5e3bf308fe770750e7067adf06d08d72b0ef438ff939bdab4ef02605f2be
+  data.tar.gz: 942ccab03a688b1fc8b11db1d571d9cf6d8b96db49243120847f1083a7cb40bbdcedffdd38f252c483db395692f91f1dbfa275f2c876d159bcf2b5a230f533d2

data/lib/opt_struct/class_methods.rb

@@ -1,38 +1,33 @@
 module OptStruct
   module ClassMethods
     def inherited(subclass)
-      opt_struct_class_constants.each do |c|
-        subclass.const_set(c, const_get(c)) if const_defined?(c)
+      instance_variables.each do |v|
+        ivar = instance_variable_get(v)
+        subclass.send(:instance_variable_set, v, ivar.dup) if ivar
       end
     end
 
-    # overwritten if `required` is called
     def required_keys
-      [].freeze
+      @required_keys ||= []
     end
 
     def required(*keys, **options)
-      add_required_keys *keys
+      required_keys.concat keys
       option_accessor *keys, **options
     end
 
-    def option_reader(*keys, **options)
+    def option_reader(*keys, **opts)
       keys.each do |key|
-        class_eval <<~RUBY
-          #{options[:private] ? "private" : ""} def #{key}
-            options[:#{key}]
-          end
-        RUBY
+        define_method(key) { options[key] }
+        private key if opts[:private]
       end
     end
 
-    def option_writer(*keys, **options)
+    def option_writer(*keys, **opts)
       keys.each do |key|
-        class_eval <<~RUBY
-          #{options[:private] ? "private" : ""} def #{key}=(value)
-            options[:#{key}] = value
-          end
-        RUBY
+        meth = "#{key}=".to_sym
+        define_method(meth) { |value| options[key] = value }
+        private meth if opts[:private]
       end
     end
 
@@ -42,41 +37,35 @@ module OptStruct
       option_writer *keys, **options
     end
 
-    def option(key, default = nil, required: false, **options)
+    def option(key, default = OptStruct::DEFAULT, required: false, **options)
       default = options[:default] if options.key?(:default)
-      add_defaults key => default
-      add_required_keys key if required
+      defaults[key] = default unless default == OptStruct::DEFAULT
+      required_keys << key if required
       option_accessor key, **options
     end
 
     def options(*keys, **keys_defaults)
       option_accessor *keys if keys.any?
       if keys_defaults.any?
-        add_defaults keys_defaults
+        defaults.merge!(keys_defaults)
         option_accessor *(keys_defaults.keys - expected_arguments)
       end
     end
 
     def defaults
-      const_defined?(:OPT_DEFAULTS) ? const_get(:OPT_DEFAULTS) : {}
-    end
-
-    # overwritten if `expect_arguments` is called
-    def expected_arguments
-      [].freeze
+      @defaults ||= {}
     end
 
     def expect_arguments(*arguments)
       required(*arguments)
-      combined = expected_arguments + arguments
-      class_eval <<~EVAL
-        def self.expected_arguments
-          #{combined.inspect}.freeze
-        end
-      EVAL
+      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
@@ -90,57 +79,18 @@ module OptStruct
       add_callback(:around_init, meth || blk)
     end
 
-    def all_callbacks
-      const_defined?(:OPT_CALLBACKS) ? const_get(:OPT_CALLBACKS) : {}.freeze
-    end
-
-    def shareable?
-      const_defined?(:SHAREABLE) && const_get(:SHAREABLE)
+    def add_callback(name, callback)
+      @_callbacks ||= {}
+      @_callbacks[name] ||= []
+      @_callbacks[name] << callback
     end
 
-    def shareable!
-      return if shareable?
-      const_set(:SHAREABLE, true)
+    def all_callbacks
+      @_callbacks
     end
 
     private
 
-    def share(value)
-      return value unless shareable?
-      defined?(Ractor) ? Ractor.make_shareable(value) : value
-    end
-
-    def add_required_keys(*keys)
-      combined = required_keys + keys
-      class_eval <<~RUBY
-        def self.required_keys
-          #{combined.inspect}.freeze
-        end
-      RUBY
-    end
-
-    def add_defaults(defaults_to_add)
-      freezer = defaults.dup
-      defaults_to_add.each { |k, v| freezer[k] = share(v) }
-      remove_const(:OPT_DEFAULTS) if const_defined?(:OPT_DEFAULTS)
-      const_set(:OPT_DEFAULTS, freezer.freeze)
-    end
-
-    def add_callback(name, callback)
-      if const_defined?(:OPT_CALLBACKS)
-        callbacks_for_name = (all_callbacks[name] || []) + [callback]
-        callbacks_hash = all_callbacks.merge(name => callbacks_for_name).freeze
-        remove_const(:OPT_CALLBACKS)
-        const_set(:OPT_CALLBACKS, callbacks_hash)
-      else
-        const_set(:OPT_CALLBACKS, { name => [ callback ] })
-      end
-    end
-
-    def opt_struct_class_constants
-      [:OPT_DEFAULTS, :OPT_CALLBACKS]
-    end
-
     def check_reserved_words(words)
       Array(words).each do |word|
         if OptStruct::RESERVED_WORDS.member?(word)

data/lib/opt_struct/instance_methods.rb

@@ -28,7 +28,7 @@ module OptStruct
 
     def assign_defaults
       defaults.each do |key, default_value|
-        next if options.key?(key) # || default_value.nil?
+        next if options.key?(key)
         options[key] = read_default_value(default_value)
       end
     end

data/lib/opt_struct/version.rb

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

data/lib/opt_struct.rb

@@ -5,6 +5,9 @@ require "opt_struct/instance_methods"
 module OptStruct
   RESERVED_WORDS = %i(class defaults options fetch check_required_args check_required_keys).freeze
 
+  # 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
     if args.any? || defaults.any? || block_given?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opt_struct
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Carl Zulauf
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-30 00:00:00.000000000 Z
+date: 2022-02-23 00:00:00.000000000 Z
 dependencies: []
 description: Struct with support for keyword params and mixin support
 email:
@@ -28,7 +28,7 @@ homepage: https://github.com/carlzulauf/opt_struct
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -43,8 +43,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: The Option Struct
 test_files: []