option_initializer 1.2.0 → 1.3.0

data/README.md

@@ -15,11 +15,9 @@ require 'option_initializer'
 
 class Person
   include OptionInitializer
-  option_initializer :id, :name, :age, :greetings
+  option_initializer :id, :name, :greetings => :block, :birthday => 1..3
   option_validator do |k, v|
     case k
-    when :age
-      raise ArgumentError, "invalid age" if v < 0
     when :name
       raise ArgumentError, "invalid name" if v.empty?
     end
@@ -38,7 +36,7 @@ end
 # Then
 john = Person.
          name('John Doe').
-         age(19).
+         birthday(1990, 1, 1).
          greetings { |name| "Hi, I'm #{name}!" }.
          id(1000).
          new
@@ -47,7 +45,7 @@ john = Person.
 john = Person.new(
          :id => 1000,
          :name => 'John Doe',
-         :age => 19,
+         :birthday => [1990, 1, 1],
          :greetings => proc { |name| "Hi, I'm #{name}!" }
        )
 

data/lib/option_initializer/version.rb

@@ -1,3 +1,3 @@
 module OptionInitializer
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/lib/option_initializer.rb

@@ -97,43 +97,74 @@ module OptionInitializer
       def base.option_initializer *syms
         oi = self.const_get(:OptionInitializing)
 
+        pairs = syms.inject([]) { |arr, sym|
+          case sym
+          when Symbol, String
+            arr << [sym.to_sym, 1]
+          when Hash
+            arr.concat sym.map { |k, v|
+              unless (v.is_a?(Fixnum) && v > 0) || (v.is_a?(Range) && v.begin > 0) || v == :block
+                raise ArgumentError, "invalid number of arguments specified for #{k}"
+              end
+              [k.to_sym, v]
+            }
+          else
+            raise ArgumentError, "invalid option specification"
+          end
+        }
+
         # Class methods
-        syms.each do |sym|
+        pairs.each do |pair|
+          sym = pair.first
+
           self.class_eval do
             # define_singleton_method not available on 1.8
             singleton = class << self; self end
             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}, 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}, true
-              else
-                raise ArgumentError,
-                  "wrong number of arguments (#{v.length} for 1)"
-              end
+              oi.new(self, {}, false).send(sym, *v, &b)
             end
           end
         end
 
         # Instance methods
         oi.class_eval do
-          syms.each do |sym|
+          pairs.each do |pair|
+            sym, nargs = pair
             undef_method(sym) if method_defined?(sym)
             define_method(sym) do |*v, &b|
-              if b && v.empty?
-                merge(sym => b)
-              elsif b && !v.empty?
-                raise ArgumentError,
-                  "wrong number of arguments (#{v.length} for 0 when block given)"
-              elsif v.length == 1
-                merge(sym => v.first)
+              case nargs
+              when :block
+                if b
+                  if v.empty?
+                    merge(sym => b)
+                  else
+                    raise ArgumentError, "only block expected"
+                  end
+                else
+                  raise ArgumentError, "block expected but not given"
+                end
+              when 1
+                if b && v.empty?
+                  merge(sym => b)
+                elsif b && !v.empty?
+                  raise ArgumentError, "wrong number of arguments (#{v.length} for 0 when block given)"
+                elsif v.length == 1
+                  merge(sym => v.first)
+                else
+                  raise ArgumentError, "wrong number of arguments (#{v.length} for 1)"
+                end
+              when Range, Fixnum
+                if b
+                  raise ArgumentError, "block not expected"
+                elsif (nargs.is_a?(Range) && !nargs.include?(v.length)) ||
+                      (nargs.is_a?(Fixnum) && nargs != v.length)
+                  raise ArgumentError, "wrong number of arguments (#{v.length} for #{nargs})"
+                else
+                  merge(sym => v)
+                end
               else
-                raise ArgumentError,
-                  "wrong number of arguments (#{v.length} for 1)"
+                raise ArgumentError, "invalid option specification"
               end
             end
           end

data/test/test_option_initializer.rb

@@ -79,13 +79,37 @@ class MyClass3
   end
 end
 
