opt_struct 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '059614bdb1345ea6768c1c3334626dbca0ffa61ff47ada76831fa6b91817ce8a'
-  data.tar.gz: fb53cbccfa0d29bf3f5574fe6d4123b40118cff79161487c91409d4fc4070c60
+  metadata.gz: 33f00177f26d90bc4c9407bfb63860b7ef223f73545311fd26e0e64039f9da92
+  data.tar.gz: 6d5a5f91b1955e81607abb22c1704b36c3dbb9870a76fa6b26e494e19ccb3b4b
 SHA512:
-  metadata.gz: b3503358f5bc3dee6f50ab5128b5b24fabb884852f2a7cf750861a7aa13ef5c2597be0eda3b40d562fd127afe1e44586efaecdce6223208421138269384f6818
-  data.tar.gz: fbe2e25d299bfa1ab62c9afd9168d4b9ac609469c3613b830192810cff34ed55d4bdf84f8e4a2affa5194f20fcd71a0502e25c23feba46b4b7cdb3dcea0c1b9a
+  metadata.gz: e11a757d9319851bddcc69052076996d618fe2f281822abd281fcfa4cefda3a4d2cda3c424e9ef3882800f76ff7435ddc327f71bfab69742e8ca5dfae98e1003
+  data.tar.gz: f9174dce367fee3f1fea9bed17c8c004e1b6a8b73d4597e3bcb6bfb02d08d3e36b0b76e3bb0989d66e05983f4d895c6b4e0392a08555edf71887053548972782

data/lib/opt_struct/class_methods.rb

@@ -18,13 +18,7 @@ module OptStruct
 
     def option_reader(*keys)
       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] }
       end
     end
 

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) # || default_value.nil?
+        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/version.rb

@@ -1,3 +1,3 @@
 module OptStruct
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opt_struct
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Carl Zulauf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-06 00:00:00.000000000 Z
+date: 2020-01-09 00:00:00.000000000 Z
 dependencies: []
 description: Struct with support for keyword params and mixin support
 email: