opt_struct 1.3.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b76ee40e5f6c8f06f6f80efdefa9a595b48f4d07a3c98d6830fd515133038399
-  data.tar.gz: a9643c5ee83f52613f47e6e079445cc5912853ffb17b195f00b3e6496b2cfc03
+  metadata.gz: 29701f52f41c942f328cc7a9303a72baa59d96cc1b0b8d9e803e9a80bac6aef3
+  data.tar.gz: 91c84c884b3a4ea3833db8c80083217efb8d942983aa0cb1072fd0b177c135b5
 SHA512:
-  metadata.gz: 5d420f43e4cbc3571545846b6ee5275c32e86e5f79de7d2063564ef63f1cfc2c6857092256ee2d74a05bfce3fec9a9da7b1e5ada92ad50e3ceb69488310e8419
-  data.tar.gz: 8b059ca5bfab302e0515c90e49650723174cc91eb42b93d104de4fa79cf86fe6e42aea3bdc50c1612cdef36ae690538e221b9338c683d5851e88e9688c546731
+  metadata.gz: 27ceba23b7146f571232215d3228c59d9d6632e0628b694ded56fb8f308ad9257182c0f29edf41bbb9dc151570e5b855f40412ad066b33abfe042d18a3342344
+  data.tar.gz: 74f73309afd32192f9ea1b7d48f193e209f0e056381d20762001f57ec6b113387d11a8e9532a713b28855e2e052f210a8f0cff1df9b1c1319e8701934e9d0687

data/lib/opt_struct/class_methods.rb

@@ -7,10 +7,22 @@ module OptStruct
       end
     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,13 +45,14 @@ module OptStruct
 
     def option_accessor(*keys, **options)
       check_reserved_words(keys)
+      defined_keys.concat keys
       option_reader *keys, **options
       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)
-      defaults[key] = default if default
+      defaults[key] = default unless default == OptStruct::DEFAULT
       required_keys << key if required
       option_accessor key, **options
     end
@@ -52,20 +65,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
@@ -91,11 +96,9 @@ module OptStruct
 
     private
 
-    RESERVED_WORDS = %i(class defaults options fetch check_required_args check_required_keys)
-
     def check_reserved_words(words)
       Array(words).each do |word|
-        if RESERVED_WORDS.member?(word)
+        if OptStruct::RESERVED_WORDS.member?(word)
           raise ArgumentError, "Use of reserved word is not permitted: #{word.inspect}"
         end
       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/version.rb

@@ -1,3 +1,3 @@
 module OptStruct
-  VERSION = "1.3.0"
+  VERSION = "1.5.0"
 end

data/lib/opt_struct.rb

@@ -3,7 +3,16 @@ 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
+
+  # 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opt_struct
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Carl Zulauf
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-17 00:00:00.000000000 Z
+date: 2023-08-25 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.2.3
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: The Option Struct
 test_files: []