option_initializer 1.1.0 → 1.1.1

data/README.md

@@ -16,6 +16,14 @@ require 'option_initializer'
 class Person
   include OptionInitializer
   option_initializer :id, :name, :age, :greetings
+  option_validator do |k, v|
+    case k
+    when :age
+      raise ArgumentError, "invalid age" if age < 0
+    when :name
+      raise ArgumentError, "invalid name" if name.empty?
+    end
+  end
 
   def initialize opts
     @options = opts

data/lib/option_initializer.rb

@@ -6,7 +6,10 @@ module OptionInitializer
       attr_reader :options
       alias to_h options
 
+      const_set :VALIDATORS, []
+
       def initialize base, options
+        validate options
         @base    = base
         @options = options
       end
@@ -17,6 +20,7 @@ module OptionInitializer
 
         # Convention. Deal with it.
         if args.last.is_a?(Hash)
+          validate args.last
           args[-1] = opts.merge(args.last)
         else
           args << opts.dup
@@ -26,9 +30,18 @@ module OptionInitializer
       end
 
       def merge opts
+        validate opts
         self.class.new @base, @options.merge(opts)
       end
 
+      def validate hash
+        self.class.const_get(:VALIDATORS).each do |validator|
+          hash.each do |k, v|
+            validator.call k, v
+          end
+        end
+      end
+
       def method_missing sym, *args, &block
         # 1.8
         if @base.instance_methods.map(&:to_sym).include?(sym)
@@ -41,10 +54,18 @@ module OptionInitializer
 
     base.class_eval do
       class << self
-        if method_defined?(:option_initializer)
-          undef_method(:option_initializer)
+        [:option_initializer, :option_validator].each do |m|
+          undef_method(m) if method_defined?(m)
         end
       end
+
+      def base.option_validator &block
+        raise ArgumentError, "block must be given" unless block
+        raise ArgumentError, "invalid arity (expected: 2)" unless block.arity == 2
+        oi = self.const_get(:OptionInitializing)
+        oi.const_get(:VALIDATORS).push block
+      end
+
       def base.option_initializer *syms
         oi = self.const_get(:OptionInitializing)
 

data/lib/option_initializer/version.rb

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

data/test/test_option_initializer.rb

@@ -26,6 +26,18 @@ class MyClass2
   include OptionInitializer
 
   option_initializer :aaa, :bbb, :ccc
+  option_validator do |k, v|
+    case k
+    when :aaa
+      raise ArgumentError if v == 0
+    end
+  end
+  option_validator do |k, v|
+    case k
+    when :aaa
+      raise ArgumentError if v < 0
+    end
+  end
 
   def initialize options
     @options = options
@@ -87,6 +99,14 @@ class TestOptionInitializer < MiniTest::Unit::TestCase
     assert_equal 2, MyClass2.aaa(1).bbb(2).echo(1) { |a| a * 2 }
   end
 
+  def test_validator
+    assert_raises(ArgumentError) { MyClass2.aaa(0) }
+    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) }
+  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}!" }

metadata

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