striuct 0.1.7 → 0.2.3

data/test/test_striuct.rb

@@ -64,11 +64,6 @@ class TestStriuctSubclassEigen < Test::Unit::TestCase
     assert_equal false, user.strict?
   end
   
-  def test_sufficient?
-    assert_equal false, User.sufficient?(:age, 19)
-    assert_equal true, User.sufficient?(:age, 20)
-  end
-  
   def test_restrict?
     klass = Striuct.new :foo do
       member :var, //
@@ -81,6 +76,14 @@ class TestStriuctSubclassEigen < Test::Unit::TestCase
     assert_equal false, klass.restrict?(:hoge)
     assert_equal true, klass.restrict?(:moge)
   end
+  
+  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  
 
 class TestStriuctSubclassInstance1 < Test::Unit::TestCase
@@ -227,7 +230,19 @@ class TestStriuctSubclassInstance3 < Test::Unit::TestCase
     
     assert_equal [@user.each_value.to_a, @user.each_index.to_a].transpose, r
   end
-  
+
+  def test_each_member_with_index
+    assert_same @user, @user.each_member_with_index{}
+    assert_kind_of Enumerator, enum = @user.each_member_with_index
+    
+    r = []
+    @user.each_member_with_index do |name, index|
+      r << [name, index]
+    end
+    
+    assert_equal [@user.each_key.to_a, @user.each_index.to_a].transpose, r
+  end
+
   def test_values
     assert_equal @user.values, [9999, 'taro', 'yamada', 'Tokyo Japan', 30]
   end
@@ -251,10 +266,10 @@ end
 
 class TestStriuctSubclassInstance4 < Test::Unit::TestCase
   class Sth < Striuct.new
-    member :bool, true, false
+    member :bool, OR(true, false)
     member :sth
     protect_level :struct
-    member :lambda, ->v{v % 3 == 2}, ->v{v.kind_of? Float}
+    member :lambda, OR(->v{v % 3 == 2}, ->v{v.kind_of? Float})
   end
   
   def setup
@@ -330,9 +345,7 @@ end
 
 class TestStriuctProcedure < Test::Unit::TestCase
   Sth = Striuct.new do
-    member :age, /\A\d+\z/, Numeric do |arg|
-      Integer arg
-    end
+    member :age, Numeric, &->arg{Integer arg}
   end
   
   def setup
@@ -631,8 +644,8 @@ end
 class TestStriuctInference < Test::Unit::TestCase
   def test_inference
     klass = Striuct.define do
-      member :n, Numeric, inference
-      member :m, inference
+      member :n, Numeric, inference: true
+      member :m, anything, inference: true
     end
     
     sth, sth2 = klass.new, klass.new
@@ -903,13 +916,14 @@ end
 
 class TestStriuctSpecificConditions < Test::Unit::TestCase
   Sth = Striuct.define do
-    member :list_only_int, generics(Integer)
+    member :list_only_int, GENERICS(Integer)
     member :true_or_false, boolean
     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 :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})
@@ -989,7 +1003,7 @@ class TestStriuctSpecificConditions < Test::Unit::TestCase
     end
 
     assert_raises Striuct::ConditionError do
-      sth.has_ignore = 2
+      sth.has_ignore= 2
     end
   
     sth.has_ignore = 3
@@ -1000,7 +1014,27 @@ class TestStriuctSpecificConditions < Test::Unit::TestCase
       sth.has_ignore = []
     end
   end
+
+  def test_nand
+    sth = Sth.new
+
+    assert_raises Striuct::ConditionError do
+      sth.nand = 4
+    end
+
+    assert_raises Striuct::ConditionError do
+      sth.nand = 4.5
+    end
   
+    sth.nand = 2
+    assert_equal 2, sth.nand
+    assert_equal true, sth.valid?(:nand)
+    sth.nand = []
+    assert_equal [], sth.nand
+  end
+
+
+
   def test_member_of
     sth = Sth.new
     
@@ -1206,4 +1240,147 @@ class TestStriuctInherit < Test::Unit::TestCase
     SubSubSth.__send__(:close)
     assert_equal true, SubSubSth.__send__(:closed?)
   end
