opt_struct 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ffdb6352a7c6f0ac1b8ace9d92f9618b6f15b6d
-  data.tar.gz: d87218eb3c56609fab3185facd228771ae2ac2bd
+  metadata.gz: 13aeb90dc88ca1e4eabb9ab9f0a82b595cae5953
+  data.tar.gz: bb6faaad48a7fe17a7963b85f7612d2321f1e973
 SHA512:
-  metadata.gz: b310d805c7e04e852828893c04591620ff55e922747b25a5551e1dc57f3bf832b401c2ad0f2a8a83bdaf39150582389a18449e9d2f9d7a08ec24bca4d05ac78d
-  data.tar.gz: 630df79a1c2ba0c2899324b69f14e2e90f72a0d366487bba94c388a63966214efa5e0fe324e72a6bacf01674a3b1fdeeffe5de264209f49de1d1bbcbedd8bb1d
+  metadata.gz: 917067f619231d3575b0d2ddeb3cf921e749e5d12191fa7ab58844630e34059c8823d8b1dc5415c63b623d6a6da53c8f3376fdc2dfa2c88a262bf930455b2988
+  data.tar.gz: 49a85c43f919def4a677898dd83a67f68944262314fae1a316106ef3a6a9c84fb3005c1f44254eb5cbc18cfacac676acf8384b694e3d85a75fa34391e0f9cf34

data/README.md

@@ -2,6 +2,10 @@
 
 A struct around a hash
 
+```ruby
+gem "opt_struct"
+```
+
 ## Example 1
 
 Can work mostly like a regular struct, while accepting options

data/lib/opt_struct/class_methods.rb

@@ -16,15 +16,27 @@ module OptStruct
     end
 
     def option_reader(*keys)
+      meths = String.new
       keys.each do |key|
-        define_method(key) { options[key] }
+        meths << <<~RUBY
+          def #{key}
+            options[:#{key}]
+          end
+        RUBY
       end
+      self.class_eval meths
     end
 
     def option_writer(*keys)
+      meths = String.new
       keys.each do |key|
-        define_method("#{key}=") { |value| options[key] = value }
+        meths << <<~RUBY
+          def #{key}=(value)
+            options[:#{key}] = value
+          end
+        RUBY
       end
+      self.class_eval meths
     end
 
     def option_accessor(*keys)
@@ -51,9 +63,23 @@ 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
+      lines = []
+      arguments.each_with_index do |arg, i|
+        lines << "@#{arg} = @options.delete(:#{arg}) if @options.key?(:#{arg})"
+        lines << "@#{arg} = values[#{i}] if values.length > #{i}"
+        lines << %[raise ArgumentError, "missing required argument: #{arg}" unless defined?(@#{arg})]
+      end
+      self.class_eval <<~RUBY
+        def initialize(*values, **options)
+          @options = self.class.defaults.merge(options)
+          #{lines.join("\n  ")}
+          check_required_keys
+        end
+      RUBY
     end
 
     def expected_arguments

data/lib/opt_struct/instance_methods.rb

@@ -1,10 +1,7 @@
 module OptStruct
   module InstanceMethods
-    def initialize(*values, **options)
+    def initialize(**options)
       @options = self.class.defaults.merge(options)
-      steal_arguments_from_options
-      assign_arguments(values)
-      check_arguments(values)
       check_required_keys
     end
 
@@ -14,30 +11,8 @@ module OptStruct
 
     private
 
-    def steal_arguments_from_options
-      expected_arguments.each do |arg|
-        send("#{arg}=", options.delete(arg)) if options.key?(arg)
-      end
-    end
-
-    def assign_arguments(values)
-      values.each_with_index do |value, i|
-        send("#{expected_arguments[i]}=", value)
-      end
-    end
-
-    def check_arguments(args)
-      expected = expected_arguments.count
-      actual = expected_arguments.count do |arg|
-        instance_variable_defined?("@#{arg}")
-      end
-      unless actual == expected
-        raise ArgumentError, "only #{actual} of #{expected} required arguments present"
-      end
-    end
-
     def check_required_keys
-      missing = self.class.required_keys.select { |key| !options.key?(key) }
+      missing = self.class.required_keys.reject { |key| options.key?(key) }
       if missing.any?
         raise ArgumentError, "missing required keywords: #{missing.inspect}"
       end

data/opt_struct.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "opt_struct"
-  spec.version       = "0.2.0"
+  spec.version       = "0.3.0"
   spec.authors       = ["Carl Zulauf"]
   spec.email         = ["carl@linkleaf.com"]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opt_struct
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Carl Zulauf