option_initializer 1.5.0 → 1.5.1

data/README.md

@@ -17,10 +17,10 @@ class Person
   include OptionInitializer
 
   option_initializer :id,
-                     :name => String,
+                     :name      => String,
                      :greetings => :&,
-                     :birthday => 1..3,
-                     :sex => Set[:male, :female]
+                     :birthday  => 1..3,
+                     :sex       => Set[:male, :female]
 
   option_validator :name do |v|
     raise ArgumentError, "invalid name" if v.empty?
@@ -78,7 +78,7 @@ class MyClass
                      :c => 1..3,                      # 1, 2, or 3 objects of any type
                      :d => :*,                        # Any number of objects of any type
                      :e => :&,                        # Block
-                     :f => Fixnum,                    # Single Fixnum object
+                     :f => Fixnum | Range,            # Single Fixnum or Range object
                      :g => [Fixnum, String, Symbol],  # Fixnum, String, and Symbol
                      :h => Set[true, false],          # Value must be either true or false
                      :i => [Fixnum, Set[true, false]] # Fixnum and boolean

data/lib/option_initializer.rb

@@ -1,57 +1,94 @@
 require 'option_initializer/version'
 require 'set'
 
-module OptionInitializer
-  class OptionInitializingTemplate
-    attr_reader :options
-    alias to_h options
-
-    def initialize base, options, need_validation
-      validate options if need_validation
-      @base    = base
-      @options = options
+unless Class.respond_to?(:|)
+  class Class
+    def | other_class
+      unless other_class.is_a?(Class)
+        raise TypeError, "wrong argument type (expected: Class)"
+      end
+      OptionInitializer::ClassMatch.new(self, other_class)
     end
+  end
+else
+  Kernel.warn "Class already has `|' method. OptionInitializer will not override its behavior."
+end
 
-    def new *args, &block
-      args = args.dup
-      opts = @options
+# @private
+class OptionInitializingTemplate
+  attr_reader :options
+  alias to_h options
 
-      # Convention. Deal with it.
-      if args.last.is_a?(Hash)
-        validate args.last
-        opts = opts.merge(args.last)
-        args.pop
-      else
-        opts = opts.dup
-      end
+  def initialize base, options, need_validation
+    validate options if need_validation
+    @base    = base
+    @options = options
+  end
 
-      opts.instance_eval do
-        def option_validated?
-          true
-        end
+  def new *args, &block
+    args = args.dup
+    opts = @options
+
+    # Convention. Deal with it.
+    if args.last.is_a?(Hash)
+      validate args.last
+      opts = opts.merge(args.last)
+      args.pop
+    else
+      opts = opts.dup
+    end
+
+    opts.instance_eval do
+      def option_validated?
+        true
       end
-      args << opts
+    end
+    args << opts
 
-      @base.new(*args, &block)
+    @base.new(*args, &block)
+  end
+
+  def merge opts
+    validate opts
+    self.class.new @base, @options.merge(opts), false
+  end
+
+  def validate hash
+    avals, vals = [:ARG_VALIDATORS, :VALIDATORS].map { |s|
+      self.class.const_get(s)
+    }
+    hash.each do |k, v|
+      avals[k]  && avals[k].call(v)
+      vals[k]   && vals[k].call(v)
+      vals[nil] && vals[nil].call(k, v)
     end
+  end
+end
 
-    def merge opts
-      validate opts
-      self.class.new @base, @options.merge(opts), false
+module OptionInitializer
+  class ClassMatch
+    def initialize *classes
+      @classes = Set[*classes]
     end
 
-    def validate hash
-      avals, vals = [:ARG_VALIDATORS, :VALIDATORS].map { |s|
-        self.class.const_get(s)
-      }
-      hash.each do |k, v|
-        avals[k]  && avals[k].call(v)
-        vals[k]   && vals[k].call(v)
-        vals[nil] && vals[nil].call(k, v)
+    def | other_class
+      unless other_class.is_a?(Class)
+        raise TypeError, "wrong argument type (expected: Class)"
       end
+      ClassMatch.new(*@classes.union([other_class]))
+    end
+
+    def match object
+      @classes.any? { |k| object.is_a? k }
+    end
+
+    def to_s
+      a = @classes.map(&:to_s)
+      [a[0...-1].join(', '), a.last].reject(&:empty?).join(', or ')
     end
   end
 
