option_initializer 1.0.1 → 1.1.0

data/README.md

@@ -15,24 +15,39 @@ require 'option_initializer'
 
 class Person
   include OptionInitializer
-  option_initializer :id, :name, :age
+  option_initializer :id, :name, :age, :greetings
 
   def initialize opts
     @options = opts
   end
 
   def say_hello
-    puts "Hi, I'm #{@options[:name]}!"
+    puts @options[:greetings].call @options[:name]
   end
 end
 
 # Then
-john = Person.name('John Doe').age(19).id(1000).new
+john = Person.
+         name('John Doe').
+         age(19).
+         greetings { |name| "Hi, I'm #{name}!" }.
+         id(1000).
+         new
 
 # becomes equivalent to
-john = Person.new :id => 1000, :name => 'John Doe', :age => 19
+john = Person.new(
+         :id => 1000,
+         :name => 'John Doe',
+         :age => 19,
+         :greetings => proc { |name| "Hi, I'm #{name}!" }
+       )
 
 # Method call shortcut
-Person.name('John Doe').age(19).id(1000).say_hello
+Person.
+  name('John Doe').
+  age(19).
+  greetings { |name| "Hi, I'm #{name}!" }.
+  id(1000).
+  say_hello
 ```
 

data/lib/option_initializer.rb

@@ -11,7 +11,7 @@ module OptionInitializer
         @options = options
       end
 
-      def new *args
+      def new *args, &block
         args = args.dup
         opts = @options
 
@@ -22,7 +22,7 @@ module OptionInitializer
           args << opts.dup
         end
 
-        @base.new(*args)
+        @base.new(*args, &block)
       end
 
       def merge opts
@@ -37,9 +37,14 @@ module OptionInitializer
           raise NoMethodError, "undefined method `#{sym}' for #{self}"
         end
       end
-    } unless base.constants.include?(:OptionInitializing)
+    } unless base.constants.map(&:to_sym).include?(:OptionInitializing)
 
     base.class_eval do
+      class << self
+        if method_defined?(:option_initializer)
+          undef_method(:option_initializer)
+        end
+      end
       def base.option_initializer *syms
         oi = self.const_get(:OptionInitializing)
 
@@ -48,8 +53,19 @@ module OptionInitializer
           self.class_eval do
             # define_singleton_method not available on 1.8
             singleton = class << self; self end
-            singleton.send :define_method, sym do |v|
-              oi.new self, sym => v
+            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
+              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
+              else
+                raise ArgumentError,
+                  "wrong number of arguments (#{v.length} for 1)"
+              end
             end
           end
         end
@@ -57,8 +73,19 @@ module OptionInitializer
         # Instance methods
         oi.class_eval do
           syms.each do |sym|
-            define_method(sym) do |v|
-              merge(sym => v)
+            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)
+              else
+                raise ArgumentError,
+                  "wrong number of arguments (#{v.length} for 1)"
+              end
             end
           end
         end

data/lib/option_initializer/version.rb

@@ -1,3 +1,3 @@
 module OptionInitializer
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/test/test_option_initializer.rb

@@ -7,19 +7,24 @@ require 'option_initializer'
 class MyClass
   include OptionInitializer
   option_initializer :aaa, :bbb
-  option_initializer :ccc
+  option_initializer :ccc, :ddd
+  option_initializer :ccc, :ddd
 
-  attr_reader :a, :b, :options
+  attr_reader :a, :b, :options, :y
 
   def initialize a, b, opts
     @a = a
     @b = b
     @options = opts
+
+    @y = yield if block_given?
   end
 end
 
 class MyClass2
   include OptionInitializer
+  include OptionInitializer
+
   option_initializer :aaa, :bbb, :ccc
 
   def initialize options
@@ -35,25 +40,43 @@ class MyClass2
   end
 end
 
+# Excerpt from README
+class Person
+  include OptionInitializer
+  option_initializer :id, :name, :age, :greetings
+
+  def initialize opts
+    @options = opts
+  end
+
+  def say_hello
+    puts @options[:greetings].call @options[:name]
+  end
+end
+
 class TestOptionInitializer < MiniTest::Unit::TestCase
   def test_oi
-    o = MyClass.aaa(1).bbb(2).ccc(3).new(1, 2)
+    o = MyClass.aaa(1).bbb(2).ddd { 4 }.ccc(3).new(1, 2)
     assert_equal 1, o.options[:aaa]
     assert_equal 2, o.options[:bbb]
     assert_equal 3, o.options[:ccc]
+    assert_equal 4, o.options[:ddd].call
     assert_equal 1, o.a
     assert_equal 2, o.b
+    assert_equal nil, o.y
 
-    o = MyClass.aaa(1).bbb(2).ccc(3).aaa(4).new(1, 2, :ddd => 4)
+    o = MyClass.aaa(1).bbb(2).ccc(3).aaa(4).new(1, 2, :ddd => 4) { :y }
     assert_equal 4, o.options[:aaa]
     assert_equal 2, o.options[:bbb]
     assert_equal 3, o.options[:ccc]
     assert_equal 4, o.options[:ddd]
     assert_equal 1, o.a
     assert_equal 2, o.b
+    assert_equal :y, o.y
 
     assert_instance_of MyClass::OptionInitializing, MyClass.aaa(1)
 
+    assert_raises(ArgumentError) { MyClass.aaa(1) { 1 } }
     assert_raises(ArgumentError) { MyClass.aaa(1, 2) }
     assert_raises(ArgumentError) { MyClass.aaa(1).new(1) }
     assert_raises(ArgumentError) { MyClass.aaa(1).new(1, 2, 3) }
@@ -63,5 +86,11 @@ class TestOptionInitializer < MiniTest::Unit::TestCase
     assert_equal 2, MyClass2.aaa(1).bbb(2).num_options(true)
     assert_equal 2, MyClass2.aaa(1).bbb(2).echo(1) { |a| a * 2 }
   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
+  end
 end
 

metadata

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