striuct 0.3.4 → 0.3.5

data/lib/striuct/instancemethods/subscript.rb

@@ -4,52 +4,24 @@ class Striuct; module InstanceMethods
 
   # @param [Symbol, String, Fixnum] key
   def [](key)
-    __subscript__(key){|autonym|__get__ autonym}
+    _get autonym_for_key(key)
   end
   
   # @param [Symbol, String, Fixnum] key
   # @param [Object] value
   # @return [value]
   def []=(key, value)
-    true_name = nil
-    __subscript__(key){|autonym|
-      true_name = autonym
-      __set__ autonym, value
-    }
+    autonym = autonym_for_key key
+    _set autonym, value
   rescue Validation::InvalidWritingError
     $!.set_backtrace([
-      "#{$!.backtrace[-1].sub(/[^:]+\z/){''}}in `[#{key.inspect}(#{true_name})]=': #{$!.message}",
+      "#{$!.backtrace[-1].sub(/[^:]+\z/){''}}in `[#{key.inspect}(#{autonym})]=': #{$!.message}",
       $!.backtrace[-1]
     ])
 
     raise
   end
 
-  private
-
-  # @param [Symbol, String, Fixnum] key
-  # @yield [autonym]
-  # @yieldparam [Symbol] autonym
-  def __subscript__(key)
-    case key
-    when Symbol, String
-      name = keyable_for key
-      if member? name
-        yield autonym_for(name)
-      else
-        raise NameError
-      end
-    when Fixnum
-      if autonym = _autonyms[key]
-        yield autonym
-      else
-        raise IndexError
-      end
-    else
-      raise ArgumentError
-    end
-  end
-
   # @endgroup
 
 end; end

data/lib/striuct/instancemethods/to_s.rb

@@ -0,0 +1,35 @@
+class Striuct; module InstanceMethods
+
+  # @group To Strings
+  
+  # @return [String]
+  def inspect
+    "#<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}("
+        s << "valid?:#{valid? autonym}, "
+        s << "lock?:#{lock? autonym}"
+        s << '),'
+      end
+      
+      s.chop!
+      s << '>'
+    }
+  end
+
+  # @return [String]
+  def to_s
+    "#<struct' #{self.class}".tap {|s|
+      each_pair do |autonym, value|
+        s << " #{autonym}=#{value.inspect},"
+      end
+      
+      s.chop!
+      s << '>'
+    }
+  end
+
+  # @endgroup
+
+end; end

data/lib/striuct/instancemethods/validation.rb

@@ -6,7 +6,7 @@ class Striuct; module InstanceMethods
   # @param [Object] value - no argument and use own
   # passed under any condition
   def sufficient?(name, value=self[name])
-    autonym = autonym_for name
+    autonym = autonym_for_name name
     return true unless restrict? autonym
   
     begin  

data/lib/striuct/instancemethods/values.rb

@@ -31,23 +31,6 @@ class Striuct; module InstanceMethods
     values.each_with_index do |value, index|
       self[index] = value
     end
-      
-    excess = _autonyms.last(size - values.size)
-      
-    excess.each do |autonym|
-      if has_default? autonym
-        self[autonym] = (
-          value = default_for autonym
-          if value.kind_of? DefaultProcHolder
-            block = value.value
-            args = [self, autonym][0, block.arity]
-            block.call(*args)
-          else
-            value
-          end
-        )
-      end
-    end
     
     self
   end

data/lib/striuct/requirements.rb

@@ -1,6 +1,7 @@
 require_relative 'version'
 require_relative 'structs'
-require_relative 'specificcontainer'
+require_relative 'attributes'
+require_relative 'hashdeepdupulicatable'
 require_relative 'classmethods'
 require_relative 'instancemethods'
-require_relative 'singleton_class'
+require_relative 'singleton_class'

data/lib/striuct/singleton_class.rb

@@ -1,7 +1,9 @@
+require_relative 'hashdeepdupulicatable'
+require_relative 'classmethods'
 require_relative 'instancemethods'
 
 class Striuct
-  
+
   class << self
 
     # @group Constructor
@@ -54,9 +56,9 @@ class Striuct
         include Enumerable
         include InstanceMethods
         
-        @autonyms = []
-        @conditions, @adjusters, @defaults, @inferences, @aliases, @setter_validations, @getter_validations = \
-          {}, {}, {}, {}, {}, {}, {}
+        @autonyms      = []
+        @attributes    = {}.extend HashDeepDupulicatable # autonym => Attributes
+        @aliases       = {} # aliased => autonym
         @protect_level = :prevent
       end
     end

data/lib/striuct/version.rb

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

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

@@ -0,0 +1,71 @@
+require_relative 'helper'
+
+class Test_Striuct_Subclass_Class_Copy < Test::Unit::TestCase
+
+  def test_dup
+    org_cls = Striuct.define do
+      member :sth
+    end.freeze
+
+    assert_same true, org_cls.frozen?
+    assert_same true, org_cls.closed?
+    cls2 = org_cls.dup
+    assert_same true, org_cls.frozen?
+    assert_same true, org_cls.closed?
+    assert_same false, cls2.frozen?
+    assert_same false, cls2.closed?
+    cls2.__send__ :member, :dummy1
+    assert_same false, org_cls.member?(:dummy1)
+  end
+  
+  def test_clone
+    org_cls = Striuct.define do
+      member :sth
+    end.freeze
+
+    assert_same true, org_cls.frozen?    
+    assert_same true, org_cls.closed?
+    cls2 = org_cls.clone
+    assert_same true, org_cls.frozen?
+    assert_same true, org_cls.closed?
+    assert_same true, cls2.frozen?
+    assert_same true, cls2.closed?
+  end
+
+  def test_dup_deep
+    org_cls =  Striuct.define do
+      member :foo, Numeric, inference: true
+    end
+
+    foo = org_cls.new
+    cls2 = org_cls.dup
+    foo2 = cls2.new
+    foo2.foo = 0.1
+    assert_raises Validation::InvalidWritingError do
+      foo2.foo = 1
+    end
+
+    foo.foo = 1
+
+    assert_same 1, foo.foo
+  end
+
+  def test_clone_deep
+    org_cls =  Striuct.define do
+      member :foo, Numeric, inference: true
+    end
+
+    foo = org_cls.new
+    cls2 = org_cls.clone
+    foo2 = cls2.new
+    foo2.foo = 0.1
+    assert_raises Validation::InvalidWritingError do
+      foo2.foo = 1
+    end
+
+    foo.foo = 1
+
+    assert_same 1, foo.foo
+  end
+
+end

data/test/{test_striuct-subclass-instance-cloning.rb → test_striuct-subclass-instance-copy.rb}

@@ -1,6 +1,6 @@
 require_relative 'helper'
 
-class Test_Striuct_Subclass_Instance_Cloning < Test::Unit::TestCase
+class Test_Striuct_Subclass_Instance_Copy < Test::Unit::TestCase
 
   class Sth < Striuct.new
     member :sth
@@ -20,4 +20,4 @@ class Test_Striuct_Subclass_Instance_Cloning < Test::Unit::TestCase
     assert_equal false, (sth.sth == sth2.sth)
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: striuct
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-07 00:00:00.000000000 Z
+date: 2012-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: validation
@@ -83,21 +83,25 @@ files:
 - example/example2.rb
 - example/see_trace.rb
 - lib/striuct.rb
+- lib/striuct/attributes.rb
 - lib/striuct/classmethods.rb
 - lib/striuct/classmethods/README.md
 - lib/striuct/classmethods/adjustment.rb
 - lib/striuct/classmethods/constructor.rb
+- lib/striuct/classmethods/copy.rb
 - lib/striuct/classmethods/default.rb
 - lib/striuct/classmethods/enum.rb
+- lib/striuct/classmethods/fix.rb
+- lib/striuct/classmethods/hashy.rb
 - lib/striuct/classmethods/inner.rb
 - lib/striuct/classmethods/length.rb
 - lib/striuct/classmethods/macro.rb
 - lib/striuct/classmethods/named.rb
-- lib/striuct/classmethods/object.rb
 - lib/striuct/classmethods/prevent_conflicts.rb
 - lib/striuct/classmethods/requiremnets.rb
 - lib/striuct/classmethods/to_struct.rb
 - lib/striuct/classmethods/validation.rb
+- lib/striuct/hashdeepdupulicatable.rb
 - lib/striuct/instancemethods.rb
 - lib/striuct/instancemethods/README.md
 - lib/striuct/instancemethods/assign.rb
@@ -107,26 +111,26 @@ files:
 - lib/striuct/instancemethods/delegate_class_methods.rb
 - lib/striuct/instancemethods/enum.rb
 - lib/striuct/instancemethods/hashy.rb
-- lib/striuct/instancemethods/inner.rb
+- lib/striuct/instancemethods/inner_accessor.rb
 - lib/striuct/instancemethods/keyvalidatable.rb
 - lib/striuct/instancemethods/lock.rb
 - lib/striuct/instancemethods/object.rb
 - lib/striuct/instancemethods/requirements.rb
 - lib/striuct/instancemethods/safety.rb
 - lib/striuct/instancemethods/subscript.rb
