option_initializer 1.1.1 → 1.1.2

data/README.md

@@ -19,13 +19,14 @@ class Person
   option_validator do |k, v|
     case k
     when :age
-      raise ArgumentError, "invalid age" if age < 0
+      raise ArgumentError, "invalid age" if v < 0
     when :name
-      raise ArgumentError, "invalid name" if name.empty?
+      raise ArgumentError, "invalid name" if v.empty?
     end
   end
 
   def initialize opts
+    validate_options opts
     @options = opts
   end
 

data/lib/option_initializer/version.rb

@@ -1,3 +1,3 @@
 module OptionInitializer
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/lib/option_initializer.rb

@@ -1,6 +1,17 @@
 require "option_initializer/version"
 
 module OptionInitializer
+  def validate_options options
+    return if options.respond_to?(:option_validated?)
+    validators = self.class.const_get(:OptionInitializing).const_get(:VALIDATORS)
+    validators.each do |validator|
+      options.each do |k, v|
+        validator.call k, v
+      end
+    end
+    options
+  end
+
   def self.included base
     base.const_set :OptionInitializing, Class.new {
       attr_reader :options
@@ -21,10 +32,18 @@ module OptionInitializer
         # Convention. Deal with it.
         if args.last.is_a?(Hash)
           validate args.last
-          args[-1] = opts.merge(args.last)
+          opts = opts.merge(args.last)
+          args.pop
         else
-          args << opts.dup
+          opts = opts.dup
+        end
+
+        opts.instance_eval do
+          def option_validated?
+            true
+          end
         end
+        args << opts
 
         @base.new(*args, &block)
       end
@@ -45,7 +64,7 @@ module OptionInitializer
       def method_missing sym, *args, &block
         # 1.8
         if @base.instance_methods.map(&:to_sym).include?(sym)
-          @base.new(@options.dup).send sym, *args, &block
+          new.send sym, *args, &block
         else
           raise NoMethodError, "undefined method `#{sym}' for #{self}"
         end

data/test/test_option_initializer.rb

@@ -40,6 +40,7 @@ class MyClass2
   end
 
   def initialize options
+    validate_options options
     @options = options
   end
 
@@ -104,7 +105,8 @@ class TestOptionInitializer < MiniTest::Unit::TestCase
     assert_raises(ArgumentError) { MyClass2.aaa(-1) }
     assert_raises(ArgumentError) { MyClass2.aaa(1).aaa(-1) }
     assert_raises(ArgumentError) { MyClass2.aaa(1).aaa(1).new(:aaa => -2) }
-    assert_raises(ArgumentError) { MyClass2.aaa(1).aaa(1).new(:aaa => -2) }
+    assert_raises(ArgumentError) { MyClass2.aaa(1).aaa(1).new(:aaa => 0) }
+    assert_raises(ArgumentError) { MyClass2.new(:aaa => 0) }
   end
 
   def test_readme

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: option_initializer
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors: