option_initializer 1.1.2 → 1.1.3

data/lib/option_initializer.rb

@@ -19,8 +19,8 @@ module OptionInitializer
 
       const_set :VALIDATORS, []
 
-      def initialize base, options
-        validate options
+      def initialize base, options, need_validation
+        validate options if need_validation
         @base    = base
         @options = options
       end
@@ -50,7 +50,7 @@ module OptionInitializer
 
       def merge opts
         validate opts
-        self.class.new @base, @options.merge(opts)
+        self.class.new @base, @options.merge(opts), false
       end
 
       def validate hash
@@ -96,12 +96,12 @@ module OptionInitializer
             singleton.send :undef_method, sym if singleton.method_defined?(sym)
             singleton.send :define_method, sym do |*v, &b|
               if b && v.empty?
-                oi.new self, sym => b
+                oi.new self, {sym => b}, true
               elsif b && !v.empty?
                 raise ArgumentError,
                   "wrong number of arguments (#{v.length} for 0 when block given)"
               elsif v.length == 1
-                oi.new self, sym => v.first
+                oi.new self, {sym => v.first}, true
               else
                 raise ArgumentError,
                   "wrong number of arguments (#{v.length} for 1)"

data/lib/option_initializer/version.rb

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

data/test/test_option_initializer.rb

@@ -25,14 +25,26 @@ class MyClass2
   include OptionInitializer
   include OptionInitializer
 
+  @@validate_count = 0
+
+  def self.reset_count
+    @@validate_count = 0
+  end
+
+  def self.count
+    @@validate_count
+  end
+
   option_initializer :aaa, :bbb, :ccc
   option_validator do |k, v|
+    @@validate_count += 1
     case k
     when :aaa
       raise ArgumentError if v == 0
     end
   end
   option_validator do |k, v|
+    @@validate_count += 1
     case k
     when :aaa
       raise ArgumentError if v < 0
@@ -107,6 +119,26 @@ class TestOptionInitializer < MiniTest::Unit::TestCase
     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) }
+
+    MyClass2.reset_count
+    MyClass2.aaa(1)
+    assert_equal 2, MyClass2.count
+
+    MyClass2.reset_count
+    MyClass2.aaa(1).bbb(2)
+    assert_equal 2 + 2, MyClass2.count
+
+    MyClass2.reset_count
+    MyClass2.aaa(1).bbb(2).new(:aaa => 3)
+    assert_equal 2 + 2 + 2, MyClass2.count
+
+    MyClass2.reset_count
+    MyClass2.aaa(1).bbb(2).new
+    assert_equal 2 + 2, MyClass2.count
+
+    MyClass2.reset_count
+    MyClass2.new :aaa => 1, :bbb => 2
+    assert_equal 4, MyClass2.count
   end
 
   def test_readme

metadata

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