-end
+end
+
+class TestStriuctConstants < Test::Unit::TestCase
+  def test_const_version
+    assert_equal '0.2.3', Striuct::VERSION
+    assert_equal true, Striuct::VERSION.frozen?
+    assert_same Striuct::VERSION, Striuct::Version
+  end
+end
+
+class TestStriuctConstants < Test::Unit::TestCase
+  Sth = Striuct.define do
+    member :name
+    member :age
+  end
+  
+  def test_each_pair_with_index
+    sth = Sth.new 'a', 10
+    assert_same sth, sth.each_pair_with_index{}
+    
+    enum = sth.each_pair_with_index    
+    assert_equal [:name, 'a', 0], enum.next
+    assert_equal [:age, 10, 1], enum.next
+    assert_raises StopIteration do
+      enum.next
+    end
+  end
+end
+
+class TestStriuct_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
+
+class TestStriuctFlavors < Test::Unit::TestCase
+  class MyClass
+    def self.parse(v)
+      raise unless /\A[a-z]+\z/ =~ v
+      new
+    end
+  end
+  
+  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 :integer, Integer, &PARSE(Integer)
+    member :myobj, ->v{v.instance_of? MyClass}, &PARSE(MyClass)
+  end
+  
+  def test_WHEN
+    sth = Sth.new
+    
+    assert_raises Striuct::ConditionError do
+      sth.chomped = :"a\n"
+    end
+    
+    sth.chomped = "a\n"
+    
+    assert_equal :a, sth.chomped
+    
+    sth.chomped = :b
+    assert_equal :b, sth.chomped
+  end
+
+  def test_REDUCE
+    sth = Sth.new
+    
+    assert_raises Striuct::ConditionError do
+      sth.no_reduced = 1
+    end
+    
+    sth.reduced = 1
+    
+    assert_equal :'1', sth.reduced
+  end
+  
+  def test_PARSE
+    sth = Sth.new
+    
+    assert_raises Striuct::ConditionError do
+      sth.integer = '1.0'
+    end
+    
+    sth.integer = '1'
+    
+    assert_equal 1, sth.integer
+    
+    assert_raises Striuct::ConditionError do
+      sth.myobj = '1'
+    end
+    
+    sth.myobj = 'a'
+    
+    assert_kind_of MyClass, sth.myobj
+  end
+end
+
+class TestGetterValidation < Test::Unit::TestCase
+  Sth = Striuct.define do
+    member :plus_getter, /./, getter_validation: true
+    member :only_getter, /./, getter_validation: true,
+                              setter_validation: false
+  end
+  
+  def test_getter_validation
+    sth = Sth.new
+    
+    assert_raises Striuct::ConditionError do
+      sth.plus_getter = ''
+    end
+    
+    sth.plus_getter = 'abc'
+    assert_equal 'abc', sth.plus_getter
+    sth.plus_getter.clear
+    
+    assert_raises Striuct::ConditionError do
+      sth.plus_getter
+    end
+    
+    sth.only_getter = ''
+    
+    assert_raises Striuct::ConditionError do
+      sth.only_getter
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: striuct
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-26 00:00:00.000000000 Z
+date: 2012-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &25011612 !ruby/object:Gem::Requirement
+  name: rdoc
+  requirement: &23052000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *25011612
+  version_requirements: *23052000
 - !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &25011336 !ruby/object:Gem::Requirement
+  name: yard
+  requirement: &23051652 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: 0.7.5
   type: :development
   prerelease: false
-  version_requirements: *25011336
+  version_requirements: *23051652
 - !ruby/object:Gem::Dependency
   name: newgem
-  requirement: &25011072 !ruby/object:Gem::Requirement
+  requirement: &23051292 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,54 +43,62 @@ dependencies:
         version: 1.5.3
   type: :development
   prerelease: false
-  version_requirements: *25011072
+  version_requirements: *23051292
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &25010808 !ruby/object:Gem::Requirement
+  requirement: &23050932 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *25010808
-description: Striuct = (YetAnotherStruct << safety << useful)
+  version_requirements: *23050932
+description: Struct++
 email:
 - kachick1+ruby@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
+- History.rdoc
 - Manifest.txt
+- README.rdoc
+- README.ja.old.rdoc
+- example/example.old.rdoc
 files:
 - History.rdoc
 - Manifest.txt
 - README.rdoc
-- README.ja.rdoc
+- README.ja.old.rdoc
 - Rakefile
+- LICENSE
 - lib/striuct.rb
-- lib/striuct/frame.rb
 - lib/striuct/version.rb
 - lib/striuct/abstract.rb
 - lib/striuct/conditions.rb
