striuct 0.3.3 → 0.3.4

data/lib/striuct/singleton_class.rb

@@ -1,66 +1,66 @@
-require_relative 'instancemethods'
-
-class Striuct
-  
-  class << self
-
-    # @group Constructor
-    
-    alias_method :new_instance, :new
-    private :new_instance
-    
-    # @param [Symbol, String] autonyms
-    # @return [Class]
-    def new(*autonyms, &block)
-      # warning for Ruby's Struct.new user
-      first = autonyms.first
-      if first.instance_of?(String) and /\A[A-Z]/ =~ first
-        warn "no define constant #{first}"
-      end
-
-      Class.new self do
-        autonyms.each do |autonym|
-          add_member autonym
-        end
-
-        class_eval(&block) if block_given?
-      end
-    end
-
-    # @yieldreturn [Class] (see Striuct.new) - reject floating class
-    # @return [void]
-    def define(&block)
-      raise ArgumentError, 'must with block' unless block_given?
-
-      new(&block).tap do |subclass|
-        subclass.instance_eval do
-          raise 'not yet finished' if autonyms.empty?
-          close
-        end
-      end
-    end
-
-    # @groupend
-
-    private
-    
-    alias_method :original_inherited, :inherited
-
-    def inherited(subclass)
-      subclass.class_eval do
-        original_inherited subclass
-
-        extend ClassMethods
-        include Enumerable
-        include InstanceMethods
-        
-        @autonyms = []
-        @conditions, @adjusters, @defaults, @inferences, @aliases, @setter_validations, @getter_validations = \
-          {}, {}, {}, {}, {}, {}, {}
-        @protect_level = :prevent
-      end
-    end
-
-  end
-
-end
+require_relative 'instancemethods'
+
+class Striuct
+  
+  class << self
+
+    # @group Constructor
+    
+    alias_method :new_instance, :new
+    private :new_instance
+    
+    # @param [Symbol, String] autonyms
+    # @return [Class]
+    def new(*autonyms, &block)
+      # warning for Ruby's Struct.new user
+      first = autonyms.first
+      if first.instance_of?(String) and /\A[A-Z]/ =~ first
+        warn "no define constant first-arg(#{first}), the Struct behavior is not supported in Striuct"
+      end
+
+      Class.new self do
+        autonyms.each do |autonym|
+          add_member autonym
+        end
+
+        class_eval(&block) if block_given?
+      end
+    end
+
+    # @yieldreturn [Class] (see Striuct.new) - reject floating class
+    # @return [void]
+    def define(&block)
+      raise ArgumentError, 'must with block' unless block_given?
+
+      new(&block).tap do |subclass|
+        subclass.instance_eval do
+          raise 'not yet finished' if autonyms.empty?
+          close
+        end
+      end
+    end
+
+    # @groupend
+
+    private
+    
+    alias_method :original_inherited, :inherited
+
+    def inherited(subclass)
+      subclass.class_eval do
+        original_inherited subclass
+
+        extend ClassMethods
+        include Enumerable
+        include InstanceMethods
+        
+        @autonyms = []
+        @conditions, @adjusters, @defaults, @inferences, @aliases, @setter_validations, @getter_validations = \
+          {}, {}, {}, {}, {}, {}, {}
+        @protect_level = :prevent
+      end
+    end
+
+  end
+
+end

data/lib/striuct/specificcontainer.rb

@@ -1,19 +1,19 @@
-class Striuct
-
-  class SpecificContainer
-
-    attr_reader :value
-
-    def initialize(value)
-      @value = value
-    end
-
-  end
-  
-  class DefaultProcHolder < SpecificContainer; end
-
-  if respond_to? :private_constant
-    private_constant :SpecificContainer, :DefaultProcHolder
-  end
-
-end
+class Striuct
+
+  class SpecificContainer
+
+    attr_reader :value
+
+    def initialize(value)
+      @value = value
+    end
+
+  end
+  
+  class DefaultProcHolder < SpecificContainer; end
+
+  if respond_to? :private_constant
+    private_constant :SpecificContainer, :DefaultProcHolder
+  end
+
+end

data/lib/striuct/structs.rb

@@ -1,7 +1,7 @@
-class Striuct
-
-  # namespace for .to_struct_class, #to_struct
-  module Structs
-  end
-
-end
+class Striuct
+
+  # namespace for .to_struct_class, #to_struct
+  module Structs
+  end
+
+end