+  # @private
   module MethodCallShortcut
     def method_missing sym, *args, &block
       # 1.8
@@ -79,6 +116,7 @@ module OptionInitializer
     options
   end
 
+  # @private
   def self.included base
     unless base.constants.map(&:to_sym).include?(:OptionInitializing)
       base.const_set :OptionInitializing, oi = OptionInitializingTemplate.dup
@@ -120,9 +158,13 @@ module OptionInitializer
               when Set
                 raise ArgumentError, "empty set of values specified for #{k}" if v.length == 0
               when Array
-                raise ArgumentError, "invalid option definition: `#{v}'" unless v.all? { |e| e.is_a?(Class) || e.is_a?(Set) }
+                unless v.all? { |e| [Class, Set, ClassMatch].any? { |kl| e.is_a?(kl) } }
+                  raise ArgumentError, "invalid option definition: `#{v}'"
+                end
               when Class, :*, :&
                 # noop
+              when ClassMatch
+                # noop
               else
                 raise ArgumentError, "invalid option definition: `#{v}'"
               end
@@ -191,6 +233,10 @@ module OptionInitializer
                     unless c.include?(e)
                       raise ArgumentError, "invalid option value: `#{e}' (expected one of #{c.to_a.inspect})"
                     end
+                  when ClassMatch
+                    unless c.match e
+                      raise TypeError, "wrong argument type #{e.class} (expected #{c})"
+                    end
                   end
                 end
               end
@@ -201,6 +247,12 @@ module OptionInitializer
                 raise TypeError, "wrong argument type #{v.class} (expected #{nargs})"
               end
             }
+          when ClassMatch
+            vals[sym] = proc { |v|
+              unless nargs.match v
+                raise TypeError, "wrong argument type #{v.class} (expected #{nargs})"
+              end
+            }
           end
         end
 
@@ -234,7 +286,7 @@ module OptionInitializer
                 raise ArgumentError, "block not expected"
               else
                 case nargs
-                when 1, Class, Set
+                when 1, Class, Set, ClassMatch
                   if v.length == 1
                     merge(sym => v.first)
                   else

data/lib/option_initializer/version.rb

@@ -1,3 +1,3 @@
 module OptionInitializer
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

data/option_initializer.gemspec

@@ -18,4 +18,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_development_dependency 'simplecov'
+  gem.add_development_dependency 'minitest'
 end

data/test/test_option_initializer.rb

@@ -122,6 +122,19 @@ class MyClassWithTypes
   end
 end
 
+class MyClassWithClassOrOperator
+  include OptionInitializer
+  option_initializer :a => Fixnum | Float | Range,
+                     :b => String,
+                     :c => [String | Symbol, Numeric]
+
+  attr_reader :options
+  def initialize options
+    validate_options options
+    @options = options
+  end
+end
+
 # Excerpt from README
 class Person
   include OptionInitializer
@@ -356,6 +369,21 @@ class TestOptionInitializer < MiniTest::Unit::TestCase
     Person.name('John Doe').birthday(1990, 1, 1).
            greetings { |name| "Hi, I'm #{name}!" }.id(1000).say_hello
   end
+
+  def test_disjunctive_class
+    init = MyClassWithClassOrOperator.a(1).a(1..2).a(3.14).b('hello').c(:hello, 100)
+    [init, init.new].each do |obj|
+      assert_equal 3.14, obj.options[:a]
+      assert_equal 'hello', obj.options[:b]
+      assert_equal [:hello, 100], obj.options[:c]
+    end
+    assert_raises(TypeError) { MyClassWithClassOrOperator.a(:hello) }
+    assert_raises(TypeError) { MyClassWithClassOrOperator.b(1) }
+    assert_raises(TypeError) { MyClassWithClassOrOperator.c(1, 1) }
+    assert_raises(TypeError) { MyClassWithClassOrOperator.new(:a => :hello) }
+    assert_raises(TypeError) { MyClassWithClassOrOperator.new(:b => 1) }
+    assert_raises(TypeError) { MyClassWithClassOrOperator.new(:c => [1, 1]) }
+  end
 end
 
 class MyReadmeClass

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: option_initializer
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Object construction with method chaining
 email:
 - junegunn.c@gmail.com