opt_struct 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20cc3d259d8f9a17a7804fa4022e01862483a8b8
-  data.tar.gz: 92344e5ac8ec8d8abd8a4512fed58584c67041ff
+  metadata.gz: 55e3b71a809a00e523194d64dafde4a2d6e2e738
+  data.tar.gz: 2cacaade967a5840dfe41d0f7d2358b55b1dc603
 SHA512:
-  metadata.gz: 349c78d63e1f56eaa801de15ad3294de2e2877c5345997e68568b5a4c985ffcbaee11abf0b01584a5d5a81bc022aa48e8a87e20bf6ca343c1858f37ac6f3ff1e
-  data.tar.gz: d2d65670ac1c8a1f4e0a09a0ad1836a67190ad6d81d06b5a50613c4921b49431436cc24f1aac7eec69503bad4db5ac2497a203df4f9837342e131a6d402eb19f
+  metadata.gz: 62439a89421d58a67470a4c3c614833a160781cd9a58711eeb4e5c4683986433d1eca64433f059f79bd6bfe12608096886eccca13cbea748ce813fb2f02cffa5
+  data.tar.gz: a33b20f55781929e3d955c69826ef0287cdefc388e0f88ef7eb57baaa8f12716704299b32b3dbd0eda22a301b6801b9b0f346b10df39036fd07981eee8244486

data/README.md

@@ -111,17 +111,19 @@ t.last_name = "Smith"
 t.name
 # => "Trish Smith"
 
-class CarClass
-  include OptStruct.build do
-    required :make, :model
-    options :year, transmission: "Automatic"
+CarModule = OptStruct.build do
+  required :make, :model
+  options :year, transmission: "Automatic"
 
-    def name
-      [year, make, model].compact.join(" ")
-    end
+  def name
+    [year, make, model].compact.join(" ")
   end
 end
 
+class CarClass
+  include CarModule
+end
+
 c = CarClass.new(make: "Infiniti", model: "G37", year: 2012)
 c.name
 # => "2012 Infinit G37"

data/lib/opt_struct/class_methods.rb

@@ -16,27 +16,15 @@ module OptStruct
     end
 
     def option_reader(*keys)
-      meths = String.new
       keys.each do |key|
-        meths << <<~RUBY
-          def #{key}
-            options[:#{key}]
-          end
-        RUBY
+        define_method(key) { options[key] }
       end
-      self.class_eval meths
     end
 
     def option_writer(*keys)
-      meths = String.new
       keys.each do |key|
-        meths << <<~RUBY
-          def #{key}=(value)
-            options[:#{key}] = value
-          end
-        RUBY
+        define_method("#{key}=") { |value| options[key] = value }
       end
-      self.class_eval meths
     end
 
     def option_accessor(*keys)
@@ -63,29 +51,20 @@ module OptStruct
       @defaults ||= {}
     end
 
-    # For the record, I don't like this, but it's undeniably faster than alternatives
     def expect_arguments(*arguments)
-      @expected_arguments = arguments
-      attr_accessor *arguments
-      assignment_lines = String.new
+      existing = expected_arguments.count
+      expected_arguments.concat(arguments)
+
       arguments.each_with_index do |arg, i|
-        assignment_lines << <<~RUBY
-          @#{arg} = @options.delete(:#{arg}) if @options.key?(:#{arg})
-          @#{arg} = values[#{i}] if values.length > #{i}
-          raise ArgumentError, "missing required argument: #{arg}" unless defined?(@#{arg})
-        RUBY
+        n = i + existing
+        define_method(arg) { @arguments[n] }
+        define_method("#{arg}=") { |value| @arguments[n] = value }
       end
-      self.class_eval <<~RUBY
-        def initialize(*values, **options)
-          @options = self.class.defaults.merge(options)
-          #{assignment_lines}
-          check_required_keys
-        end
-      RUBY
+
     end
 
     def expected_arguments
-      @expected_arguments || []
+      @expected_arguments ||= []
     end
   end
 end

data/lib/opt_struct/instance_methods.rb

@@ -1,7 +1,9 @@
 module OptStruct
   module InstanceMethods
-    def initialize(**options)
+    def initialize(*arguments, **options)
+      @arguments = arguments
       @options = self.class.defaults.merge(options)
+      check_required_args
       check_required_keys
     end
 
@@ -18,8 +20,15 @@ module OptStruct
       end
     end
 
-    def expected_arguments
-      self.class.expected_arguments
+    def check_required_args
+      self.class.expected_arguments.each_with_index do |arg, i|
+        if i >= @arguments.length
+          unless options.key?(arg)
+            raise ArgumentError, "missing required argument: #{arg}"
+          end
+          @arguments[i] = options.delete(arg)
+        end
+      end
     end
   end
 end

data/opt_struct.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "opt_struct"
-  spec.version       = "0.4.0"
+  spec.version       = "0.5.0"
   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.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Carl Zulauf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-29 00:00:00.000000000 Z
+date: 2017-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler