striuct 0.2.3 → 0.3.0

data/History.rdoc

@@ -1,3 +1,8 @@
+=== 0.3.0 2012-4-3
+
+* modify:
+  * use validation library (spin-off library)
+
 === 0.2.3 2012-4-2
 
 * fix:

data/Manifest.txt

@@ -7,15 +7,12 @@ LICENSE
 lib/striuct.rb
 lib/striuct/version.rb
 lib/striuct/abstract.rb
-lib/striuct/conditions.rb
-lib/striuct/flavors.rb
 lib/striuct/containable.rb
 lib/striuct/containable/classutil.rb
 lib/striuct/containable/basic.rb
 lib/striuct/containable/safety.rb
 lib/striuct/containable/handy.rb
 lib/striuct/containable/hashlike.rb
-lib/striuct/containable/yaml.rb
 lib/striuct/containable/inner.rb
 lib/striuct/containable/eigen.rb
 lib/striuct/containable/eigen/basic.rb

data/Rakefile

@@ -13,6 +13,7 @@ $hoe = Hoe.spec 'striuct' do
   developer 'Kenichi Kamiya', 'kachick1+ruby@gmail.com'
   self.rubyforge_name       = self.name
   require_ruby_version '>= 1.9.2'
+  dependency 'validation', '~> 0.0.3', :runtime
   dependency 'yard', '~> 0.7.5', :development
 end
 

data/lib/striuct/containable/basic.rb

@@ -63,7 +63,7 @@ class Striuct; module Containable
   def []=(key, value)
     true_name = nil
     __subscript__(key){|name|true_name = name; __set__ name, value}
