opt_struct 1.0.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a79bedcca81ddc59a72499b1f82bce3d62eab52e6114d290c9a7f3ecc30aed3
-  data.tar.gz: c677a0a669325ff7e37020092e8e78771bd828c1ced6b4421fd9f463b0e55fe2
+  metadata.gz: b76ee40e5f6c8f06f6f80efdefa9a595b48f4d07a3c98d6830fd515133038399
+  data.tar.gz: a9643c5ee83f52613f47e6e079445cc5912853ffb17b195f00b3e6496b2cfc03
 SHA512:
-  metadata.gz: aad59c9b29833cc340d1e31c504ab18b1b67176f54749c3cf9612f2c52daeb3e3accd9a8d6d6fdcbcdb6bd14b889574befb4071fdfb123b29acfc4bba9777e28
-  data.tar.gz: fc8bc8a0eda420826906a256cbccaccdb358c61351dda152753f2011b2b2e4a382b6310de9a0a2313f56d0e013c24e9204e1a48749a78af978ea1ba560d5e84d
+  metadata.gz: 5d420f43e4cbc3571545846b6ee5275c32e86e5f79de7d2063564ef63f1cfc2c6857092256ee2d74a05bfce3fec9a9da7b1e5ada92ad50e3ceb69488310e8419
+  data.tar.gz: 8b059ca5bfab302e0515c90e49650723174cc91eb42b93d104de4fa79cf86fe6e42aea3bdc50c1612cdef36ae690538e221b9338c683d5851e88e9688c546731

data/README.md

@@ -153,7 +153,7 @@ end
 Passing a Hash to `.new` or `.build` is equivalent to passing the same hash to `options`
 
 ```ruby
-User < OptStruct.new(email: nil, role: "member")
+User = OptStruct.new(email: nil, role: "member")
 ```
 
 Default blocks can also be used and are late evaluated on the each struct instance.

data/lib/opt_struct.rb

@@ -3,10 +3,11 @@ 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
 
-  def self._inject_struct(target, source, args = [], defaults = {}, &callback)
+  def self._inject_struct(target, source, args = [], **defaults, &callback)
     structs = Array(source.instance_variable_get(:@_opt_structs)).dup
-    if args.any? || defaults.any? || callback
+    if args.any? || defaults.any? || block_given?
       structs << [args, defaults, callback]
     end
     target.instance_variable_set(:@_opt_structs, structs)
@@ -18,7 +19,7 @@ module OptStruct
       end
       structs.each do |s_args, s_defaults, s_callback|
         target.expect_arguments *s_args if s_args.any?
-        target.options s_defaults       if s_defaults.any?
+        target.options **s_defaults     if s_defaults.any?
         target.class_exec(&s_callback)  if s_callback
       end
     else
@@ -38,10 +39,10 @@ module OptStruct
   end
 
   def self.new(*args, **defaults, &callback)
-    _inject_struct(Class.new, self, args.map(&:to_sym), defaults, &callback)
+    _inject_struct(Class.new, self, args.map(&:to_sym), **defaults, &callback)
   end
 
   def self.build(*args, **defaults, &callback)
-    _inject_struct(Module.new, self, args.map(&:to_sym), defaults, &callback)
+    _inject_struct(Module.new, self, args.map(&:to_sym), **defaults, &callback)
   end
 end

data/lib/opt_struct/class_methods.rb

@@ -11,40 +11,37 @@ module OptStruct
       @required_keys ||= []
     end
 
-    def required(*keys)
+    def required(*keys, **options)
       required_keys.concat keys
-      option_accessor *keys
+      option_accessor *keys, **options
     end
 
-    def option_reader(*keys)
+    def option_reader(*keys, **opts)
       keys.each do |key|
-        define_method(key) do
-          if options.key?(key)
-            options[key]
-          elsif defaults.key?(key)
-            options[key] = read_default_value(key)
-          end
-        end
+        define_method(key) { options[key] }
+        private key if opts[:private]
       end
     end
 
-    def option_writer(*keys)
+    def option_writer(*keys, **opts)
       keys.each do |key|
-        define_method("#{key}=") { |value| options[key] = value }
+        meth = "#{key}=".to_sym
+        define_method(meth) { |value| options[key] = value }
+        private meth if opts[:private]
       end
     end
 
-    def option_accessor(*keys)
+    def option_accessor(*keys, **options)
       check_reserved_words(keys)
-      option_reader *keys
-      option_writer *keys
+      option_reader *keys, **options
+      option_writer *keys, **options
     end
 
-    def option(key, default = nil, **options)
+    def option(key, default = nil, required: false, **options)
       default = options[:default] if options.key?(:default)
-      defaults[key] = default
-      required_keys << key if options[:required]
-      option_accessor key
+      defaults[key] = default if default
+      required_keys << key if required
+      option_accessor key, **options
     end
 
     def options(*keys, **keys_defaults)

data/lib/opt_struct/instance_methods.rb

@@ -4,6 +4,7 @@ module OptStruct
       with_init_callbacks do
         @options = options
         assign_arguments(arguments)
+        assign_defaults
         check_required_keys
       end
     end
@@ -24,23 +25,21 @@ module OptStruct
         raise ArgumentError, "missing required keywords: #{missing.inspect}"
       end
     end
-    
+
+    def assign_defaults
+      defaults.each do |key, default_value|
+        next if options.key?(key)
+        options[key] = read_default_value(default_value)
+      end
+    end
+
     def assign_arguments(args)
       self.class.expected_arguments.map.with_index do |key, i|
-        if args.length > i
-          options[key] = args[i]
-        elsif !options.key?(key)
-          if defaults.key?(key)
-            options[key] = read_default_value(key)
-          else
-            raise ArgumentError, "missing required argument: #{key}"
-          end
-        end
+        options[key] = args[i] if args.length > i
       end
     end
-    
-    def read_default_value(key)
-      default = defaults[key]
+
+    def read_default_value(default)
       case default
       when Proc
         instance_exec(&default)

data/lib/opt_struct/module_methods.rb

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

data/lib/opt_struct/version.rb

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

data/opt_struct.gemspec

@@ -16,8 +16,4 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files`.split("\n").grep(/^lib/)
   spec.files        += %w(README.md opt_struct.gemspec)
   spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", ">= 1.14"
-  spec.add_development_dependency "rake", ">= 10.0"
-  spec.add_development_dependency "rspec", ">= 3.0"
 end

metadata

@@ -1,57 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: opt_struct
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Carl Zulauf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-06 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.14'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
+date: 2021-05-17 00:00:00.000000000 Z
+dependencies: []
 description: Struct with support for keyword params and mixin support
 email:
 - carl@linkleaf.com
@@ -85,7 +43,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: The Option Struct