+- lib/striuct/instancemethods/to_s.rb
 - lib/striuct/instancemethods/validation.rb
 - lib/striuct/instancemethods/values.rb
 - lib/striuct/requirements.rb
 - lib/striuct/singleton_class.rb
-- lib/striuct/specificcontainer.rb
 - lib/striuct/structs.rb
 - lib/striuct/version.rb
 - striuct.gemspec
 - test/helper.rb
 - test/test_striuct-singleton_class-define.rb
-- test/test_striuct-subclass-class-cloning.rb
 - test/test_striuct-subclass-class-close.rb
 - test/test_striuct-subclass-class-constructor.rb
+- test/test_striuct-subclass-class-copy.rb
 - test/test_striuct-subclass-class-freeze.rb
 - test/test_striuct-subclass-class-inheritable.rb
 - test/test_striuct-subclass-class-macro.rb
@@ -139,8 +143,8 @@ files:
 - test/test_striuct-subclass-instance-adjuster.rb
 - test/test_striuct-subclass-instance-assign.rb
 - test/test_striuct-subclass-instance-basic.rb
-- test/test_striuct-subclass-instance-cloning.rb
 - test/test_striuct-subclass-instance-compare.rb
+- test/test_striuct-subclass-instance-copy.rb
 - test/test_striuct-subclass-instance-default_value.rb
 - test/test_striuct-subclass-instance-enum.rb
 - test/test_striuct-subclass-instance-freeze.rb
@@ -181,9 +185,9 @@ summary: Struct++
 test_files:
 - test/helper.rb
 - test/test_striuct-singleton_class-define.rb
-- test/test_striuct-subclass-class-cloning.rb
 - test/test_striuct-subclass-class-close.rb
 - test/test_striuct-subclass-class-constructor.rb
+- test/test_striuct-subclass-class-copy.rb
 - test/test_striuct-subclass-class-freeze.rb
 - test/test_striuct-subclass-class-inheritable.rb
 - test/test_striuct-subclass-class-macro.rb
@@ -196,8 +200,8 @@ test_files:
 - test/test_striuct-subclass-instance-adjuster.rb
 - test/test_striuct-subclass-instance-assign.rb
 - test/test_striuct-subclass-instance-basic.rb
-- test/test_striuct-subclass-instance-cloning.rb
 - test/test_striuct-subclass-instance-compare.rb
+- test/test_striuct-subclass-instance-copy.rb
 - test/test_striuct-subclass-instance-default_value.rb
 - test/test_striuct-subclass-instance-enum.rb
 - test/test_striuct-subclass-instance-freeze.rb

data/lib/striuct/classmethods/object.rb

@@ -1,54 +0,0 @@
-class Striuct; module ClassMethods
-
-  # @group Basic Methods for Ruby's Object
-
-  # @return [self]
-  def freeze
-    __floating_attributes__.each(&:freeze)
-    super
-  end
-
-  # @return [Class]
-  def dup
-    r = super
-    @autonyms, @adjusters, @defaults, @aliases,
-    @setter_validations, @getter_validations,
-    @conditions, @inferences    = 
-    *__floating_attributes__.map(&:dup)
-    r
-  end
-  
-  private
-  
-  def inherited(subclass)
-    autonyms = @autonyms.dup
-    attributes = [@conditions, @adjusters, @defaults, @inferences, @aliases, @setter_validations, @getter_validations].map(&:dup)
-    protect_level = @protect_level
-    
-    subclass.class_eval do
-      original_inherited subclass
-      
-      @autonyms = autonyms
-      @conditions, @adjusters, @defaults, @inferences, @aliases, @setter_validations, @getter_validations = *attributes
-      @protect_level = protect_level
-    end
-  end
-     
-  def initialize_copy(original)
-    ret = super original
-    @autonyms, @adjusters, @defaults, @aliases,
-    @setter_validations, @getter_validations,
-    @conditions, @inferences    = 
-    *__floating_attributes__.map(&:dup)
-    ret
-  end
-
-  def __floating_attributes__
-    [@autonyms, @adjusters, @defaults, @aliases,
-     @setter_validations, @getter_validations,
-     @conditions, @inferences]
-  end
-
-  # @endgroup
-
-end; end

data/lib/striuct/specificcontainer.rb

@@ -1,19 +0,0 @@
-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/test/test_striuct-subclass-class-cloning.rb

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