opt_struct 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8873a2c7cc94bd72bd9b3c8b9488a6c7657d44b
-  data.tar.gz: a12e4e7515cad929f9de2e828e732e07ef438fe4
+  metadata.gz: 58d04b610dd9e01836ded937683e0454ab6f8ca6
+  data.tar.gz: 1313b9c2d0daab287f437a6ce225ffb23017b0d4
 SHA512:
-  metadata.gz: b4a88efd47dcffae3a2bfdc9d7dfee486ff0614d0669a084ddd1232565096dffdb72506711ba322b82cbeb24efd0f55974e9d3908d8e8ba2087b325af645013d
-  data.tar.gz: cbdf3573a8f33d125b90e23f0d919ec697e738f35e4a41cc11df819663072e1f6234fa2a9f08862564122939e4be1886d288263935e7bfe20638b2f403c1324f
+  metadata.gz: 6c0052e8e964a8af261e45fef6c06c7ab11c801832464352c447a5319e28e34d43added7597e8a7b49b7d14984e54a40ae356f30c566406f0c60d9235b40154c
+  data.tar.gz: c189970eee5b74c925ef31614fa50f419143db679dbdf9cb2d5627d7e8c05d440a5c3406180bdcf25f601fa722b28bd39726f46a7d25a002e835c23003abe6c2

data/lib/opt_struct/class_methods.rb

@@ -20,7 +20,21 @@ module OptStruct
       check_reserved_words(keys)
 
       keys.each do |key|
-        define_method(key) { options[key] }
+        define_method(key) do
+          if options.key?(key)
+            options[key]
+          else
+            default = defaults[key]
+            case default
+            when Proc
+              instance_exec(&default)
+            when Symbol
+              respond_to?(default) ? send(default) : default
+            else
+              default
+            end
+          end
+        end
       end
     end
 
@@ -76,7 +90,7 @@ module OptStruct
 
     private
 
-    RESERVED_WORDS = %i(class options fetch check_required_args check_required_keys)
+    RESERVED_WORDS = %i(class defaults options fetch check_required_args check_required_keys)
 
     def check_reserved_words(words)
       Array(words).each do |word|

data/lib/opt_struct/instance_methods.rb

@@ -2,7 +2,7 @@ module OptStruct
   module InstanceMethods
     def initialize(*arguments, **options)
       @arguments = arguments
-      @options = self.class.defaults.merge(options)
+      @options = options
       check_required_args
       check_required_keys
     end
@@ -11,6 +11,10 @@ module OptStruct
       options.fetch(*a, &b)
     end
 
+    def defaults
+      self.class.defaults
+    end
+
     private
 
     def check_required_keys
@@ -23,10 +27,13 @@ module OptStruct
     def check_required_args
       self.class.expected_arguments.each_with_index do |arg, i|
         if i >= @arguments.length
-          unless options.key?(arg)
+          if options.key?(arg)
+            @arguments[i] = options.delete(arg)
+          elsif defaults.key?(arg)
+            @arguments[i] = defaults[arg]
+          else
             raise ArgumentError, "missing required argument: #{arg}"
           end
-          @arguments[i] = options.delete(arg)
         end
       end
     end

data/opt_struct.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "opt_struct"
-  spec.version       = "0.7.1"
+  spec.version       = "0.7.2"
   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.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Carl Zulauf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-24 00:00:00.000000000 Z
+date: 2017-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: The Option Struct