striuct 0.3.3 → 0.3.4

data/test/test_striuct-subclass-class-inheritable.rb

@@ -1,58 +1,58 @@
-require_relative 'helper'
-
-class Test_Striuct_Subclass_Class_Inheritable < Test::Unit::TestCase
-
-  Sth = Striuct.define do
-    member :foo, String
-    member :bar, OR(nil, Fixnum)
-  end
-  
-  class SubSth < Sth
-    member :hoge, OR(nil, 1..3)
-  end
-  
-  class SubSubSth < SubSth
-    member :rest, AND(/\d/, Symbol)
-  end
-  
-  def test_inherit
-    assert_equal [*Sth.members, :hoge], SubSth.members
-    sth = Sth.new
-    substh = SubSth.new
-
-    assert_raises Validation::InvalidWritingError do
-      substh.bar = 'str'
-    end
-    
-    assert_raises Validation::InvalidWritingError do
-      substh.hoge = 4
-    end
-    
-    assert_raises NoMethodError do
-      sth.hoge = 3
-    end
-    
-    assert_raises NoMethodError do
-      substh.rest = :a4
-    end
-    
-    subsubsth = SubSubSth.new
-    
-    assert_raises Validation::InvalidWritingError do
-      subsubsth.rest = 4
-    end
-    
-    subsubsth.rest = :a4
-    
-    assert_equal :a4, subsubsth[:rest]
-    
-    assert_equal true, Sth.__send__(:closed?)
-    assert_equal false, SubSth.__send__(:closed?)
-    SubSth.__send__(:close)
-    assert_equal true, SubSth.__send__(:closed?)
-    assert_equal false, SubSubSth.__send__(:closed?)
-    SubSubSth.__send__(:close)
-    assert_equal true, SubSubSth.__send__(:closed?)
-  end
-
+require_relative 'helper'
+
+class Test_Striuct_Subclass_Class_Inheritable < Test::Unit::TestCase
+
+  Sth = Striuct.define do
+    member :foo, String
+    member :bar, OR(nil, Fixnum)
+  end
+  
+  class SubSth < Sth
+    member :hoge, OR(nil, 1..3)
+  end
+  
+  class SubSubSth < SubSth
+    member :rest, AND(/\d/, Symbol)
+  end
+  
+  def test_inherit
+    assert_equal [*Sth.members, :hoge], SubSth.members
+    sth = Sth.new
+    substh = SubSth.new
+
+    assert_raises Validation::InvalidWritingError do
+      substh.bar = 'str'
+    end
+    
+    assert_raises Validation::InvalidWritingError do
+      substh.hoge = 4
+    end
+    
+    assert_raises NoMethodError do
+      sth.hoge = 3
+    end
+    
+    assert_raises NoMethodError do
+      substh.rest = :a4
+    end
+    
+    subsubsth = SubSubSth.new
+    
+    assert_raises Validation::InvalidWritingError do
+      subsubsth.rest = 4
+    end
+    
+    subsubsth.rest = :a4
+    
+    assert_equal :a4, subsubsth[:rest]
+    
+    assert_equal true, Sth.__send__(:closed?)
+    assert_equal false, SubSth.__send__(:closed?)
+    SubSth.__send__(:close)
+    assert_equal true, SubSth.__send__(:closed?)
+    assert_equal false, SubSubSth.__send__(:closed?)
+    SubSubSth.__send__(:close)
+    assert_equal true, SubSubSth.__send__(:closed?)
+  end
+
 end

data/test/test_striuct-subclass-class-macro.rb

@@ -1,13 +1,13 @@
-require_relative 'helper'
-
-class Test_Striuct_Subclass_Class_Macro < Test::Unit::TestCase
-  
-  def test_add_members
-    klass = Striuct.new :foo do
-      add_members :aaa, 'bbb', :ccc
-    end
-    
-    assert_equal [:foo, :aaa, :bbb, :ccc], klass.members
-  end
-
-end  
+require_relative 'helper'
+
+class Test_Striuct_Subclass_Class_Macro < Test::Unit::TestCase
+  
+  def test_add_members
+    klass = Striuct.new :foo do
+      add_members :aaa, 'bbb', :ccc
+    end
+    
+    assert_equal [:foo, :aaa, :bbb, :ccc], klass.members
+  end
+
+end  

data/test/test_striuct-subclass-class-safety_naming.rb

@@ -1,72 +1,72 @@
-require_relative 'helper'
-
-class Test_Striuct_Subclass_Class_SafetyNaming < Test::Unit::TestCase
-
-  def test_cname?
-    klass = Striuct.new
-    assert_same false, klass.cname?(Object)
-    assert_same false, klass.cname?('m?')
-    assert_same false, klass.cname?('__foo__')
-    assert_same false, klass.cname?('a b')
-    assert_same false, klass.cname?('object_id')
-    assert_same false, klass.cname?('to_ary')
-    assert_same true, klass.cname?('foo')
-    klass.__send__ :protect_level, :warning
-    assert_same false, klass.cname?('m?')
-    assert_same false, klass.cname?('__foo__')
-    assert_same false, klass.cname?('a b')
-    assert_same false, klass.cname?('object_id')
-    assert_same false, klass.cname?('to_ary')
-    assert_same true, klass.cname?('foo')
-    klass.__send__ :protect_level, :struct
-    assert_same true, klass.cname?('m?')
-    assert_same true, klass.cname?('__foo__')
-    assert_same true, klass.cname?('a b')
-    assert_same true, klass.cname?('object_id')
-    assert_same true, klass.cname?('to_ary')
-    assert_same true, klass.cname?('foo')
-  end
-  
-  def test_protect
-    klass = Striuct.new
-    assert_raises NameError do
-      klass.class_eval do
-        member ''
-      end
-    end
-    
-    assert_raises NameError do
-      klass.class_eval do
-        member :'a b'
-      end
-    end
-
-    assert_raises NameError do
-      klass.class_eval do
-        member :'__send__'
-      end
-    end
-
-    assert_raises NameError do
-      klass.class_eval do
-        member :'__foo__'
-      end
-    end
-    
-    assert_raises NameError do
-      klass.class_eval do
-        member :'m?'
-      end
-    end
-  
-    assert_same false, klass.member?('m?')
-    
-    klass.class_eval do
-      protect_level :struct
-      member :'m?'
-    end
-    
-    assert_same true, klass.member?('m?')
-  end
-
-end
+require_relative 'helper'
+
+class Test_Striuct_Subclass_Class_SafetyNaming < Test::Unit::TestCase
+
+  def test_cname?
+    klass = Striuct.new
+    assert_same false, klass.cname?(Object)
+    assert_same false, klass.cname?('m?')
+    assert_same false, klass.cname?('__foo__')
+    assert_same false, klass.cname?('a b')
+    assert_same false, klass.cname?('object_id')
+    assert_same false, klass.cname?('to_ary')
+    assert_same true, klass.cname?('foo')
+    klass.__send__ :protect_level, :warning
+    assert_same false, klass.cname?('m?')
+    assert_same false, klass.cname?('__foo__')
+    assert_same false, klass.cname?('a b')
+    assert_same false, klass.cname?('object_id')
+    assert_same false, klass.cname?('to_ary')
+    assert_same true, klass.cname?('foo')
+    klass.__send__ :protect_level, :struct
+    assert_same true, klass.cname?('m?')
+    assert_same true, klass.cname?('__foo__')
+    assert_same true, klass.cname?('a b')
+    assert_same true, klass.cname?('object_id')
+    assert_same true, klass.cname?('to_ary')
+    assert_same true, klass.cname?('foo')
+  end
+  
+  def test_protect
+    klass = Striuct.new
+    assert_raises NameError do
+      klass.class_eval do
+        member ''
+      end
+    end
+    
+    assert_raises NameError do
+      klass.class_eval do
+        member :'a b'
+      end
+    end
+
+    assert_raises NameError do
+      klass.class_eval do
+        member :'__send__'
+      end
+    end
+
+    assert_raises NameError do
+      klass.class_eval do
+        member :'__foo__'
+      end
+    end
+    
+    assert_raises NameError do
+      klass.class_eval do
+        member :'m?'
+      end
+    end
+  
+    assert_same false, klass.member?('m?')
+    
+    klass.class_eval do
+      protect_level :struct
+      member :'m?'
+    end
+    
+    assert_same true, klass.member?('m?')
+  end
+
+end

data/test/test_striuct-subclass-class-validation.rb

@@ -1,26 +1,26 @@
-require_relative 'helper'
-
-class Test_Striuct_Subclass_Class_Validation < 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_restrict?
-    klass = Striuct.new :foo do
-      member :var, //
-      member :hoge
-      member :moge, nil
-    end
-    
-    assert_equal false, klass.restrict?(:foo)
-    assert_equal true, klass.restrict?(:var)
-    assert_equal false, klass.restrict?(:hoge)
-    assert_equal true, klass.restrict?(:moge)
-  end
-
-end  
+require_relative 'helper'
+
+class Test_Striuct_Subclass_Class_Validation < 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_restrict?
+    klass = Striuct.new :foo do
+      member :var, //
+      member :hoge
+      member :moge, nil
+    end
+    
+    assert_equal false, klass.restrict?(:foo)
+    assert_equal true, klass.restrict?(:var)
+    assert_equal false, klass.restrict?(:hoge)
+    assert_equal true, klass.restrict?(:moge)
+  end
+
+end  

data/test/test_striuct-subclass-feature-alias_member.rb

@@ -1,54 +1,54 @@
-require_relative 'helper'
-
-class Test_Striuct_Subclass_AliasMember < Test::Unit::TestCase
-
-  class Sth < Striuct.new
-    member :foo, String
-    
-    member :bar, Integer do |v|
-      v
-    end
-    
-    member :hoge, Symbol
-    default :hoge, :'Z'
-    alias_member :abc, :bar
-    default :abc, 8
-  end
-
-  def test_alias_member
-    sth = Sth.new 'A'
-    assert_equal [:foo, :bar, :hoge], sth.members
-    assert_equal [:foo, :bar, :hoge], sth.autonyms
-    assert_equal({abc: :bar}, sth.aliases)
-    assert_equal [:foo, :bar, :hoge, :abc], sth.all_members
-
-    assert_equal 8, sth[:abc]
-    adjuster = Sth.__send__(:adjuster_for, :abc)
-    assert_kind_of Proc, adjuster
-    assert_same adjuster, Sth.__send__(:adjuster_for, :bar)
-    assert_equal 8, sth.abc
-    sth.abc = 5
-    assert_equal 5, sth.bar
-    sth[:abc] = 6
-    assert_equal 6, sth.bar
-    
-    assert_raises Validation::InvalidWritingError do
-      sth[:abc] = 'a'
-    end
-    
-    assert_raises Validation::InvalidWritingError do
-      sth.abc = 'a'
-    end
-    
-    assert_raises Validation::InvalidWritingError do
-      sth.bar = 'a'
-    end
-    
-    assert_raises ArgumentError do
-      Sth.class_eval do
-        member :abc
-      end
-    end
-  end
-
+require_relative 'helper'
+
+class Test_Striuct_Subclass_AliasMember < Test::Unit::TestCase
+
+  class Sth < Striuct.new
+    member :foo, String
+    
+    member :bar, Integer do |v|
+      v
+    end
+    
+    member :hoge, Symbol
+    default :hoge, :'Z'
+    alias_member :abc, :bar
+    default :abc, 8
+  end
+
+  def test_alias_member
+    sth = Sth.new 'A'
+    assert_equal [:foo, :bar, :hoge], sth.members
+    assert_equal [:foo, :bar, :hoge], sth.autonyms
+    assert_equal({abc: :bar}, sth.aliases)
+    assert_equal [:foo, :bar, :hoge, :abc], sth.all_members
+
+    assert_equal 8, sth[:abc]
+    adjuster = Sth.__send__(:adjuster_for, :abc)
+    assert_kind_of Proc, adjuster
+    assert_same adjuster, Sth.__send__(:adjuster_for, :bar)
+    assert_equal 8, sth.abc
+    sth.abc = 5
+    assert_equal 5, sth.bar
+    sth[:abc] = 6
+    assert_equal 6, sth.bar
+    
+    assert_raises Validation::InvalidWritingError do
+      sth[:abc] = 'a'
+    end
+    
+    assert_raises Validation::InvalidWritingError do
+      sth.abc = 'a'
+    end
+    
+    assert_raises Validation::InvalidWritingError do
+      sth.bar = 'a'
+    end
+    
+    assert_raises ArgumentError do
+      Sth.class_eval do
+        member :abc
+      end
+    end
+  end
+
 end

data/test/test_striuct-subclass-feature-to_struct.rb

@@ -1,25 +1,61 @@
-require_relative 'helper'
-
-class Test_Striuct_Subclass_to_Struct < Test::Unit::TestCase
-
-  Sth = Striuct.define do
-    member :name, String
-    member :age, Integer
-  end
-  
-  def test_to_struct_class
-    klass = Sth.to_struct_class
-    assert_equal 'Striuct::Structs::Sth', klass.to_s
-    assert_same klass, Sth.to_struct_class
-    assert_kind_of Struct, Sth.new.to_struct
-    assert_kind_of Striuct::Structs::Sth, Sth.new.to_struct
-    
-    assert_raises RuntimeError do
-      Striuct.new.new.to_struct
-    end
-    
-    Striuct.new(:a, :b, :c).new.to_struct
-    assert_equal 1, Striuct::Structs.constants.length
-  end
-
-end
+require_relative 'helper'
+
+TopLevelSthForTest_to_Struct = Striuct.define do
+  member :name, String
+  member :age, Integer
+end
+
+class Test_Striuct_Subclass_to_Struct < Test::Unit::TestCase
+
+  NestedSth = Striuct.define do
+    member :name, String
+    member :age, Integer
+  end
+  
+  def teardown
+    constants = Striuct::Structs.constants
+    constants.each do |cons|
+      Striuct::Structs.__send__ :remove_const, cons
+    end
+  end
+  
+  alias_method :setup, :teardown
+  
+  def test_raise
+    assert_raises RuntimeError do
+      Striuct.new.new.to_struct
+    end
+  end
+  
+  def test_noname
+    assert_same 0, Striuct::Structs.constants.length
+    struct_cls = Striuct.new(:a, :b, :c).new.to_struct
+    assert_equal [:a, :b, :c], struct_cls.members
+    assert_same 0, Striuct::Structs.constants.length
+  end
+  
+  def test_to_nested_struct
+    assert_same 0, Striuct::Structs.constants.length
+    struct_cls = NestedSth.to_struct_class
+    assert_same Struct, struct_cls.superclass
+    assert_equal [:name, :age], struct_cls.members
+    assert_same 1, Striuct::Structs.constants.length
+    assert_equal 'Striuct::Structs::NestedSth', struct_cls.name
+    assert_same struct_cls, NestedSth.to_struct_class
+    assert_kind_of Struct, NestedSth.new.to_struct
+    assert_instance_of Striuct::Structs::NestedSth, NestedSth.new.to_struct
+  end
+  
+  def test_to_toplevel_struct
+    assert_same 0, Striuct::Structs.constants.length
+    struct_cls = TopLevelSthForTest_to_Struct.to_struct_class
+    assert_same Struct, struct_cls.superclass
+    assert_equal [:name, :age], struct_cls.members
+    assert_same 1, Striuct::Structs.constants.length
+    assert_equal 'Striuct::Structs::TopLevelSthForTest_to_Struct', struct_cls.name
+    assert_same struct_cls, TopLevelSthForTest_to_Struct.to_struct_class
+    assert_kind_of Struct, TopLevelSthForTest_to_Struct.new.to_struct
+    assert_instance_of Striuct::Structs::TopLevelSthForTest_to_Struct, TopLevelSthForTest_to_Struct.new.to_struct
+  end
+
+end

data/test/test_striuct-subclass-feature-validation_util.rb

@@ -0,0 +1,57 @@
+require_relative 'helper'
+
+class Test_Striuct_Subclass_Validation_Util < Test::Unit::TestCase
+
+  ALWAYS_OCCUR_ERROR = ->_{raise Exception}
+  peep = nil
+  
+  Foo = Striuct.define do
+    member :foo, nil
+    member :bar, ALWAYS_OCCUR_ERROR
+    member :hoge
+    peep = AND(String, /./)
+    member :some_str, peep
+  end
+
+  SOME_STR = peep
+
+  def test_predicate_restrict?
+    assert_same true, Foo.restrict?(:foo)
+    assert_same true, Foo.restrict?(:bar)
+    assert_same false, Foo.restrict?(:hoge)
+    assert_same true, Foo.new.restrict?(:foo)
+    assert_same true, Foo.new.restrict?(:bar)
+    assert_same false, Foo.new.restrict?(:hoge)
+  end
+
+  def test_predicate_has_condition?
+    assert_same true, Foo.has_condition?(:foo)
+    assert_same true, Foo.has_condition?(:bar)
+    assert_same false, Foo.has_condition?(:hoge)
+    assert_same true, Foo.new.has_condition?(:foo)
+    assert_same true, Foo.new.has_condition?(:bar)
+    assert_same false, Foo.new.has_condition?(:hoge)
+  end
+
+  def test_predicate_instance_sufficient?
+    foo = Foo.new
+    assert_same true, foo.sufficient?(:foo)
+    assert_same false, foo.sufficient?(:bar)
+    assert_same true, foo.sufficient?(:hoge)
+    assert_same false, foo.sufficient?(:some_str)
+    foo.some_str = ':)'
+    assert_same true, foo.sufficient?(:some_str)
+    foo.some_str.clear
+    assert_same false, foo.sufficient?(:some_str)
+  end
+
+  def test_condition_for
+    foo = Foo.new
+    assert_same nil, foo.condition_for(:foo)
+    assert_same ALWAYS_OCCUR_ERROR, foo.condition_for(:bar)
+    assert_same nil, foo.condition_for(:hoge)
+    assert_same SOME_STR, foo.condition_for(:some_str)
+  end
+
+
+end