data/lib/striuct/version.rb

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

data/lib/striuct.rb

@@ -1,13 +1,13 @@
-# striuct - Provides a Struct++ class.
-# Copyright (c) 2011 Kenichi Kamiya
-
-require 'validation'
-
-# @abstract
-class Striuct
-
-  include Validation
-
-end
-
-require_relative 'striuct/requirements'
+# striuct - Provides a Struct++ class.
+# Copyright (c) 2011 Kenichi Kamiya
+
+require 'validation'
+
+# @abstract
+class Striuct
+
+  include Validation
+
+end
+
+require_relative 'striuct/requirements'

data/striuct.gemspec

@@ -1,24 +1,24 @@
-# I don't know why dose occur errors below.
-#  require_relative 'lib/striuct/version'
-require File.expand_path('../lib/striuct/version', __FILE__)
-
-Gem::Specification.new do |gem|
-  gem.authors       = ['Kenichi Kamiya']
-  gem.email         = ['kachick1+ruby@gmail.com']
-  gem.summary       = %q{Struct++}
-  gem.description   = %q{validatable, inheritable, And more Struct++ features :)}
-  gem.homepage      = 'https://github.com/kachick/striuct'
-
-  gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = 'striuct'
-  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'
-  gem.add_runtime_dependency 'keyvalidatable', '~> 0.0.3'
-  gem.add_development_dependency 'yard', '>= 0.8.2.1'
-end
-
+# I don't know why dose occur errors below.
+#  require_relative 'lib/striuct/version'
+require File.expand_path('../lib/striuct/version', __FILE__)
+
+Gem::Specification.new do |gem|
+  gem.authors       = ['Kenichi Kamiya']
+  gem.email         = ['kachick1+ruby@gmail.com']
+  gem.summary       = %q{Struct++}
+  gem.description   = %q{validatable, inheritable, And more Struct++ features :)}
+  gem.homepage      = 'https://github.com/kachick/striuct'
+
+  gem.files         = `git ls-files`.split($\)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.name          = 'striuct'
+  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'
+  gem.add_runtime_dependency 'keyvalidatable', '~> 0.0.3'
+  gem.add_development_dependency 'yard', '>= 0.8.2.1'
+end
+

data/test/helper.rb

@@ -1,5 +1,5 @@
-require 'test/unit'
-
-$VERBOSE = true
-
-require_relative '../lib/striuct'
+require 'test/unit'
+
+$VERBOSE = true
+
+require_relative '../lib/striuct'

data/test/test_striuct-singleton_class-define.rb

@@ -1,19 +1,19 @@
-require_relative 'helper'
-
-class Test_Striuct_Define < Test::Unit::TestCase
-
-  def test_define
-    assert_raises RuntimeError do
-      Striuct.define do
-      end
-    end
-    
-    klass = Striuct.define do
-      member :foo
-    end
-
-    assert_equal true, klass.closed?
-  end
-
-end
-
+require_relative 'helper'
+
+class Test_Striuct_Define < Test::Unit::TestCase
+
+  def test_define
+    assert_raises RuntimeError do
+      Striuct.define do
+      end
+    end
+    
+    klass = Striuct.define do
+      member :foo
+    end
+
+    assert_equal true, klass.closed?
+  end
+
+end
+

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

@@ -1,21 +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
-
+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-class-close.rb

@@ -1,36 +1,36 @@
-require_relative 'helper'
-
-class Test_Striuct_Subclass_Class_Close < Test::Unit::TestCase
-
-  Sth = Striuct.new do
-    member :foo
-  end
-
-  def test_class_close
-    sth = Sth.new
-
-    assert_equal true, sth.member?(:foo)
-
-    Sth.class_eval do
-      member :bar
-    end
-
-    assert_equal true, sth.member?(:bar)
-    assert_equal [:foo, :bar], sth.members
-    
-    assert_equal false, Sth.closed?
-    
-    Sth.__send__ :close
-    
-    assert_equal true, Sth.closed?
-   
-    assert_raises RuntimeError do
-      Sth.class_eval do
-        member :var2
-      end
-    end
-   
-    assert_equal false, sth.member?(:var2)
-  end
-
-end
+require_relative 'helper'
+
+class Test_Striuct_Subclass_Class_Close < Test::Unit::TestCase
+
+  Sth = Striuct.new do
+    member :foo
+  end
+
+  def test_class_close
+    sth = Sth.new
+
+    assert_equal true, sth.member?(:foo)
+
+    Sth.class_eval do
+      member :bar
+    end
+
+    assert_equal true, sth.member?(:bar)
+    assert_equal [:foo, :bar], sth.members
+    
+    assert_equal false, Sth.closed?
+    
+    Sth.__send__ :close
+    
+    assert_equal true, Sth.closed?
+   
+    assert_raises RuntimeError do
+      Sth.class_eval do
+        member :var2
+      end
+    end
+   
+    assert_equal false, sth.member?(:var2)
+  end
+
+end

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