+class MyClass4
+  attr_reader :options
+
+  include OptionInitializer
+  option_initializer :two => 2,
+                     :two_or_three => 2..3,
+                     :yet_two_or_three => 2...4,
+                     :b => :block
+
+  def initialize options
+    validate_options @options = options
+  end
+end
+
+class MyClass5
+  include OptionInitializer
+end
+
 # Excerpt from README
 class Person
   include OptionInitializer
-  option_initializer :id, :name, :age, :greetings
-  option_initializer!
+  option_initializer! :id, :name, :greetings, :birthday => 1..3
+  option_validator do |k, v|
+    case k
+    when :name
+      raise ArgumentError, "invalid name" if v.empty?
+    end
+  end
 
   def initialize opts
+    validate_options opts
     @options = opts
   end
 
@@ -162,10 +186,46 @@ class TestOptionInitializer < MiniTest::Unit::TestCase
     assert_raises(TypeError) { MyClass2.new 'str' }
   end
 
+  def test_varargs
+    obj = MyClass4.two(1, 2).two_or_three(2, 3, 4).yet_two_or_three(3, 4, 5).b { :r }.new
+    assert_equal [1, 2], obj.options[:two]
+    assert_equal [2, 3, 4], obj.options[:two_or_three]
+    assert_equal [3, 4, 5], obj.options[:yet_two_or_three]
+    assert_equal :r, obj.options[:b].call
+    assert_raises(ArgumentError) { MyClass4.two(1) }
+    assert_raises(ArgumentError) { MyClass4.two(1, 2) { } }
+    assert_raises(ArgumentError) { MyClass4.two { } }
+    assert_raises(ArgumentError) { MyClass4.two_or_three(1) }
+    assert_raises(ArgumentError) { MyClass4.yet_two_or_three(1, 2, 3, 4) }
+    assert_raises(ArgumentError) { MyClass4.yet_two_or_three {} }
+    assert_raises(ArgumentError) { MyClass4.b(1) }
+    assert_raises(ArgumentError) { MyClass4.b(1) {} }
+  end
+
+  def test_varargs_def
+    assert_raises(NoMethodError) { MyClass5.a(1) }
+    MyClass5.class_eval do
+      option_initializer :a => 1...4
+    end
+    MyClass5.a(1)
+
+    assert_raises(ArgumentError) { MyClass5.class_eval { option_initializer :b => 0 } }
+    assert_raises(ArgumentError) { MyClass5.class_eval { option_initializer :b => 3.14 } }
+    assert_raises(ArgumentError) { MyClass5.class_eval { option_initializer :b => [1] } }
+    assert_raises(ArgumentError) { MyClass5.class_eval { option_initializer :b => 0..3 } }
+    assert_raises(ArgumentError) { MyClass5.class_eval { option_initializer 3.14 } }
+    assert_raises(ArgumentError) { MyClass5.class_eval { option_initializer 3.14 => nil } }
+    assert_raises(ArgumentError) { MyClass5.class_eval { option_initializer :b => :block? } }
+  end
+
   def test_readme
-    john = Person.name('John Doe').age(19).greetings { |name| "Hi, I'm #{name}!" }.id(1000).new
-    john = Person.new :id => 1000, :name => 'John Doe', :age => 19, :greetings => proc { |name| "Hi, I'm #{name}!" }
-    Person.name('John Doe').age(19).greetings { |name| "Hi, I'm #{name}!" }.id(1000).say_hello
+    john = Person.name('John Doe').birthday(1990, 1, 1).
+                  greetings { |name| "Hi, I'm #{name}!" }.id(1000).new
+    john = Person.new :id => 1000, :name => 'John Doe',
+                      :birthday => [1990, 1, 1],
+                      :greetings => proc { |name| "Hi, I'm #{name}!" }
+    Person.name('John Doe').birthday(1990, 1, 1).
+           greetings { |name| "Hi, I'm #{name}!" }.id(1000).say_hello
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: option_initializer
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2013-03-16 00:00:00.000000000 Z
 dependencies: []
 description: Object construction with method chaining
 email: