striuct 0.3.2 → 0.3.3

data/lib/striuct/instancemethods/lock.rb

@@ -13,7 +13,7 @@ class Striuct; module InstanceMethods
     raise "can't modify frozen #{self.class}" if frozen?
     
     if key.equal? true
-      autonyms.each do |autonym|
+      _autonyms.each do |autonym|
         @locks[autonym] = true
       end
     else
@@ -22,11 +22,16 @@ class Striuct; module InstanceMethods
 
     self
   end
-  
-  # @see #lock
+
+  # @overload lock?(key)
+  #   predicate locking a setter for key 
+  #   @param [Symbol, String, Fixnum] key
+  # @overload lock?(true)
+  #   predicate locking for all members
+  #   @param [true] true
   def lock?(key=true)
     if key.equal? true
-      autonyms.all?{|autonym|@locks[autonym]}
+      _autonyms.all?{|autonym|@locks[autonym]}
     else
       __subscript__(key){|autonym|@locks[autonym]} || false
     end
@@ -34,6 +39,12 @@ class Striuct; module InstanceMethods
   
   private
   
+  # @overload unlock(key)
+  #   unlock a setter for key 
+  #   @param [Symbol, String, Fixnum] key
+  # @overload unlock(true)
+  #   unlock setters for all members
+  #   @param [true] true
   def unlock(key=true)
     raise "can't modify frozen #{self.class}" if frozen?
     

data/lib/striuct/instancemethods/object.rb

@@ -9,23 +9,28 @@ class Striuct; module InstanceMethods
   
   # @return [String]
   def inspect
-    "#<#{self.class} (Striuct)".tap {|s|
+    "#<struct' #{self.class} strict?:#{strict?}".tap {|s|
       each_pair do |autonym, value|
-        suffix = (has_default?(autonym) && default?(autonym)) ? '(default)' : nil
-        s << " #{autonym}=#{value.inspect}#{suffix}"
+        suffix = (has_default?(autonym) && default?(autonym)) ? '/default' : nil
+        s << " #{autonym}=#{value.inspect}#{suffix}("
+        s << "valid?:#{valid? autonym}, "
+        s << "lock?:#{lock? autonym}"
+        s << '),'
       end
       
-      s << ">"
+      s.chop!
+      s << '>'
     }
   end
 
   # @return [String]
   def to_s
-    "#<struct #{self.class}".tap {|s|
+    "#<struct' #{self.class}".tap {|s|
       each_pair do |autonym, value|
-        s << " #{autonym}=#{value.inspect}"
+        s << " #{autonym}=#{value.inspect},"
       end
       
+      s.chop!
       s << '>'
     }
   end

data/lib/striuct/instancemethods/requirements.rb

@@ -1,10 +1,10 @@
-require_relative 'singleton_class'
 require_relative 'delegate_class_methods'
+require_relative 'keyvalidatable'
 require_relative 'inner'
 require_relative 'object'
 require_relative 'compare'
 require_relative 'values'
-require_relative 'to_struct'
+require_relative 'cast'
 require_relative 'default'
 require_relative 'enum'
 require_relative 'hashy'

data/lib/striuct/instancemethods/subscript.rb

@@ -40,7 +40,7 @@ class Striuct; module InstanceMethods
         raise NameError
       end
     when Fixnum
-      if autonym = autonyms[key]
+      if autonym = _autonyms[key]
         yield autonym
       else
         raise IndexError

data/lib/striuct/instancemethods/values.rb

@@ -2,13 +2,6 @@ class Striuct; module InstanceMethods
 
   # @group Behavior under Values
 
-  # @return [Array]
-  def values
-    each_value.to_a
-  end
-  
-  alias_method :to_a, :values
-
   # @param [Fixnum, Range] _keys
   # @return [Array]
   def values_at(*_keys)
@@ -39,7 +32,7 @@ class Striuct; module InstanceMethods
       self[index] = value
     end
       
-    excess = autonyms.last(size - values.size)
+    excess = _autonyms.last(size - values.size)
       
     excess.each do |autonym|
       if has_default? autonym

data/lib/striuct/singleton_class.rb

@@ -1,7 +1,7 @@
 require_relative 'instancemethods'
 
 class Striuct
-
+  
   class << self
 
     # @group Constructor
@@ -45,46 +45,19 @@ class Striuct
     private
     
     alias_method :original_inherited, :inherited
-    
-    def inherited(subclass)
-      attributes = (
-        if equal? ::Striuct
-          [[], {}, {}, {}, {}, {}, {}, {}, :prevent]
-        else
-          [
-           *[
-             @autonyms, @conditions, @adjusters, @defaults,
-             @inferences, @aliases, @setter_validations,
-             @getter_validations
-            ].map(&:dup), @protect_level
-          ]
-        end
-      )
-      
-      eigen = self
 
+    def inherited(subclass)
       subclass.class_eval do
         original_inherited subclass
 
-        if ::Striuct.equal? eigen
-          extend ClassMethods
-          include Enumerable
-          include InstanceMethods
-        end
+        extend ClassMethods
+        include Enumerable
+        include InstanceMethods
         
-        @autonyms, @conditions, @adjusters, @defaults,
-        @inferences, @aliases, @setter_validations,
-        @getter_validations, @protect_level = *attributes
-        
-        singleton_class.instance_eval do
-          define_method :initialize_copy do |original|
-            @autonyms, @adjusters, @defaults, @aliases,
-            @setter_validations, @getter_validations = 
-            *[@autonyms, @adjusters, @defaults, @aliases,
-              @setter_validations, @getter_validations].map(&:dup)
-            @conditions, @inferences = @conditions.dup, @inferences.dup
-          end
-        end
+        @autonyms = []
+        @conditions, @adjusters, @defaults, @inferences, @aliases, @setter_validations, @getter_validations = \
+          {}, {}, {}, {}, {}, {}, {}
+        @protect_level = :prevent
       end
     end
 

data/lib/striuct/version.rb

@@ -1,5 +1,5 @@
 class Striuct
 
-  VERSION = '0.3.2'.freeze
+  VERSION = '0.3.3'.freeze
 
 end

data/striuct.gemspec

@@ -16,9 +16,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.version       = Striuct::VERSION.dup # dup for https://github.com/rubygems/rubygems/commit/48f1d869510dcd325d6566df7d0147a086905380#-P0
 
-  gem.required_ruby_version = '>=1.9.2'
-  gem.add_runtime_dependency 'validation', '~>0.0.3.1'
-  gem.add_runtime_dependency 'keyvalidatable', '~>0.0.3'
-  gem.add_development_dependency 'yard', '>=0.8.2.1'
+  gem.required_ruby_version = '>= 1.9.2'
+  gem.add_runtime_dependency 'validation', '~> 0.0.3'
+  gem.add_runtime_dependency 'keyvalidatable', '~> 0.0.3'
+  gem.add_development_dependency 'yard', '>= 0.8.2.1'
 end
 

data/test/{test_striuct_define.rb → test_striuct-singleton_class-define.rb}

@@ -1,6 +1,6 @@
 require_relative 'helper'
 
-class TestStriuctDefine < Test::Unit::TestCase
+class Test_Striuct_Define < Test::Unit::TestCase
 
   def test_define
     assert_raises RuntimeError do

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

@@ -0,0 +1,21 @@
+require_relative 'helper'
+
+class Test_Striuct_Subclass_Class_Cloning < Test::Unit::TestCase
+
+  class Sth < Striuct.new
+    member :sth
+  end
+
+  def test_dup
+    klass = Sth.dup
+    Sth.__send__ :member, :dummy1
+    assert_equal false, klass.member?(:dummy1)
+  end
+  
+  def test_clone
+    klass = Sth.clone
+    Sth.__send__ :member, :dummy2
+    assert_equal false, klass.member?(:dummy2)
+  end
+
+end

data/test/{test_striuct_subclass_classlock.rb → test_striuct-subclass-class-close.rb}

@@ -1,12 +1,12 @@
 require_relative 'helper'
 
-class TestStriuctClassLock < Test::Unit::TestCase
+class Test_Striuct_Subclass_Class_Close < Test::Unit::TestCase
 
   Sth = Striuct.new do
     member :foo
   end
 
-  def test_class_lock
+  def test_class_close
     sth = Sth.new
 
     assert_equal true, sth.member?(:foo)

data/test/{test_striuct_subclass_classmethods.rb → test_striuct-subclass-class-constructor.rb}

@@ -1,6 +1,6 @@
 require_relative 'helper'
 
-class TestStriuctSubclassClassMethods < Test::Unit::TestCase
+class Test_Striuct_Subclass_Class_Constructor < Test::Unit::TestCase
 
   class User < Striuct.new
     member :id, Integer
@@ -15,7 +15,7 @@ class TestStriuctSubclassClassMethods < Test::Unit::TestCase
     member :age, Fixnum
   end
   
-  def test_builder
+  def test_new
     klass = Striuct.new
     assert_kind_of Striuct, klass.new
     
@@ -64,24 +64,19 @@ class TestStriuctSubclassClassMethods < Test::Unit::TestCase
     assert_equal false, user.strict?
   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
+  Sth = Striuct.new :foo, :bar, :hoge
+  SampleStruct = Struct.new :foo, :bar, :hoge
   
-  def test_add_members
-    klass = Striuct.new :foo do
-      add_members :aaa, 'bbb', :ccc
-    end
-    
-    assert_equal [:foo, :aaa, :bbb, :ccc], klass.members
+  def test_for_pairs_from_hash
+    sth = Sth[hoge: 7, foo: 8]
+   
+    assert_equal [8, nil, 7], sth.values
   end
+
+  def test_for_pairs_from_struct
+    sth = Sth[SampleStruct.new 8, nil, 7]
+   
+    assert_equal [8, nil, 7], sth.values
+  end
+
 end  

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

@@ -0,0 +1,36 @@
+require_relative 'helper'
+
+class Test_Striuct_Subclass_Class_Freeze < Test::Unit::TestCase
+
+  Sth = Striuct.new do
+    member :foo
+  end
+
+  def test_class_freeze
+    sth = Sth.new
+
+    assert_same true, sth.member?(:foo)
+
+    Sth.class_eval do
+      member :bar
+    end
+
+    assert_same true, sth.member?(:bar)
+    assert_equal [:foo, :bar], sth.members
+    
+    assert_same false, Sth.frozen?
+    
+    Sth.freeze
+    
+    assert_same true, Sth.frozen?
+   
+    assert_raises RuntimeError do
+      Sth.class_eval do
+        member :var2
+      end
+    end
+   
+    assert_same false, sth.member?(:var2)
+  end
+
+end

data/test/{test_striuct_subclass_inheritable.rb → test_striuct-subclass-class-inheritable.rb}

@@ -1,6 +1,6 @@
 require_relative 'helper'
 
-class TestStriuctInheritable < Test::Unit::TestCase
+class Test_Striuct_Subclass_Class_Inheritable < Test::Unit::TestCase
 
   Sth = Striuct.define do
     member :foo, String

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

@@ -0,0 +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  

data/test/{test_striuct_subclass_safetynaming.rb → test_striuct-subclass-class-safety_naming.rb}

@@ -1,6 +1,6 @@
 require_relative 'helper'
 
-class TestStriuctSafetyNaming < Test::Unit::TestCase
+class Test_Striuct_Subclass_Class_SafetyNaming < Test::Unit::TestCase
 
   def test_cname?
     klass = Striuct.new

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

@@ -0,0 +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  

data/test/{test_striuct_subclass_alias_member.rb → test_striuct-subclass-feature-alias_member.rb}

@@ -1,6 +1,6 @@
 require_relative 'helper'
 
-class TestStriuctAliasMember < Test::Unit::TestCase
+class Test_Striuct_Subclass_AliasMember < Test::Unit::TestCase
 
   class Sth < Striuct.new
     member :foo, String

data/test/{test_striuct_subclass_to_struct.rb → test_striuct-subclass-feature-to_struct.rb}

@@ -1,6 +1,6 @@
 require_relative 'helper'
 
-class TestStriuct_to_Struct < Test::Unit::TestCase
+class Test_Striuct_Subclass_to_Struct < Test::Unit::TestCase
 
   Sth = Striuct.define do
     member :name, String

data/test/test_striuct-subclass-instance-accessor.rb

@@ -0,0 +1,137 @@
+require_relative 'helper'
+
+class Test_Striuct_Subclass_Instance_Setter < 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'
+    assert_equal user.last_name, 'foo'
+    user.last_name = 'bar'
+    assert_equal user[:last_name], 'bar'
+    
+    assert_raises Validation::InvalidWritingError do
+      user[:last_name] = 'foo s'
+    end
+  
+    assert_raises Validation::InvalidWritingError do
+      User.new 'asda'
+    end
+    
+    assert_raises Validation::InvalidWritingError do
+      user.age = 19
+    end
+  end
+
+end
+
+class Test_Striuct_Subclass_Instance_Accessor_With_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 setup
+    @user = User.new 9999, 'taro', 'yamada', 'Tokyo Japan', 30
+  end
+
+  def test_reader
+    assert_equal @user[1], 'taro'
+    assert_equal @user[:last_name], 'taro'
+    assert_equal @user.last_name, 'taro'
+  end
+
+  def test_setter_pass
+    assert_equal((@user.id = 2139203509295), 2139203509295)
+    assert_equal @user.id, 2139203509295
+    assert_equal((@user.last_name = 'jiro'), 'jiro')
+    assert_equal @user.last_name, 'jiro'
+    assert_equal((@user.age = 40), 40)
+    assert_equal @user.age, 40
+  end
+  
+  def test_setter_fail
+    assert_raises Validation::InvalidWritingError do
+      @user.id = 2139203509295.0
+    end
+
+    assert_raises Validation::InvalidWritingError do
+      @user.last_name = 'ignore name'
+    end
+    
+    assert_raises Validation::InvalidWritingError do
+      @user.age = 19
+    end
+  end
+  
+  def test_strict?
+    assert_same @user.sufficient?(:last_name), true
+    assert_same @user.strict?, true
+    assert_same @user.sufficient?(:last_name), true
+    @user.last_name.clear
+    assert_same @user.sufficient?(:last_name), false
+    assert_same @user.strict?, false
+  end
+
+end
+
+
+class Test_Striuct_Subclass_Instance_Accsessor < Test::Unit::TestCase
+
+  class Sth < Striuct.new
+    member :bool, OR(true, false)
+    member :sth
+    protect_level :struct
+    member :lambda, OR(->v{v % 3 == 2}, ->v{v.kind_of? Float})
+  end
+  
+  def setup
+    @sth = Sth.new
+  end
+
+  def test_accessor
+    @sth.bool = true
+    assert_same true, @sth.bool
+    @sth.bool = false
+    assert_same false, @sth.bool
+    
+    assert_raises Validation::InvalidWritingError do
+      @sth.bool = nil
+    end
+    
+    @sth.sth = 1
+    assert_same 1, @sth.sth
+
+    @sth.sth = 'String'
+    assert_equal 'String', @sth.sth
+    
+    @sth.sth = Class.class
+    assert_same Class.class, @sth.sth
+    
+    assert_raises Validation::InvalidWritingError do
+      @sth.lambda = 9
+    end
+    
+    assert_raises Validation::InvalidWritingError do
+      @sth.lambda = 7
+    end
+    
+    @sth.lambda = 8
+    assert_same 8, @sth.lambda
+
+    @sth.lambda = 9.0
+    assert_equal 9.0, @sth.lambda
+  end
+
+end

data/test/{test_striuct_subclass_adjuster.rb → test_striuct-subclass-instance-adjuster.rb}

@@ -1,34 +1,7 @@
 require_relative 'helper'
 
-class TestStriuctAdjusterOld < Test::Unit::TestCase
 
-  Sth = Striuct.new do
-    member :age, Numeric, &->arg{Integer arg}
-  end
-  
-  def setup
-    @sth = Sth.new
-    assert_same nil, @sth.age
-  end
-  
-  def test_procedure
-    @sth.age = 10
-    assert_same 10, @sth.age
-    @sth.age = 10.0
-    assert_same 10, @sth.age
-
-    assert_raises Validation::UnmanagebleError do
-      @sth.age = '10.0'
-    end
-    
-    @sth.age = '10'
-    assert_same 10, @sth.age
-  end
-
-end
-
-
-class TestStriuctAdjuster < Test::Unit::TestCase
+class Test_Striuct_Subclass_Instance_Adjuster < Test::Unit::TestCase
 
   class MyClass
     def self.parse(v)
@@ -92,4 +65,31 @@ class TestStriuctAdjuster < Test::Unit::TestCase
     assert_kind_of MyClass, sth.myobj
   end
 
+end
+
+class Test_Striuct_Subclass_Instance_AdjusterOld < Test::Unit::TestCase
+
+  Sth = Striuct.new do
+    member :age, Numeric, &->arg{Integer arg}
+  end
+  
+  def setup
+    @sth = Sth.new
+    assert_same nil, @sth.age
+  end
+  
+  def test_procedure
+    @sth.age = 10
+    assert_same 10, @sth.age
+    @sth.age = 10.0
+    assert_same 10, @sth.age
+
+    assert_raises Validation::UnmanagebleError do
+      @sth.age = '10.0'
+    end
+    
+    @sth.age = '10'
+    assert_same 10, @sth.age
+  end
+
 end

data/test/{test_striuct_subclass_assign.rb → test_striuct-subclass-instance-assign.rb}

@@ -1,6 +1,6 @@
 require_relative 'helper'
 
-class TestStriuctAssign < Test::Unit::TestCase
+class Test_Striuct_Subclass_Instance_Assign < Test::Unit::TestCase
 
   Sth = Striuct.new do
     member :foo

data/test/test_striuct-subclass-instance-basic.rb

@@ -0,0 +1,32 @@
+require_relative 'helper'
+
+class Test_Striuct_Subclass_Instance_Basic < 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
+  end
+  
+  def test_delegate_class_method
+    assert_equal @user.members, User.members
+    assert_equal @user.size, User.size
+    assert_equal @user.member?(:age), User.member?(:age)
+  end
+
+  def test_values
+    assert_equal @user.values, [9999, 'taro', 'yamada', 'Tokyo Japan', 30]
+  end
+  
+  def test_values_at
+    assert_equal(@user.values_at(4, 0, (2..4)), [30, 9999, 'yamada', 'Tokyo Japan', 30])
+  end
+
+end