@@ -1,82 +1,82 @@
-require_relative 'helper'
-
-class Test_Striuct_Subclass_Class_Constructor < 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
-  end
-  
-  def test_new
-    klass = Striuct.new
-    assert_kind_of Striuct, klass.new
-    
-    klass = Striuct.new :name, :age
-    
-    assert_equal klass.members, [:name, :age]
-    
-    klass = Striuct.new :foo do
-      member :var
-    end
-    
-    assert_equal klass.members, [:foo, :var]
-    assert_equal User.members, [:id, :last_name, :family_name, :address, :age]
-  end
-
-  def test_define
-    user = User2.define{|r|r.age = 1; r.name = 'a'}
-    assert_same 1, user.age
-    
-    assert_raises RuntimeError do
-      user.age = 1
-    end
-    
-    user = User2.define{|r|r.age = 1; r.name = 'a'}
-    assert_same 1, user.age
-    assert_same true, user.lock?
-    assert_same false, user.frozen?
-    
-    assert_raises RuntimeError do
-      User2.define{|r|r.age = 1}
-    end
-    
-    user = User2.define(lock: true){|r|r.age = 1; r.name = 'a'}
-    assert_same 1, user.age
-    assert_same true, user.lock?
-    user = User2.define(lock: false){|r|r.age = 1; r.name = 'a'}
-    assert_same false, user.lock?
-    assert_equal true, user.strict?
-    
-    assert_raises Validation::InvalidWritingError do
-      User2.define{|r|r.age = 1; r.name = 'a'; r.name.clear}
-    end
-    
-    user = User2.define(strict: false){|r|r.age = 1; r.name = 'a'; r.name.clear}
-    assert_equal '', user.name
-    assert_equal false, user.strict?
-  end
-  
-  Sth = Striuct.new :foo, :bar, :hoge
-  SampleStruct = Struct.new :foo, :bar, :hoge
-  
-  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  
+require_relative 'helper'
+
+class Test_Striuct_Subclass_Class_Constructor < 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
+  end
+  
+  def test_new
+    klass = Striuct.new
+    assert_kind_of Striuct, klass.new
+    
+    klass = Striuct.new :name, :age
+    
+    assert_equal klass.members, [:name, :age]
+    
+    klass = Striuct.new :foo do
+      member :var
+    end
+    
+    assert_equal klass.members, [:foo, :var]
+    assert_equal User.members, [:id, :last_name, :family_name, :address, :age]
+  end
+
+  def test_define
+    user = User2.define{|r|r.age = 1; r.name = 'a'}
+    assert_same 1, user.age
+    
+    assert_raises RuntimeError do
+      user.age = 1
+    end
+    
+    user = User2.define{|r|r.age = 1; r.name = 'a'}
+    assert_same 1, user.age
+    assert_same true, user.lock?
+    assert_same false, user.frozen?
+    
+    assert_raises RuntimeError do
+      User2.define{|r|r.age = 1}
+    end
+    
+    user = User2.define(lock: true){|r|r.age = 1; r.name = 'a'}
+    assert_same 1, user.age
+    assert_same true, user.lock?
+    user = User2.define(lock: false){|r|r.age = 1; r.name = 'a'}
+    assert_same false, user.lock?
+    assert_equal true, user.strict?
+    
+    assert_raises Validation::InvalidWritingError do
+      User2.define{|r|r.age = 1; r.name = 'a'; r.name.clear}
+    end
+    
+    user = User2.define(strict: false){|r|r.age = 1; r.name = 'a'; r.name.clear}
+    assert_equal '', user.name
+    assert_equal false, user.strict?
+  end
+  
+  Sth = Striuct.new :foo, :bar, :hoge
+  SampleStruct = Struct.new :foo, :bar, :hoge
+  
+  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

@@ -1,36 +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
+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