opt_struct 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef6cb2533d486038390ac0975e38f6c0d3e9486c8c213326f48caf58c57dfb09
-  data.tar.gz: 98c38c235c3e24588f9a3efb7d69ac4e40da9d7d6650ebb1a0aca3c669240f45
+  metadata.gz: b76ee40e5f6c8f06f6f80efdefa9a595b48f4d07a3c98d6830fd515133038399
+  data.tar.gz: a9643c5ee83f52613f47e6e079445cc5912853ffb17b195f00b3e6496b2cfc03
 SHA512:
-  metadata.gz: 3f7346d74b2ddcdef6ff61ba638e794247fbc714c9e796a0f13297fae9d77d7482f452e43f5b2830c54129b3d6cf22f19d8315d75c360d1eb575027325a33337
-  data.tar.gz: cbeba0f215a42989eb6124fe095d6d6332fe015b844f972ba63aa15b085b0f7df6812751c736867743f86029187b829e44fd9d8aed88d78e8087076e78192e06
+  metadata.gz: 5d420f43e4cbc3571545846b6ee5275c32e86e5f79de7d2063564ef63f1cfc2c6857092256ee2d74a05bfce3fec9a9da7b1e5ada92ad50e3ceb69488310e8419
+  data.tar.gz: 8b059ca5bfab302e0515c90e49650723174cc91eb42b93d104de4fa79cf86fe6e42aea3bdc50c1612cdef36ae690538e221b9338c683d5851e88e9688c546731

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
 
@@ -43,40 +38,34 @@ module OptStruct
     end
 
     def option(key, default = nil, required: false, **options)
-      default ||= options[:default]
-      add_defaults key => default if default || options.key?(:default)
-      add_required_keys key if required
+      default = options[:default] if options.key?(:default)
+      defaults[key] = default if 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,60 +79,23 @@ 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
+    RESERVED_WORDS = %i(class defaults options fetch check_required_args check_required_keys)
 
     def check_reserved_words(words)
       Array(words).each do |word|
-        if OptStruct::RESERVED_WORDS.member?(word)
+        if RESERVED_WORDS.member?(word)
           raise ArgumentError, "Use of reserved word is not permitted: #{word.inspect}"
         end
       end

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.1"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opt_struct
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Carl Zulauf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-19 00:00:00.000000000 Z
+date: 2021-05-17 00:00:00.000000000 Z
 dependencies: []
 description: Struct with support for keyword params and mixin support
 email: