striuct 0.3.4 → 0.3.5

data/History.rdoc

@@ -1,3 +1,9 @@
+=== 0.3.5 2012-9-9
+
+* fix:
+  * SubClass.dup, SubClass.clone
+  * SubClass#replace_values
+
 === 0.3.4 2012-9-8
 
 * fix:

data/Manifest.txt

@@ -9,20 +9,26 @@ striuct.gemspec
 .yardopts
 
 lib/striuct.rb
+lib/striuct/requirements.rb
 lib/striuct/version.rb
-lib/striuct/specificcontainer.rb
+lib/striuct/structs.rb
+lib/striuct/attributes.rb
+lib/striuct/hashdeepdupulicatable.rb
 lib/striuct/singleton_class.rb
+lib/striuct/classmethods.rb
+lib/striuct/instancemethods.rb
 
 lib/striuct/classmethods/README.md
-lib/striuct/classmethods.rb
 lib/striuct/classmethods/requirements.rb
 lib/striuct/classmethods/inner.rb
 lib/striuct/classmethods/named.rb
-lib/striuct/classmethods/object.rb
+lib/striuct/classmethods/copy.rb
+lib/striuct/classmethods/fix.rb
 lib/striuct/classmethods/length.rb
 lib/striuct/classmethods/to_struct.rb
 lib/striuct/classmethods/constructor.rb
 lib/striuct/classmethods/enum.rb
+lib/striuct/classmethods/hashy.rb
 lib/striuct/classmethods/default.rb
 lib/striuct/classmethods/adjustment.rb
 lib/striuct/classmethods/macro.rb
@@ -30,13 +36,13 @@ lib/striuct/classmethods/prevent_conflicts.rb
 lib/striuct/classmethods/validation.rb
 
 lib/striuct/instancemethods/README.md
-lib/striuct/instancemethods.rb
 lib/striuct/instancemethods/requirements.rb
 lib/striuct/instancemethods/delegate_class_methods.rb
 lib/striuct/instancemethods/keyvalidatable.rb
-lib/striuct/instancemethods/inner.rb
+lib/striuct/instancemethods/inner_accessor.rb
 lib/striuct/instancemethods/object.rb
 lib/striuct/instancemethods/compare.rb
+lib/striuct/instancemethods/to_s.rb
 lib/striuct/instancemethods/values.rb
 lib/striuct/instancemethods/cast.rb
 lib/striuct/instancemethods/default.rb
@@ -51,7 +57,7 @@ lib/striuct/instancemethods/safety.rb
 test/helper.rb
 test/test_striuct-version.rb
 test/test_striuct-singleton_class-define.rb
-test/test_striuct-subclass-class-cloning.rb
+test/test_striuct-subclass-class-copy.rb
 test/test_striuct-subclass-class-close.rb
 test/test_striuct-subclass-class-freeze.rb
 test/test_striuct-subclass-class-constructor.rb
@@ -66,7 +72,7 @@ test/test_striuct-subclass-instance-accessor.rb
 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-copy.rb
 test/test_striuct-subclass-instance-compare.rb
 test/test_striuct-subclass-instance-default_value.rb
 test/test_striuct-subclass-instance-enum.rb

data/README.md

@@ -1,6 +1,8 @@
 striuct
 =======
 
+[![Build Status](https://secure.travis-ci.org/kachick/striuct.png)](http://travis-ci.org/kachick/striuct)
+
 Description
 -----------
 
@@ -46,8 +48,8 @@ class User < Person                           # Inheritable
   member :id, Integer,                        # Looks typed validation
               default_proc: ->{User.next_id}  # With default value
 
+  @id = 0
   def self.next_id
-    @id ||= 0
     @id += 1
   end
 end
@@ -64,8 +66,10 @@ ken.id                   #=> 2
 ```ruby
 class Foo < Striuct
   member :foo
-  member :bar, Numeric, inference: true
-  member :with_adjuster, Integer, &->v{Integer v}
+  member :bar, Numeric,                       # First validation under Numeric
+               inference: true                # And use inference Validation
+  member :with_adjuster, Integer,
+                         &->v{Integer v}      # Use adjuster before a setter
 end
 
 foo = Foo.new
@@ -89,19 +93,17 @@ foo.with_adjuster = '5'
 foo.with_adjuster        #=> 5                # Casted via adjuster
 ```
 
+### How to build a flexible condition
 
-### More Examples
-
-#### Basics
-
-example/*
+* That from validation library.  
+  See the [validation-API](http://kachick.github.com/docs/validation/api/frames.html)
 
 Requirements
 -------------
 
 * Ruby 1.9.2 or later [MRI/YARV, Rubinius](http://travis-ci.org/#!/kachick/striuct)
-* validation - 0.0.3
-* keyvalidatable - 0.0.3
+* [validation](https://github.com/kachick/validation) - 0.0.3
+* [keyvalidatable](https://github.com/kachick/keyvalidatable) - 0.0.3
 
 Install
 -------

data/example/README.rb

@@ -11,8 +11,8 @@ class User < Person                           # Inheritable
   member :id, Integer,                        # Looks typed validation
               default_proc: ->{User.next_id}  # With default value
 
+  @id = 0
   def self.next_id
-    @id ||= 0
     @id += 1
   end
 end
@@ -26,8 +26,10 @@ p ken.id           #=> 2
 
 class Foo < Striuct
   member :foo
-  member :bar, Numeric, inference: true
-  member :with_adjuster, Integer, &->v{Integer v}
+  member :bar, Numeric,
+               inference: true
+  member :with_adjuster, Integer,
+                         &->v{Integer v}
 end
 
 foo = Foo.new

data/lib/striuct/attributes.rb

@@ -0,0 +1,114 @@
+class Striuct
+
+  # Attributes for each Member(Autonym)
+  class Attributes
+
+    VALUES = [:condition, :adjuster].freeze
+    BOOLEANS = [
+                :inference,
+                :validate_with_setter,
+                :validate_with_getter
+               ].freeze
+    
+    def initialize
+      @hash = {
+        inference:            false,
+        validate_with_setter: false,
+        validate_with_getter: false
+      }
+    end
+    
+    VALUES.each do |role|
+      define_method "has_#{role}?".to_sym do
+        @hash.has_key? role
+      end
+      
+      define_method role do
+        @hash.fetch role
+      end
+    end
+
+    def condition=(condition)
+      unless ::Validation.conditionable? condition
+        raise TypeError, 'wrong object for condition' 
+      end
+
+      @hash[:condition] = condition
+    end
+
+    def adjuster=(adjuster)
+      unless ::Validation.adjustable? adjuster
+        raise ArgumentError, "wrong number of block argument #{arity} for 1"
+      end
+
+      @hash[:adjuster] = adjuster
+    end
+
+    BOOLEANS.each do |role|
+      define_method "#{role}?".to_sym do
+        @hash.fetch role
+      end
+      
+      define_method "#{role}=".to_sym do |arg|
+        raise TypeError unless arg.equal?(true) or arg.equal?(false)
+
+        @hash[role] = arg
+      end   
+    end
+
+    def has_default?
+      @hash.has_key? :default_value
+    end
+
+    def default_value
+      @hash.fetch :default_value
+    end
+
+    def default_type
+      @hash.fetch :default_type
+    end
+
+    # @param [Symbol] type - :value / :lazy
+    def set_default(value, type)
+      raise TypeError unless type.equal?(:value) or type.equal?(:lazy)
+      check_default_lazy_proc value if type.equal?(:lazy)
+      
+      @hash[:default_type] = type
+      @hash[:default_value] = value
+    end
+
+    def check_default_lazy_proc(_proc)
+      raise TypeError unless _proc.respond_to? :call
+      arity = _proc.arity
+      unless arity <= 2
+        raise ArgumentError, "wrong number of block parameter #{arity} for 0..2"
+      end
+    end
+
+    def freeze
+      ret = super
+      @hash.freeze
+      ret
+    end
+
+    def dup
+      ret = super
+      @hash = @hash.dup
+      ret
+    end
+    
+    private
+    
+    def initialize_copy(original)
+      ret = super original
+      @hash = @hash.dup
+      ret
+    end
+
+  end
+
+  if respond_to? :private_constant
+    private_constant :Attributes
+  end
+
+end

data/lib/striuct/classmethods/adjustment.rb

@@ -4,30 +4,23 @@ class Striuct; module ClassMethods
   
   # @param [Symbol, String] name
   def has_adjuster?(name)
-    autonym = autonym_for name
+    autonym = autonym_for_name name
 
-    ! adjuster_for(autonym).nil?
+    _attributes_for(autonym).has_adjuster?
   end
 
-  alias_method :has_flavor?, :has_adjuster?
+  alias_method :has_flavor?, :has_adjuster? # obsolute
   
   # @param [Symbol, String] name
   def adjuster_for(name)
-    autonym = autonym_for name
+    return nil unless has_adjuster? name
+    autonym = autonym_for_name name
     
-    _adjuster_for autonym
+    _attributes_for(autonym).adjuster
   end
   
-  alias_method :flavor_for, :adjuster_for
-
-  private
-  
-  def _adjuster_for(autonym)
-    @adjusters[autonym]
-  end
-
-  alias_method :_flavor_for, :_adjuster_for
+  alias_method :flavor_for, :adjuster_for # obsolute
 
   # @endgroup
 
-end; end
+end; end

data/lib/striuct/classmethods/copy.rb

@@ -0,0 +1,55 @@
+class Striuct; module ClassMethods
+
+  # @group Basic Methods for Ruby's Object
+
+  # @return [Module]
+  def dup
+    autonyms = @autonyms.dup
+    aliases  = @aliases.dup
+    attributes = @attributes.deep_dup
+
+    super.tap {|ret|
+      ret.instance_eval do
+        @autonyms = autonyms
+        @aliases = aliases
+        @attributes = attributes
+      end
+    }
+  end
+
+  # @return [Module]
+  def clone
+    ret = super
+    ret.__send__ :close if closed?
+    ret
+  end
+
+  private
+  
+  def inherited(subclass)
+    autonyms = @autonyms.dup
+    aliases  = @aliases.dup
+    attributes = @attributes.deep_dup
+    protect_level = @protect_level
+    
+    subclass.class_eval do
+      original_inherited subclass
+      
+      @autonyms = autonyms
+      @aliases = aliases
+      @attributes = attributes
+      @protect_level = protect_level
+    end
+  end
+     
+  def initialize_copy(original)
+    ret = super original
+    @autonyms = @autonyms.dup
+    @aliases = @aliases.dup
+    @attributes = @attributes.deep_dup
+    ret
+  end
+
+  # @endgroup
+
+end; end

data/lib/striuct/classmethods/default.rb

@@ -4,25 +4,30 @@ class Striuct; module ClassMethods
   
   # @param [Symbol, String] name
   def has_default?(name)
-    autonym = autonym_for name
+    autonym = autonym_for_name name
 
-    @defaults.has_key? autonym
+    _attributes_for(autonym).has_default?
   end
   
   # @param [Symbol, String] name
-  def default_for(name)
-    autonym = autonym_for name
+  def default_value_for(name)
+    autonym = autonym_for_name name
     raise "#{name} has no default value" unless has_default? autonym
-    
-    _default_for autonym
-  end
-  
-  private
-  
-  def _default_for(autonym)
-    @defaults[autonym]
+ 
+    _attributes_for(autonym).default_value
   end
 
+  alias_method :default_for, :default_value_for
+
+  # @param [Symbol, String] name
+  # @return [Symbol] :value / :proc
+  def default_type_for(name)
+    autonym = autonym_for_name name
+    raise "#{name} has no default value" unless has_default? autonym
+ 
+    _attributes_for(autonym).default_type
+  end
+  
   # @endgroup
 
-end; end
+end; end

data/lib/striuct/classmethods/enum.rb

@@ -15,7 +15,6 @@ class Striuct; module ClassMethods
 
   alias_method :each_name, :each_autonym
   alias_method :each_member, :each_autonym
-  alias_method :each_key, :each_autonym
   
   # @yield [index] 
   # @yieldparam [Integer] Index
@@ -42,8 +41,7 @@ class Striuct; module ClassMethods
 
   alias_method :each_name_with_index, :each_autonym_with_index
   alias_method :each_member_with_index, :each_autonym_with_index
-  alias_method :each_key_with_index, :each_autonym_with_index
 
   # @endgroup
 
-end; end
+end; end

data/lib/striuct/classmethods/fix.rb

@@ -0,0 +1,28 @@
+class Striuct; module ClassMethods
+
+  # @group Fix inner data structures 
+
+  # @return [self]
+  def freeze
+    [@autonyms, @attributes, @aliases].each(&:freeze)
+    super
+  end
+
+  def closed?
+    [@autonyms, @attributes, @aliases].any?(&:frozen?)
+  end
+
+  private
+
+  # @return [self]
+  def close_member
+    [@autonyms, @attributes, @aliases].each(&:freeze)
+    self
+  end
+  
+  alias_method :fix_structural, :close_member
+  alias_method :close, :close_member
+
+  # @endgroup
+
+end; end

data/lib/striuct/classmethods/hashy.rb

@@ -0,0 +1,22 @@
+require_relative 'named'
+require_relative 'enum'
+
+class Striuct; module ClassMethods
+
+  # @group Like Ruby's Hash
+
+  alias_method :keys, :autonyms
+  alias_method :has_key?, :has_member?
+  alias_method :key?, :has_key?
+  alias_method :each_key, :each_autonym
+
+  # @endgroup
+
+
+  # @group Like Ruby's Hash +
+
+  alias_method :each_key_with_index, :each_autonym_with_index
+
+  # @endgroup
+
+end; end

data/lib/striuct/classmethods/inner.rb

@@ -4,89 +4,55 @@ class Striuct; module ClassMethods
 
   private
 
-  def __getter__!(name) 
-    define_method name do
-      __get__ name
-    end
-    
-    nil
-  end
+  def _add_autonym(autonym)
+    autonym = _nameable_for autonym
+    raise NameError, 'already defined' if member? autonym
 
-  def _remove_inference(autonym)
-    @inferences.delete autonym
-  end
-  
-  def _mark_setter_validation(autonym)
-    @setter_validations[autonym] = true
+    @attributes[autonym] = Attributes.new
+    @autonyms << autonym
   end
 
-  def _mark_getter_validation(autonym)
-    @getter_validations[autonym] = true
+  def _attributes_for(autonym)
+    @attributes.fetch autonym
   end
 
-  def _mark_inference(autonym)
-    @inferences[autonym] = true
-  end
-  
-  def _set_adjuster(autonym, adjuster)
-    @adjusters[autonym] = adjuster
-  end
-  
-  def _set_condition(autonym, condition)
-    @conditions[autonym] = condition
-  end
-  
-  def _set_default_value(autonym, value)
-    @defaults[autonym] = value
+  def _def_getter!(autonym) 
+    define_method autonym do
+      _get autonym
+    end
+    
+    nil
   end
 
-  def __setter__!(autonym, condition, &adjuster)
-    __set_condition__! autonym, condition unless Validation::Condition::ANYTHING.equal? condition
-    __set_adjuster__! autonym, &adjuster if block_given?
-
-    define_method :"#{autonym}=" do |value|
-      __set__ autonym, value
+  def _def_setter!(autonym, condition, &adjuster)
+    unless Validation::Condition::ANYTHING.equal? condition
+      _attributes_for(autonym).condition = condition
     end
- 
-    nil
 
-  end
-  
-  def __set_condition__!(autonym, condition)
-    if ::Validation.conditionable? condition
-      _set_condition autonym, condition
-    else
-      raise TypeError, 'wrong object for condition'
+    if block_given?
+      _attributes_for(autonym).adjuster = adjuster
     end
- 
-    nil
-  end
 
-  def __set_adjuster__!(autonym, &adjuster)
-    if ::Validation.adjustable? adjuster
-      _set_adjuster autonym, adjuster
-    else
-      raise ArgumentError, "wrong number of block argument #{arity} for 1"
+    define_method :"#{autonym}=" do |value|
+      _set autonym, value
     end
  
     nil
   end
 
-  def __found_family__!(_caller, autonym, our)
+  def _found_family!(_caller, autonym, our)
     family = our.class
 
     raise 'must not happen' unless inference?(autonym) and
                                     autonym?(autonym) and
                                    _caller.instance_of?(self)
 
-    raise ArgumentError unless Validation.conditionable? family
-
-    _set_condition autonym, family
-    _remove_inference autonym
+    _attributes_for(autonym).condition = family
+    _attributes_for(autonym).inference = false
 
     nil
   end
   
   # @endgroup
 
-end; end
+end; end