-  rescue ConditionError
+  rescue Validation::InvalidWritingError
     $@ = [
       "#{$@[-1].sub(/[^:]+\z/){''}}in `[#{key.inspect}(#{true_name})]=': #{$!.message}",
       $@[-1]

data/lib/striuct/containable/eigen/constructor.rb

@@ -47,7 +47,7 @@ class Striuct; module Containable; module Eigen
       if strict &&
         ! (invalids = each_name.select{|name|! instance.valid?(name)}).empty?
 
-        raise ConditionError, "invalids members are, yet '#{invalids.inspect} in #{self}'"
+        raise Validation::InvalidWritingError, "invalids members are, yet '#{invalids.inspect} in #{self}'"
       end
 
       instance.lock if lock

data/lib/striuct/containable/eigen/inner.rb

@@ -145,7 +145,7 @@ class Striuct; module Containable; module Eigen
   end
 
   def __setter__!(name, condition, &flavor)
-    __set_condition__! name, condition unless ANYTHING.equal? condition
+    __set_condition__! name, condition unless Validation::Condition::ANYTHING.equal? condition
     __set_flavor__! name, &flavor if block_given?
 
     define_method "#{name}=" do |value|
@@ -157,7 +157,7 @@ class Striuct; module Containable; module Eigen
   end
   
   def __set_condition__!(name, condition)
-    if conditionable? condition
+    if ::Validation.conditionable? condition
       _set_condition name, condition
     else
       raise TypeError, 'wrong object for condition'
@@ -167,7 +167,7 @@ class Striuct; module Containable; module Eigen
   end
 
   def __set_flavor__!(name, &flavor)
-    if (arity = flavor.arity) == 1
+    if ::Validation.adjustable? flavor
       _set_flavor name, flavor
     else
       raise ArgumentError, "wrong number of block argument #{arity} for 1"
@@ -184,7 +184,7 @@ class Striuct; module Containable; module Eigen
                                    member?(name) and
                                    _caller.instance_of?(self)
 
-    raise ArgumentError unless conditionable? family
+    raise ArgumentError unless Validation.conditionable? family
 
     _set_condition name, family
     _remove_inference name

data/lib/striuct/containable/eigen/macro.rb

@@ -29,7 +29,7 @@ class Striuct; module Containable; module Eigen
   # @param [#===, Proc, Method, ANYTHING] condition
   # @param [Hash] options
   # @return [nil]
-  def add_member(name, condition=ANYTHING, options=DEFAULT_MEMBER_OPTIONS, &flavor)
+  def add_member(name, condition=Validation::Condition::ANYTHING, options=DEFAULT_MEMBER_OPTIONS, &flavor)
     raise "already closed to add member in #{self}" if closed?
     options = DEFAULT_MEMBER_OPTIONS.merge options
     raise ArgumentError, 'invalid option parameter is' unless (options.keys - VALID_MEMBER_OPTIONS).empty?

data/lib/striuct/containable/eigen.rb

@@ -1,13 +1,7 @@
-require_relative '../conditions'
-require_relative '../flavors'
-
 class Striuct; module Containable
 
 # @author Kenichi Kamiya
-module Eigen  
-  include Conditions
-  include Flavors
-  
+module Eigen
   NAMING_RISKS = {
     conflict:      10,
     no_identifier:  9,

data/lib/striuct/containable/inner.rb

@@ -17,7 +17,7 @@ class Striuct; module Containable
     value = @db[name]
   
     if safety_getter?(name) and !accept?(name, value)
-      raise ConditionError,
+      raise ::Validation::InvalidReadingError,
             "#{value.inspect} is deficient for #{name} in #{self.class}"
     end
 
@@ -33,12 +33,12 @@ class Striuct; module Containable
       begin
         value = instance_exec value, &flavor_for(name)
       rescue Exception
-        raise ConditionError
+        raise ::Validation::UnmanagebleError
       end
     end
 
     if safety_setter?(name) and !accept?(name, value)
-      raise ConditionError,
+      raise ::Validation::InvalidWritingError,
             "#{value.inspect} is deficient for #{name} in #{self.class}"
     end
 
@@ -47,7 +47,7 @@ class Striuct; module Containable
     end
     
     @db[name] = value
-  rescue ConditionError
+  rescue ::Validation::InvalidError
     unless /in \[\]=/ =~ caller[1].slice(/([^:]+)\z/)
       $@.delete_if{|s|/#{Regexp.escape(File.dirname __FILE__)}/ =~ s}
       $@.first.sub!(/([^:]+)\z/){"in `#{name}='"}

data/lib/striuct/containable/safety.rb

@@ -5,21 +5,6 @@ class Striuct; module Containable
   delegate_class_methods :restrict?, :has_condition?,
     :safety_getter?, :safety_reader?, :safety_setter?, :safty_writer?, :inference?
 
-  # @param [Object] value
-  # @param [Proc, Method, #===] condition
-  def pass?(value, condition)
-    case condition
-    when Conditions::ANYTHING
-      true
-    when Proc
-      instance_exec value, &condition
-    when Method
-      condition.call value
-    else
-      condition === value
-    end ? true : false
-  end
-
   # @param [Symbol, String] name
   # @param [Object] value - no argument and use own
   # passed under any condition
@@ -27,7 +12,7 @@ class Striuct; module Containable
     name = originalkey_for(keyable_for name)
     return true unless restrict? name
     
-    pass? value, condition_for(name)
+    _valid? condition_for(name), value
   end
   
   alias_method :accept?, :sufficient?

data/lib/striuct/containable.rb

@@ -35,5 +35,4 @@ require_relative 'containable/basic'
 require_relative 'containable/safety'
 require_relative 'containable/handy'
 require_relative 'containable/hashlike'
-require_relative 'containable/yaml'
 require_relative 'containable/inner'

data/lib/striuct/version.rb

@@ -1,4 +1,4 @@
 class Striuct
-  VERSION = '0.2.3'.freeze
+  VERSION = '0.3.0'.freeze
   Version = VERSION
 end

data/lib/striuct.rb

@@ -2,11 +2,13 @@
 # Striuct
 #   Provides a Struct++ class.
 
+require 'validation'
+
 # @author Kenichi Kamiya
 # @abstract
 class Striuct
-  class ConditionError < ArgumentError; end
-  
+  include Validation
+
   # namespace for .to_struct_class, #to_struct
   module Structs
   end

data/test/test_helper.rb

@@ -1,3 +1,2 @@
-require 'stringio'
 require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/striuct'
+require_relative '../lib/striuct'

data/test/test_striuct.rb

@@ -1,15 +1,15 @@
 $VERBOSE = true
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class User < Striuct.new
-  member :id, Integer
-  member :last_name, /\A\w+\z/
-  member :family_name, /\A\w+\z/
-  member :address, /\A((\w+) ?)+\z/
-  member :age, ->age{(20..140).include? age}
-end
+require_relative 'test_helper'
 
 class TestStriuctSubclassEigen < Test::Unit::TestCase
+  class User < Striuct.new
+    member :id, Integer
+    member :last_name, /\A\w+\z/
+    member :family_name, /\A\w+\z/
+    member :address, /\A((\w+) ?)+\z/
+    member :age, ->age{(20..140).include? age}
+  end
+  
   User2 = Striuct.define do
     member :name, AND(String, NOT(''))
     member :age, Fixnum
@@ -55,7 +55,7 @@ class TestStriuctSubclassEigen < Test::Unit::TestCase
     assert_same false, user.lock?
     assert_equal true, user.strict?
     
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       User2.define{|r|r.age = 1; r.name = 'a'; r.name.clear}
     end
     
@@ -87,6 +87,14 @@ class TestStriuctSubclassEigen < Test::Unit::TestCase
 end  
 
 class TestStriuctSubclassInstance1 < Test::Unit::TestCase
+  class User < Striuct.new
+    member :id, Integer
+    member :last_name, /\A\w+\z/
+    member :family_name, /\A\w+\z/
+    member :address, /\A((\w+) ?)+\z/
+    member :age, ->age{(20..140).include? age}
+  end
+
   def test_setter
     user = User.new
     user[:last_name] = 'foo'
@@ -94,15 +102,15 @@ class TestStriuctSubclassInstance1 < Test::Unit::TestCase
     user.last_name = 'bar'
     assert_equal user[:last_name], 'bar'
     
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       user[:last_name] = 'foo s'
     end
   
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       User.new 'asda'
     end
     
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       user.age = 19
     end
   end
@@ -117,6 +125,14 @@ class TestStriuctSubclassInstance1 < Test::Unit::TestCase
 end
 
 class TestStriuctSubclassInstance2 < Test::Unit::TestCase
+  class User < Striuct.new
+    member :id, Integer
+    member :last_name, /\A\w+\z/
+    member :family_name, /\A\w+\z/
+    member :address, /\A((\w+) ?)+\z/
+    member :age, ->age{(20..140).include? age}
+  end
+  
   def setup
     @user = User.new 9999, 'taro', 'yamada', 'Tokyo Japan', 30
   end
@@ -137,15 +153,15 @@ class TestStriuctSubclassInstance2 < Test::Unit::TestCase
   end
   
   def test_setter_fail
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       @user.id = 2139203509295.0
     end
 
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       @user.last_name = 'ignore name'
     end
     
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       @user.age = 19
     end
   end
@@ -161,6 +177,14 @@ class TestStriuctSubclassInstance2 < Test::Unit::TestCase
 end
 
 class TestStriuctSubclassInstance3 < Test::Unit::TestCase
+  class User < Striuct.new
+    member :id, Integer
+    member :last_name, /\A\w+\z/
+    member :family_name, /\A\w+\z/
+    member :address, /\A((\w+) ?)+\z/
+    member :age, ->age{(20..140).include? age}
+  end
+
   def setup
     @user = User.new 9999, 'taro', 'yamada', 'Tokyo Japan', 30
     @user2 = User.new 9999, 'taro', 'yamada', 'Tokyo Japan', 30
@@ -282,7 +306,7 @@ class TestStriuctSubclassInstance4 < Test::Unit::TestCase
     @sth.bool = false
     assert_same false, @sth.bool
     
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       @sth.bool = nil
     end
     
@@ -295,11 +319,11 @@ class TestStriuctSubclassInstance4 < Test::Unit::TestCase
     @sth.sth = Class.class
     assert_same Class.class, @sth.sth
     
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       @sth.lambda = 9
     end
     
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       @sth.lambda = 7
     end
     
@@ -359,7 +383,7 @@ class TestStriuctProcedure < Test::Unit::TestCase
     @sth.age = 10.0
     assert_same 10, @sth.age
 
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::UnmanagebleError do
       @sth.age = '10.0'
     end
     
@@ -396,7 +420,7 @@ class TestStriuctDefaultValue < Test::Unit::TestCase
       default :lank2, '10'
     end
 
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       klass.new
     end
     
@@ -419,7 +443,7 @@ class TestStriuctDefaultValue < Test::Unit::TestCase
       default :lank, &->own, name{(seef = own); rand}
     end
     
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       klass.new
     end
     
@@ -445,7 +469,7 @@ class TestStriuctFunctionalCondition < Test::Unit::TestCase
     sth.lank = 2
     assert_equal 2, sth.lank
     
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       sth.lank = 31
     end
   end
@@ -461,7 +485,7 @@ class TestStriuctFunctionalCondition < Test::Unit::TestCase
     sth.lank = 8
     assert_equal 8, sth.lank
     
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       sth.lank = 2
     end
   end
@@ -475,7 +499,7 @@ class TestStriuctFunctionalCondition < Test::Unit::TestCase
     sth.lank = 8
     assert_equal 8, sth.lank
     
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       sth.lank = 6
     end
   end
@@ -645,12 +669,12 @@ class TestStriuctInference < Test::Unit::TestCase
   def test_inference
     klass = Striuct.define do
       member :n, Numeric, inference: true
-      member :m, anything, inference: true
+      member :m, ANYTHING?, inference: true
     end
     
     sth, sth2 = klass.new, klass.new
     
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       sth.n = '1'
     end
     
@@ -658,11 +682,11 @@ class TestStriuctInference < Test::Unit::TestCase
     
     assert_equal 1.1, sth.n
     
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       sth.n = 1
     end
     
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       sth2.n = 1
     end
     
@@ -675,11 +699,11 @@ class TestStriuctInference < Test::Unit::TestCase
     
     assert_equal 1, sth2.m
     
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       sth.m = 1.0
     end
     
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       sth2.m = 1.0
     end
     
@@ -894,15 +918,15 @@ class TestStriuctAliasMember < Test::Unit::TestCase
     sth[:abc] = 6
     assert_equal 6, sth.bar
     
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       sth[:abc] = 'a'
     end
     
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       sth.abc = 'a'
     end
     
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       sth.bar = 'a'
     end
     
@@ -917,16 +941,16 @@ end
 class TestStriuctSpecificConditions < Test::Unit::TestCase
   Sth = Striuct.define do
     member :list_only_int, GENERICS(Integer)
-    member :true_or_false, boolean
-    member :like_str, stringable
+    member :true_or_false, BOOL?
+    member :like_str, STRINGABLE?
     member :has_x, CAN(:x)
     member :has_x_and_y, CAN(:x, :y)
     member :one_of_member, MEMBER_OF([1, 3])
     member :has_ignore, AND(1..5, 3..10)
     member :nand, NAND(1..5, 3..10)
     member :all_pass, OR(1..5, 3..10)
-    member :catch_name_error, CATCH(NameError){|v|v.no_name!}
-    member :no_exception, STILL(->v{v.class})
+    member :catch_error, CATCH(NoMethodError){|v|v.no_name!}
+    member :no_exception, QUIET(->v{v.class})
     member :not_integer, NOT(Integer)
   end
 
@@ -938,7 +962,7 @@ class TestStriuctSpecificConditions < Test::Unit::TestCase
     sth.not_integer = obj
     assert_same obj, sth.not_integer
 
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       sth.not_integer = 1
     end
   end
@@ -957,7 +981,7 @@ class TestStriuctSpecificConditions < Test::Unit::TestCase
       undef_method :class
     end
 
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       sth.no_exception = obj
     end
   end
@@ -967,24 +991,24 @@ class TestStriuctSpecificConditions < Test::Unit::TestCase
     
     obj = Object.new
     
-    sth.catch_name_error = obj
-    assert_same obj, sth.catch_name_error
-    sth.catch_name_error = false
+    sth.catch_error = obj
+    assert_same obj, sth.catch_error
+    sth.catch_error = false
 
     obj.singleton_class.class_eval do
       def no_name!
       end
     end
 
-    assert_raises Striuct::ConditionError do
-      sth.catch_name_error = obj
+    assert_raises Validation::InvalidWritingError do
+      sth.catch_error = obj
     end
   end
 
   def test_or
     sth = Sth.new
 
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       sth.all_pass = 11
     end
     
@@ -998,11 +1022,11 @@ class TestStriuctSpecificConditions < Test::Unit::TestCase
   def test_and
     sth = Sth.new
 
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       sth.has_ignore = 1
     end
 
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       sth.has_ignore= 2
     end
   
@@ -1010,7 +1034,7 @@ class TestStriuctSpecificConditions < Test::Unit::TestCase
     assert_equal 3, sth.has_ignore
     assert_equal true, sth.valid?(:has_ignore)
     
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       sth.has_ignore = []
     end
   end
@@ -1018,11 +1042,11 @@ class TestStriuctSpecificConditions < Test::Unit::TestCase
   def test_nand
     sth = Sth.new
 
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       sth.nand = 4
     end
 
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       sth.nand = 4.5
     end
   
@@ -1038,7 +1062,7 @@ class TestStriuctSpecificConditions < Test::Unit::TestCase
   def test_member_of
     sth = Sth.new
     
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       sth.one_of_member = 4
     end
   
@@ -1050,7 +1074,7 @@ class TestStriuctSpecificConditions < Test::Unit::TestCase
   def test_generics
     sth = Sth.new
     
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       sth.list_only_int = [1, '2']
     end
   
@@ -1067,7 +1091,7 @@ class TestStriuctSpecificConditions < Test::Unit::TestCase
   def test_boolean
     sth = Sth.new
     
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       sth.true_or_false = nil
     end
     
@@ -1085,7 +1109,7 @@ class TestStriuctSpecificConditions < Test::Unit::TestCase
     sth = Sth.new
     obj = Object.new
     
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       sth.like_str = obj
     end
   
@@ -1107,7 +1131,7 @@ class TestStriuctSpecificConditions < Test::Unit::TestCase
     sth = Sth.new
     obj = Object.new
     
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       sth.has_x = obj
     end
     
@@ -1125,7 +1149,7 @@ class TestStriuctSpecificConditions < Test::Unit::TestCase
     sth = Sth.new
     obj = Object.new
     
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       sth.has_x_and_y = obj
     end
     
@@ -1134,7 +1158,7 @@ class TestStriuctSpecificConditions < Test::Unit::TestCase
       end
     end
     
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       sth.has_x_and_y = obj
     end
     
@@ -1206,11 +1230,11 @@ class TestStriuctInherit < Test::Unit::TestCase
     sth = Sth.new
     substh = SubSth.new
 
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       substh.bar = 'str'
     end
     
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       substh.hoge = 4
     end
     
@@ -1224,7 +1248,7 @@ class TestStriuctInherit < Test::Unit::TestCase
     
     subsubsth = SubSubSth.new
     
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       subsubsth.rest = 4
     end
     
@@ -1244,7 +1268,7 @@ end
 
 class TestStriuctConstants < Test::Unit::TestCase
   def test_const_version
-    assert_equal '0.2.3', Striuct::VERSION
+    assert_equal '0.3.0', Striuct::VERSION
     assert_equal true, Striuct::VERSION.frozen?
     assert_same Striuct::VERSION, Striuct::Version
   end
@@ -1302,7 +1326,7 @@ class TestStriuctFlavors < Test::Unit::TestCase
   Sth = Striuct.define do
     member :chomped, AND(Symbol, /[^\n]\z/), &WHEN(String, ->v{v.chomp.to_sym})
     member :no_reduced, Symbol, &->v{v.to_sym}
-    member :reduced, Symbol, &FLAVORS(->v{v.to_s}, ->v{v.to_sym})
+    member :reduced, Symbol, &INJECT(->v{v.to_s}, ->v{v.to_sym})
     member :integer, Integer, &PARSE(Integer)
     member :myobj, ->v{v.instance_of? MyClass}, &PARSE(MyClass)
   end
@@ -1310,7 +1334,7 @@ class TestStriuctFlavors < Test::Unit::TestCase
   def test_WHEN
     sth = Sth.new
     
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       sth.chomped = :"a\n"
     end
     
@@ -1322,10 +1346,10 @@ class TestStriuctFlavors < Test::Unit::TestCase
     assert_equal :b, sth.chomped
   end
 
-  def test_REDUCE
+  def test_INJECT
     sth = Sth.new
     
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::UnmanagebleError do
       sth.no_reduced = 1
     end
     
@@ -1337,7 +1361,7 @@ class TestStriuctFlavors < Test::Unit::TestCase
   def test_PARSE
     sth = Sth.new
     
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::UnmanagebleError do
       sth.integer = '1.0'
     end
     
@@ -1345,7 +1369,7 @@ class TestStriuctFlavors < Test::Unit::TestCase
     
     assert_equal 1, sth.integer
     
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::UnmanagebleError do
       sth.myobj = '1'
     end
     
@@ -1365,7 +1389,7 @@ class TestGetterValidation < Test::Unit::TestCase
   def test_getter_validation
     sth = Sth.new
     
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidWritingError do
       sth.plus_getter = ''
     end
     
@@ -1373,13 +1397,13 @@ class TestGetterValidation < Test::Unit::TestCase
     assert_equal 'abc', sth.plus_getter
     sth.plus_getter.clear
     
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidReadingError do
       sth.plus_getter
     end
     
     sth.only_getter = ''
     
-    assert_raises Striuct::ConditionError do
+    assert_raises Validation::InvalidReadingError do
       sth.only_getter
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: striuct
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-01 00:00:00.000000000 Z
+date: 2012-04-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: validation
+  requirement: &25171236 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: *25171236
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &23052000 !ruby/object:Gem::Requirement
+  requirement: &25170780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +32,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *23052000
+  version_requirements: *25170780
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &23051652 !ruby/object:Gem::Requirement
+  requirement: &25169988 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +43,10 @@ dependencies:
         version: 0.7.5
   type: :development
   prerelease: false
-  version_requirements: *23051652
+  version_requirements: *25169988
 - !ruby/object:Gem::Dependency
   name: newgem
-  requirement: &23051292 !ruby/object:Gem::Requirement
+  requirement: &25169484 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: 1.5.3
   type: :development
   prerelease: false
-  version_requirements: *23051292
+  version_requirements: *25169484
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &23050932 !ruby/object:Gem::Requirement
+  requirement: &25168956 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +65,7 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *23050932
+  version_requirements: *25168956
 description: Struct++
 email:
 - kachick1+ruby@gmail.com
@@ -76,15 +87,12 @@ files:
 - lib/striuct.rb
 - lib/striuct/version.rb
 - lib/striuct/abstract.rb
-- lib/striuct/conditions.rb
-- lib/striuct/flavors.rb
 - lib/striuct/containable.rb
 - lib/striuct/containable/classutil.rb
 - lib/striuct/containable/basic.rb
 - lib/striuct/containable/safety.rb
 - lib/striuct/containable/handy.rb
 - lib/striuct/containable/hashlike.rb
-- lib/striuct/containable/yaml.rb
 - lib/striuct/containable/inner.rb
 - lib/striuct/containable/eigen.rb
 - lib/striuct/containable/eigen/basic.rb

data/lib/striuct/conditions.rb

@@ -1,269 +0,0 @@
-class Striuct
-
-  # Condition Builders and Useful Conditions
-  #
-  # Any conditions need #pass?(arg, condition) method
-  # @author Kenichi Kamiya
-  # @example overview
-  #   class Person < Striuct
-  #     member :name, OR(String, Symbol, CAN(:to_str))
-  #     member :friends, GENERICS(AND(Person, NOT(->v{equal? v})))
-  module Conditions
-    ANYTHING = Object.new.freeze
-    BOOLEAN = ->v{[true, false].any?{|bool|bool.equal? v}}
-  
-    module_function
-    
-    # The getter for a special condition.
-    # @return [ANYTHING] A condition always pass with any objects.
-    def ANYTHING?
-      ANYTHING
-    end
-
-    alias_method :ANYTHING, :ANYTHING?  
-    alias_method :anything, :ANYTHING?
-    module_function :anything, :ANYTHING
-
-    # true if object is sufficient for condition.
-    # @param [Object] object
-    def conditionable?(object)
-      case object
-      when ANYTHING
-        true
-      when Proc, Method
-        object.arity == 1
-      else
-        object.respond_to? :===
-      end
-    end
-    
-    # A condition builder.
-    # @return [lambda] A condition invert the original condition.
-    def NOT(condition)
-      unless conditionable? condition
-        raise TypeError, 'wrong object for condition'
-      end
-      
-      ->v{! pass?(v, condition)}
-    end
-
-    # A innner method for some condition builders.
-    # For build conditions AND, NAND, OR, NOR, XOR, XNOR.
-    # @return [lambda] 
-    def _logical_operator(delegated, *conditions)
-      unless conditions.all?{|c|conditionable? c}
-        raise TypeError, 'wrong object for condition'
-      end
-      
-      ->v{
-        conditions.__send__(delegated) {|condition|
-          pass? v, condition
-        }
-      }
-    end
-
-    # A condition builder.
-    # @return [lambda]
-    #   this lambda return true if match all conditions
-    def AND(cond1, cond2, *conds)
-      _logical_operator :all?, cond1, cond2, *conds
-    end
-  
-    # A condition builder.
-    # @return [lambda] 
-    def NAND(cond1, cond2, *conds)
-      NOT AND(cond1, cond2, *conds)
-    end
-
-    # A condition builder.
-    # @return [lambda]
-    #   this lambda return true if match a any condition
-    def OR(cond1, cond2, *conds)
-      _logical_operator :any?, cond1, cond2, *conds
-    end
-
-    # A condition builder.
-    # @return [lambda] 
-    def NOR(cond1, cond2, *conds)
-      NOT OR(cond1, cond2, *conds)
-    end
-
-    # A condition builder.
-    # @return [lambda] 
-    def XOR(cond1, cond2, *conds)
-      _logical_operator :one?, cond1, cond2, *conds
-    end
-    
-    alias_method :ONE, :XOR
-    module_function :ONE
-
-    # A condition builder.
-    # @return [lambda] 
-    def XNOR(cond1, cond2, *conds)
-      NOT XOR(cond1, cond2, *conds)
-    end
-
-    # A condition builder.
-    # @return [lambda]
-    #   this lambda return true if a argment match under #== method
-    def EQUAL(obj)
-      ->v{obj == v}
-    end
-
-    # A condition builder.
-    # @return [lambda]
-    #   this lambda return true if a argment match under #equal? method
-    def SAME(obj)
-      ->v{obj.equal? v}
-    end
-
-    # A condition builder.
-    # @param [Symbol, String] messages
-    # @return [lambda]
-    #   this lambda return true if a argment respond to all messages
-    def RESPONSIBLE(message1, *messages)
-      messages = [message1, *messages]
-      unless messages.all?{|s|
-                [Symbol, String].any?{|klass|s.kind_of? klass}
-              }
-        raise TypeError, 'only Symbol or String for message'
-      end
-      
-      ->v{
-        messages.all?{|message|v.respond_to? message}
-      }
-    end
-
-    alias_method :CAN, :RESPONSIBLE
-    alias_method :RESPOND_TO, :RESPONSIBLE
-    alias_method :responsible, :RESPONSIBLE
-    module_function :CAN, :responsible, :RESPOND_TO
-
-    # A condition builder.
-    # @return [lambda]
-    #   this lambda return true
-    #   if face no exception when a argment checking under all conditions 
-    def NO_RAISES(condition1, *conditions)
-      conditions = [condition1, *conditions]
-      unless conditions.all?{|c|conditionable? c}
-        raise TypeError, 'wrong object for condition'
-      end
-      
-      ->v{
-        conditions.all?{|condition|
-          begin
-            pass? v, condition
-          rescue Exception
-            false
-          else
-            true
-          end
-        }
-      }
-    end
-    
-    alias_method :STILL, :NO_RAISES
-    module_function :STILL
-  
-    # A condition builder.
-    # @return [lambda]
-    #   this lambda return true
-    #   if catch a kindly exception when a argment checking in a block parameter
-    def CATCH(exception=Exception, &condition)
-      raise ArgumentError unless conditionable? condition
-      raise TypeError unless exception.ancestors.include? Exception
-      
-      ->v{
-        begin
-          pass? v, condition
-        rescue exception
-          true
-        rescue Exception
-          false
-        else
-          false
-        end
-      }
-    end
-    
-    alias_method :RESCUE, :CATCH
-    module_function :RESCUE
-
-    # A condition builder.
-    # @return [lambda]
-    #   this lambda return true
-    #   if all included objects match all conditions
-    def GENERICS(condition1, *conditions)
-      conditions = [condition1, *conditions]
-      unless conditions.all?{|c|conditionable? c}
-        raise TypeError, 'wrong object for condition'
-      end
-      
-      ->list{
-        enum = (
-          (list.respond_to?(:each_value) && list.each_value) or
-          (list.respond_to?(:all?) && list) or
-          (list.respond_to?(:each) && list.each) or
-          return false
-        )
-      
-        conditions.all?{|condition|
-          enum.all?{|v|
-            pass? v, condition
-          }
-        }
-      }
-    end
-    
-    alias_method :generics, :GENERICS
-    module_function :generics
-  
-    # A condition builder.
-    # @return [lambda]
-    #   this lambda return true
-    #   if all lists including the object
-    def MEMBER_OF(list1, *lists)
-      lists = [list1, *lists]
-      unless lists.all?{|l|l.respond_to? :all?}
-        raise TypeError, 'list must respond #all?'
-      end
-      
-      ->v{
-        lists.all?{|list|list.include? v}
-      }
-    end
-    
-    alias_method :member_of, :MEMBER_OF
-    module_function :member_of
-
-    # A getter for a useful condition.
-    # @return [BOOLEAN] "true or false"
-    def BOOLEAN?
-      BOOLEAN
-    end
-
-    alias_method :boolean, :BOOLEAN?
-    alias_method :bool, :BOOLEAN?
-    alias_method :BOOLEAN, :BOOLEAN?
-    alias_method :BOOL, :BOOLEAN?
-    alias_method :BOOL?, :BOOLEAN?
-    module_function :boolean, :bool, :BOOLEAN, :BOOL, :BOOL?
-
-    STRINGABLE = OR(String, Symbol, CAN(:to_str), CAN(:to_sym))
-
-    # A getter for a useful condition.
-    # @return [STRINGABLE] check "looks string family"
-    def STRINGABLE?
-      STRINGABLE
-    end
-    
-    alias_method :stringable, :STRINGABLE?
-    alias_method :STRINGABLE, :STRINGABLE?
-    module_function :stringable, :STRINGABLE
-    
-    class << self
-      private :_logical_operator
-    end
-  end
-
-end

data/lib/striuct/containable/yaml.rb

@@ -1,14 +0,0 @@
-autoload :YAML, 'yaml'
-
-class Striuct; module Containable
-  # @group for YAML
-
-  # @return [String]
-  def to_yaml
-    YAML.__id__   # for autoload
-    klass = Struct.new(*members)
-    klass.new(*values).to_yaml
-  end
-  
-  # @endgroup
-end; end

data/lib/striuct/flavors.rb

@@ -1,83 +0,0 @@
-class Striuct
-
-  # Useful Flavor Builders
-  # @author Kenichi Kamiya
-  # @example overview
-  #   class MyClass < Striuct
-  #     member :id, &WHEN(String, PARSE(Integer))
-  module Flavors
-    module_function
-
-    # true if argument is sufficient for flavor.
-    # A flavor have to be arity equal 1.
-    # @param [Object] flavor
-    def adjustable?(flavor)
-      case flavor
-      when Proc
-        flavor.arity == 1
-      else
-        if flavor.respond_to?(:to_proc)
-          flavor.to_proc.arity == 1
-        else
-          false
-        end
-      end
-    end
-    
-    alias_method :flavorable?, :adjustable?
-    
-    # Apply flavor when passed condition.
-    # @return [lambda]
-    def WHEN(condition, flavor)
-      raise TypeError, 'wrong object for condition' unless conditionable? condition
-      raise TypeError, 'wrong object for flavor' unless adjustable? flavor
-      
-      ->v{pass?(v, condition) ? flavor.call(v) : v}
-    end
-    
-    # Sequencial apply all flavors.
-    # @return [lambda]
-    def REDUCE(flavor1, flavor2, *flavors)
-      flavors = [flavor1, flavor2, *flavors]
-
-      unless flavors.all?{|f|adjustable? f}
-        raise TypeError, 'wrong object for flavor'
-      end
-
-      ->v{
-        flavors.reduce(v){|ret, flavor|flavor.call ret}
-      }
-    end
-    
-    alias_method :FLAVORS, :REDUCE
-    alias_method :INJECT, :REDUCE
-
-    # Accept any parser when that resopond to parse method.
-    # @return [lambda]
-    def PARSE(parser)
-      if !::Integer.equal?(parser) and !parser.respond_to?(:parse)
-        raise TypeError, 'wrong object for parser'
-      end
-      
-      ->v{
-        if ::Integer.equal? parser
-          ::Kernel.Integer v
-        else
-          parser.parse(
-            case v
-            when String
-              v
-            when ->_{v.respond_to? :to_str}
-              v.to_str
-            when ->_{v.respond_to? :read}
-              v.read            
-            else
-              raise TypeError, 'wrong object for parsing source'
-            end
-          )
-        end
-      }
-    end
-  end
-
-end