opt_struct 0.8.3 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b699f5addc372cfd588ad4fbf591aea4c77c4688
-  data.tar.gz: 11fefbd784a3055f7a4ad4364fa94a7722628c78
+SHA256:
+  metadata.gz: 54518e9eca18b69463f611c221bd896a94cbd5293bd804a23319b0dd7441573d
+  data.tar.gz: 36584d846f30ebf6517d541a31668678a1a8dbd9025a4d9bef032eea2372c50f
 SHA512:
-  metadata.gz: 3a686c37ceb559479e949dd7b1593be9ceb9695fe5bcb82887989958ba3dfa0a65567e90efecd2f8c513aefbdb754a6cdb6b159855154d3f25c37e0f4110e1b7
-  data.tar.gz: 760dfdca6554c4c805db839ba9dbcfd6154743caeec1de527db5a72dd7f2c56c5bd846a4cb140387f35ac47a2efb3bec84f17f07eefb1a118b5472717947a690
+  metadata.gz: ff0a53a81253354676e0578028d775785eda00d30c7201b3f36414009b26ad551893f789dc9aabf82ec212b7abd5544432a045cfe4f973e59136ffeec1258867
+  data.tar.gz: fbbd6f407b889e2cca7b6b9d5ce891cdad58bb73db10a1e437515d74d1221af442da0cbb7715f8f20db05ea0799035951e094d9ad5bece86775f7c05fdd17c1e

data/lib/opt_struct/class_methods.rb

@@ -24,16 +24,7 @@ module OptStruct
           if options.key?(key)
             options[key]
           elsif defaults.key?(key)
-            default = defaults[key]
-            options[key] =
-              case default
-              when Proc
-                instance_exec(&default)
-              when Symbol
-                respond_to?(default) ? send(default) : default
-              else
-                default
-              end
+            options[key] = read_default_value(key)
           end
         end
       end
@@ -72,17 +63,8 @@ module OptStruct
     end
 
     def expect_arguments(*arguments)
-      check_reserved_words(arguments)
-
-      existing = expected_arguments.count
+      required(*arguments)
       expected_arguments.concat(arguments)
-
-      arguments.each_with_index do |arg, i|
-        n = i + existing
-        define_method(arg) { @arguments[n] }
-        define_method("#{arg}=") { |value| @arguments[n] = value }
-      end
-
     end
 
     def expected_arguments

data/lib/opt_struct/instance_methods.rb

@@ -2,9 +2,8 @@ module OptStruct
   module InstanceMethods
     def initialize(*arguments, **options)
       with_init_callbacks do
-        @arguments = arguments
         @options = options
-        check_required_args
+        assign_arguments(arguments)
         check_required_keys
       end
     end
@@ -25,20 +24,32 @@ module OptStruct
         raise ArgumentError, "missing required keywords: #{missing.inspect}"
       end
     end
-
-    def check_required_args
-      self.class.expected_arguments.each_with_index do |arg, i|
-        if i >= @arguments.length
-          if options.key?(arg)
-            @arguments[i] = options.delete(arg)
-          elsif defaults.key?(arg)
-            @arguments[i] = defaults[arg]
+    
+    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: #{arg}"
+            raise ArgumentError, "missing required argument: #{key}"
           end
         end
       end
     end
+    
+    def read_default_value(key)
+      default = defaults[key]
+      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

data/lib/opt_struct/version.rb

@@ -0,0 +1,3 @@
+module OptStruct
+  VERSION = "0.9.0"
+end

data/opt_struct.gemspec

@@ -1,6 +1,10 @@
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'opt_struct/version'
+
 Gem::Specification.new do |spec|
   spec.name          = "opt_struct"
-  spec.version       = "0.8.3"
+  spec.version       = OptStruct::VERSION
   spec.authors       = ["Carl Zulauf"]
   spec.email         = ["carl@linkleaf.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opt_struct
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.9.0
 platform: ruby
 authors:
 - Carl Zulauf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-11 00:00:00.000000000 Z
+date: 2019-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -64,6 +64,7 @@ files:
 - lib/opt_struct/class_methods.rb
 - lib/opt_struct/instance_methods.rb
 - lib/opt_struct/module_methods.rb
+- lib/opt_struct/version.rb
 - opt_struct.gemspec
 homepage: https://github.com/carlzulauf/opt_struct
 licenses:
@@ -84,8 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: The Option Struct