-- lib/striuct/subclassable/frame.rb
-- lib/striuct/subclassable/classutil.rb
-- lib/striuct/subclassable/basic.rb
-- lib/striuct/subclassable/safety.rb
-- lib/striuct/subclassable/handy.rb
-- lib/striuct/subclassable/hashlike.rb
-- lib/striuct/subclassable/yaml.rb
-- lib/striuct/subclassable/inner.rb
-- lib/striuct/subclassable/eigen/frame.rb
-- lib/striuct/subclassable/eigen/basic.rb
-- lib/striuct/subclassable/eigen/constructor.rb
-- lib/striuct/subclassable/eigen/safety.rb
-- lib/striuct/subclassable/eigen/handy.rb
-- lib/striuct/subclassable/eigen/macro.rb
-- lib/striuct/subclassable/eigen/inner.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
+- lib/striuct/containable/eigen/constructor.rb
+- lib/striuct/containable/eigen/safety.rb
+- lib/striuct/containable/eigen/handy.rb
+- lib/striuct/containable/eigen/macro.rb
+- lib/striuct/containable/eigen/inner.rb
 - test/test_helper.rb
 - test/test_striuct.rb
 - example/example.rb
+- example/example1.rb
+- example/example2.rb
+- example/example.old.rdoc
 - example/benchmarks.rb
 - example/see_trace.rb
 - .gemtest
@@ -116,10 +124,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: striuct
-rubygems_version: 1.8.15
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
-summary: Striuct = (YetAnotherStruct << safety << useful)
+summary: Struct++
 test_files:
 - test/test_helper.rb
 - test/test_striuct.rb

data/lib/striuct/frame.rb

@@ -1,8 +0,0 @@
-# @author Kenichi Kamiya
-# @abstract
-class Striuct
-  class ConditionError < ArgumentError; end
-end
-
-require_relative 'version'
-require_relative 'abstract'

data/lib/striuct/subclassable/classutil.rb

@@ -1,26 +0,0 @@
-class Striuct; module Subclassable
-
-
-# @author Kenichi Kamiya
-module ClassUtil
-
-  private
-  
-  def delegate_class_method(name)
-    define_method name do |*args, &block|
-      self.class.__send__ name, *args, &block
-    end
-  end
-  
-  def delegate_class_methods(*names)
-    unless names.length >= 1
-      raise ArgumentError, 'wrong number of argument 0 for 1+'
-    end
-    
-    names.each{|name|delegate_class_method name}
-  end
-
-end
-
-
-end; end

data/lib/striuct/subclassable/frame.rb

@@ -1,33 +0,0 @@
-require_relative 'classutil'
-require_relative 'eigen/frame'
-
-class Striuct
-
-  # @author Kenichi Kamiya
-  module Subclassable
-    extend ClassUtil
-    include Enumerable
-
-    SpecificContainer = Struct.new :value
-    
-    if respond_to? :private_constant
-      private_constant :SpecificContainer
-    end
-
-    class << self
-      private
-
-      def included(klass)
-        klass.extend Eigen
-      end
-    end
-  end
-
-end
-
-require_relative 'basic'
-require_relative 'safety'
-require_relative 'handy'
-require_relative 'hashlike'
-require_relative 'yaml'
-require_relative 'inner'

data/lib/striuct/subclassable/handy.rb

@@ -1,57 +0,0 @@
-class Striuct; module Subclassable  
-  # @group Struct + Handy
-  
-  # see self.class.*args
-  delegate_class_methods :has_default?, :default_for, :has_flavor?
-  
-  # @yield [index] 
-  # @yieldparam [Integer] index
-  # @yieldreturn [self]
-  # @return [Enumerator]
-  def each_index(&block)
-    return to_enum(__method__) unless block_given?
-    self.class.each_index(&block)
-    self
-  end
-
-  # @yield [value, index]
-  # @yieldparam [Integer] index
-  # @yieldreturn [self]
-  # @return [Enumerator]
-  def each_value_with_index(&block)
-    return to_enum(__method__) unless block_given?
-    each_value.with_index(&block)
-    self
-  end
-  
-  alias_method :each_with_index, :each_value_with_index
-  
-  # @param [Symbol, String] name
-  def assign?(name)
-    name = originalkey_for(keyable_for name)
-    
-    @db.has_key? name
-  end
-  
-  # @param [Symbol, String, Fixnum] key
-  def clear_at(key)
-    __subscript__(key){|name|__clear__ name}
-  end
-  
-  alias_method :unassign, :clear_at
-  alias_method :reset_at, :clear_at
-
-  # @param [Symbol, String] name
-  def default?(name)
-    name = originalkey_for(keyable_for name)
-
-    default_for(name) == self[name]
-  end
-
-  # all members aren't assigned
-  def empty?
-    each_name.none?{|name|assign? name}
-  end
-
-  # @endgroup
-end; end