striuct 0.3.4 → 0.3.5

data/lib/striuct/classmethods/macro.rb

@@ -18,10 +18,6 @@ class Striuct; module ClassMethods
     setter_validation: true
   }.freeze
   
-  def closed?
-    [@autonyms, @adjusters, @defaults, @aliases].any?(&:frozen?)
-  end
-
   private
 
   # @param [Symbol, String] autonym
@@ -36,6 +32,7 @@ class Striuct; module ClassMethods
   # @option options [Boolean] :setter_validation
   # @return [nil]
   def add_member(autonym, condition=Validation::Condition::ANYTHING, options=DEFAULT_MEMBER_OPTIONS, &adjuster)
+    raise "can't modify frozen Class" if frozen?
     raise "already closed to add member in #{self}" if closed?
     options = DEFAULT_MEMBER_OPTIONS.merge(options).extend(KeyValidatable)
     options.validate_keys let: VALID_MEMBER_OPTIONS
@@ -43,17 +40,26 @@ class Striuct; module ClassMethods
       raise ArgumentError, 'It is not able to choose "default" with "default_proc" in options'
     end
     
-    autonym = keyable_for autonym # First difinition for an autonym
+    autonym = _nameable_for autonym # First difinition for an autonym
 
     raise ArgumentError, %Q!already exist name "#{autonym}"! if member? autonym
     _check_safety_naming autonym
-    _mark_setter_validation autonym if options[:setter_validation] or options[:writer_validation]
-    _mark_getter_validation autonym if options[:getter_validation] or options[:reader_validation]
-    _mark_inference autonym if options[:inference]
+    _add_autonym autonym
 
-    @autonyms << autonym
-    __getter__! autonym
-    __setter__! autonym, condition, &adjuster
+    if options[:setter_validation] or options[:writer_validation]
+      _attributes_for(autonym).validate_with_setter = true
+    end
+
+    if options[:getter_validation] or options[:reader_validation]
+      _attributes_for(autonym).validate_with_getter = true
+    end
+
+    if options[:inference]
+      _attributes_for(autonym).inference = true
+    end
+
+    _def_getter! autonym
+    _def_setter! autonym, condition, &adjuster
     
     if options.has_key?(:default)
       set_default_value autonym, options.fetch(:default)
@@ -72,6 +78,7 @@ class Striuct; module ClassMethods
   # @param [Symbol, String] autonyms
   # @return [nil]
   def add_members(autonym, *autonyms)
+    raise "can't modify frozen Class" if frozen?
     raise "already closed to add members in #{self}" if closed?
     
     [autonym, *autonyms].each {|_autonym|add_member _autonym}
@@ -82,63 +89,42 @@ class Striuct; module ClassMethods
   # @param [Symbol, String] autonym
   # @return [nil]
   def alias_member(aliased, autonym)
+    raise "can't modify frozen Class" if frozen?
     raise "already closed to add members in #{self}" if closed?
-    autonym = autonym_for autonym
-    aliased  = keyable_for aliased
+    autonym = autonym_for_name autonym
+    aliased  = _nameable_for aliased
     raise ArgumentError, %Q!already exist name "#{aliased}"! if member? aliased
     _check_safety_naming aliased
 
     alias_method aliased, autonym
     alias_method :"#{aliased}=", :"#{autonym}="
-    _alias_member aliased, autonym
+    @aliases[aliased] = autonym
     nil
   end
   
   # @param [Symbol, String] name
   # @return [nil]
   def set_default_value(name, value=nil, &block)
+    raise "can't modify frozen Class" if frozen?
     raise "already closed to modify member attributes in #{self}" if closed?
-    autonym = autonym_for(name)
+    autonym = autonym_for_name(name)
     raise "already settled default value for #{name}" if has_default? autonym
 
-    value = (
-      if block_given?
-        if value.nil?
-          arity = block.arity
-          
-          if valid_default_proc? block
-            DefaultProcHolder.new block
-          else
-            raise ArgumentError, "wrong number of block parameter #{arity} for 0..2"
-          end
-        else
-          raise ArgumentError, 'can not use value and block arguments'
-        end
-      else
-        value
+    if block_given?
+      unless value.nil?
+        raise ArgumentError, 'can not use default-value with default-proc'
       end
-    )
+
+      _attributes_for(autonym).set_default block, :lazy
+    else
+      _attributes_for(autonym).set_default value, :value
+    end
     
-    _set_default_value autonym, value
     nil
   end
   
   alias_method :default, :set_default_value
-  
-  # @param [Proc] _proc
-  def valid_default_proc?(_proc)
-    _proc.arity <= 2
-  end
-  
-  # @return [self]
-  def close_member
-    [@autonyms, @adjusters, @defaults, @aliases].each(&:freeze)
-    self
-  end
-  
-  alias_method :fix_structural, :close_member
-  alias_method :close, :close_member
-  
+
   # @endgroup
 
 end; end

data/lib/striuct/classmethods/named.rb

@@ -2,12 +2,6 @@ class Striuct; module ClassMethods
 
   # @group Named
 
-  # @param [Symbol, String, #to_sym] name
-  # @return [Symbol]
-  def keyable_for(name)
-    name.to_sym
-  end
-
   # @return [Array<Symbol>]
   def autonyms
     @autonyms.dup
@@ -15,7 +9,6 @@ class Striuct; module ClassMethods
 
   alias_method :names, :autonyms
   alias_method :members, :autonyms
-  alias_method :keys, :autonyms
   
   # @return [Array<Symbol>]
   def all_members
@@ -23,7 +16,7 @@ class Striuct; module ClassMethods
   end
 
   def has_member?(name)
-    autonym_for name
+    autonym_for_name name
   rescue Exception
     false
   else
@@ -31,44 +24,68 @@ class Striuct; module ClassMethods
   end
   
   alias_method :member?, :has_member?
-  alias_method :has_key?, :has_member?
-  alias_method :key?, :has_key?
 
-  # @param [Symbol, String, #to_sym, #to_str] name
+  # @param [Symbol, String, #to_sym] name - autonym / aliased
   # @return [Symbol]
-  def autonym_for(name)
-    name = keyable_for name
+  def autonym_for_name(name)
+    name = _nameable_for name
     
-    if @autonyms.include? name
-      name
-    else
-      if autonym = _autonym_for(name)
-        autonym
+    return name if @autonyms.include? name
+    
+    unless @aliases.has_key? name
+      raise NameError, "not defined member for #{name}"
+    end
+    
+    @aliases.fetch name
+  end
+
+  alias_method :autonym_for, :autonym_for_name # todo modify to autonym_for_key 
+
+  # @param [Symbol, String, Fixnum] key - autonym / aliased / index
+  # @return [Symbol] autonym
+  def autonym_for_key(key)
+    case key
+    when Symbol, String
+      name = _nameable_for key
+      if member? name
+        return autonym_for_name(name)
       else
-        raise NameError, "not defined member for #{name}"
+        raise NameError
       end
+    when Fixnum
+      if autonym = _autonyms[key]
+        return autonym
+      else
+        raise IndexError
+      end
+    else
+      raise ArgumentError
     end
+
+    raise 'must not happen'
   end
 
   # @param [Symbol, String] name
-  def autonym?(name)
-    name = keyable_for name
+  def has_autonym?(name)
+    name = _nameable_for name
     raise NameError unless member? name
 
     @autonyms.include? name
   end
   
-  alias_method :original?, :autonym?
+  alias_method :autonym?, :has_autonym?
+  alias_method :original?, :has_autonym? # obsolute
   
   # @param [Symbol, String] name
-  def alias?(name)
-    name = keyable_for name
+  def has_alias?(name)
+    name = _nameable_for name
     raise NameError unless member? name
 
     @aliases.has_key? name
   end
   
-  alias_method :aliased?, :alias?
+  alias_method :alias?, :has_alias?
+  alias_method :aliased?, :has_alias? # obsolute
   
   # @param [Symbol, String] autonym
   def has_aliases?(autonym)
@@ -80,10 +97,10 @@ class Striuct; module ClassMethods
   # @param [Symbol, String] autonym
   # @return [Array<Symbol>]
   def aliases_for(autonym)
-    autonym = keyable_for autonym
+    autonym = _nameable_for autonym
     raise NameError unless has_aliases? autonym
 
-    _aliases_for autonym
+    @aliases.group_by{|aliased, an|an}.fetch(autonym)
   end
   
   # @return [Hash] alias => autonym
@@ -92,23 +109,18 @@ class Striuct; module ClassMethods
   end
   
   private
+
+  # @param [Symbol, String, #to_sym] name
+  # @return [Symbol]
+  def _nameable_for(name)
+    name.to_sym
+  end
   
+  # for access from own instance
   def _autonyms
     @autonyms
   end
   
-  def _alias_member(aliased, autonym)
-    @aliases[aliased] = autonym
-  end
-  
-  def _autonym_for(aliased)
-    @aliases[aliased]
-  end
-  
-  def _aliases_for(autonym)
-    @aliases.group_by{|aliased, an|an}.fetch(autonym)
-  end
-
   # @endgroup
 
-end; end
+end; end

data/lib/striuct/classmethods/prevent_conflicts.rb

@@ -21,7 +21,7 @@ class Striuct; module ClassMethods
   # @param [Object] name
   # accpeptable the name into own member, under protect level of runtime
   def cname?(name)
-    _check_safety_naming(keyable_for name){|r|r}
+    _check_safety_naming(_nameable_for name){|r|r}
   rescue Exception
     false
   end

data/lib/striuct/classmethods/requiremnets.rb

@@ -1,12 +1,14 @@
 require_relative 'inner'
 require_relative 'named'
-require_relative 'object'
+require_relative 'copy'
+require_relative 'fix'
 require_relative 'length'
 require_relative 'to_struct'
 require_relative 'constructor'
 require_relative 'enum'
+require_relative 'hashy'
 require_relative 'default'
 require_relative 'adjustment'
 require_relative 'macro'
 require_relative 'prevent_conflicts'
-require_relative 'validation'
+require_relative 'validation'

data/lib/striuct/classmethods/validation.rb

@@ -5,52 +5,49 @@ class Striuct; module ClassMethods
   # @param [Symbol, String] name
   # inference checker is waiting yet
   def inference?(name)
-    autonym = autonym_for name
+    autonym = autonym_for_name name
 
-    @inferences.has_key? autonym
+    _attributes_for(autonym).inference?
   end
 
   # @param [Symbol, String] name
-  def has_validator?(name)
-    autonym = autonym_for name
+  def has_condition?(name)
+    autonym = autonym_for_name name
 
-    @conditions.has_key? autonym
+    _attributes_for(autonym).has_condition?
   end
   
-  alias_method :has_condition?, :has_validator?
-  alias_method :restrict?, :has_validator?
-  
+  alias_method :restrict?, :has_condition?
+  alias_method :has_validator?, :has_condition? # obsolute
+
   # @param [Symbol, String] name
-  def validator_for(name)
-    _condition_for autonym_for(name)
+  def condition_for(name)
+    return nil unless has_condition? name
+    autonym = autonym_for_name name
+
+    _attributes_for(autonym).condition
   end
   
-  alias_method :condition_for, :validator_for
+  alias_method :validator_for, :condition_for # obsolute
 
   # @param [Symbol, String] name
   def safety_getter?(name)
-    autonym = autonym_for name
+    autonym = autonym_for_name name
 
-    @getter_validations.has_key? autonym
+    _attributes_for(autonym).validate_with_getter?
   end
   
   alias_method :safety_reader?, :safety_getter?
   
   # @param [Symbol, String] name
   def safety_setter?(name)
-    autonym = autonym_for name
+    autonym = autonym_for_name name
 
-    @setter_validations.has_key? autonym
+    _attributes_for(autonym).validate_with_setter?
   end
 
   alias_method :safety_writer?, :safety_setter?
 
-  private
-  
-  def _condition_for(name)
-    @conditions[name]
-  end
-
   # @endgroup
 
-end; end
+end; end

data/lib/striuct/hashdeepdupulicatable.rb

@@ -0,0 +1,21 @@
+class Striuct
+
+  module HashDeepDupulicatable
+
+    # @return [Hash]
+    def deep_dup
+      dup.tap {|h|
+        each_pair do |key, value|
+          h[key] = value.dup
+        end
+        h.extend HashDeepDupulicatable
+      }
+    end
+
+  end
+
+  if respond_to? :private_constant
+    private_constant :HashDeepDupulicatable
+  end
+
+end

data/lib/striuct/instancemethods/assign.rb

@@ -8,18 +8,21 @@ class Striuct; module InstanceMethods
   
   # @param [Symbol, String] name
   def assign?(name)
-    autonym = autonym_for name
+    autonym = autonym_for_name name
     
     @db.has_key? autonym
   end
   
   # @param [Symbol, String, Fixnum] key
-  def clear_at(key)
-    __subscript__(key){|autonym|__clear__ autonym}
+  def unassign(key)
+    raise "can't modify frozen #{self.class}" if frozen?
+    autonym = autonym_for_key key
+
+    @db.delete autonym
   end
   
-  alias_method :unassign, :clear_at
-  alias_method :reset_at, :clear_at
+  alias_method :clear_at, :unassign # obsolute
+  alias_method :reset_at, :unassign
 
   # all members aren't assigned
   def empty?
@@ -28,4 +31,4 @@ class Striuct; module InstanceMethods
 
   # @endgroup
 
-end; end
+end; end

data/lib/striuct/instancemethods/default.rb

@@ -4,7 +4,7 @@ class Striuct; module InstanceMethods
   
   # @param [Symbol, String] name
   def default?(name)
-    autonym = autonym_for name
+    autonym = autonym_for_name name
 
     default_for(autonym) == self[autonym]
   end

data/lib/striuct/instancemethods/delegate_class_methods.rb

@@ -10,18 +10,24 @@ class Striuct; module InstanceMethods
   # @group Delegate Class Methods
   
   def_delegators :'self.class',
-    :_autonyms,
-    :keyable_for, :autonym_for, :aliases_for,
+    :_autonyms, :_nameable_for,
+    :autonym_for, :autonym_for_name, :autonym_for_key,
+    :aliases_for,
     :validator_for, :condition_for,
     :adjuster_for, :flavor_for,
     :members, :keys, :names, :autonyms, :all_members, :aliases,
     :has_member?, :member?, :has_key?, :key?,
+    :has_autonym?, :autonym?,
+    :has_alias?, :alias?, :aliased?,
+    :has_aliases?,
     :length, :size,
     :restrict?, :has_validator?, :has_condition?,
-    :safety_getter?, :safety_reader?, :safety_setter?, :safty_writer?, :inference?,
-    :has_default?, :default_for, :has_adjuster?, :has_flavor?
+    :safety_getter?, :safety_reader?, :safety_setter?, :safty_writer?,
+    :inference?,
+    :has_default?, :default_value_for, :default_for, :default_type_for,
+    :has_adjuster?, :has_flavor?
 
-  private :_autonyms
+  private :_autonyms, :_nameable_for
 
   # @endgroup
   

data/lib/striuct/instancemethods/hashy.rb

@@ -81,7 +81,7 @@ class Striuct; module InstanceMethods
   # @param [Symbol, String] name
   # @return [Array] e.g [autonym, value]
   def assoc(name)
-    autonym = autonym_for name
+    autonym = autonym_for_name name
 
     [autonym, self[name]]
   end

data/lib/striuct/instancemethods/{inner.rb → inner_accessor.rb}

@@ -1,11 +1,11 @@
 class Striuct; module InstanceMethods
 
-  # @group Use Only Inner
+  # @group These Accessor API using only inner 
 
   private
 
-  def __get__(name)
-    autonym = autonym_for name
+  def _get(name)
+    autonym = autonym_for_name name
     value = @db[autonym]
   
     if safety_getter?(autonym) and !accept?(autonym, value)
@@ -16,9 +16,9 @@ class Striuct; module InstanceMethods
     value
   end
 
-  def __set__(name, value)
+  def _set(name, value)
     raise "can't modify frozen #{self.class}" if frozen?
-    autonym = autonym_for name
+    autonym = autonym_for_name name
     raise "can't modify locked member #{name}" if lock? autonym
 
     if has_adjuster? autonym
@@ -35,7 +35,7 @@ class Striuct; module InstanceMethods
     end
 
     if inference? autonym
-      self.class.__send__ :__found_family__!, self, autonym, value
+      self.class.__send__ :_found_family!, self, autonym, value
     end
     
     @db[autonym] = value
@@ -48,13 +48,6 @@ class Striuct; module InstanceMethods
     raise
   end
   
-  # @param [Symbol] autonym
-  def __clear__(autonym)
-    raise "can't modify frozen #{self.class}" if frozen?
-    
-    @db.delete autonym
-  end
-
   # @endgroup
 
 end; end

data/lib/striuct/instancemethods/lock.rb

@@ -17,7 +17,8 @@ class Striuct; module InstanceMethods
         @locks[autonym] = true
       end
     else
-      __subscript__(key){|autonym|@locks[autonym] = true}
+      autonym = autonym_for_key key
+      @locks[autonym] = true
     end
 
     self
@@ -33,7 +34,8 @@ class Striuct; module InstanceMethods
     if key.equal? true
       _autonyms.all?{|autonym|@locks[autonym]}
     else
-      __subscript__(key){|autonym|@locks[autonym]} || false
+      autonym = autonym_for_key key
+      @locks[autonym] || false
     end
   end
   
@@ -51,7 +53,8 @@ class Striuct; module InstanceMethods
     if key.equal? true
       @locks.clear
     else
-      __subscript__(key){|autonym|@locks.delete autonym}
+      autonym = autonym_for_key key
+      @locks.delete autonym
     end
 
     self
@@ -59,4 +62,4 @@ class Striuct; module InstanceMethods
 
   # @endgroup
 
-end; end
+end; end

data/lib/striuct/instancemethods/object.rb

@@ -5,34 +5,8 @@ class Striuct; module InstanceMethods
   def initialize(*values)
     @db, @locks = {}, {}
     replace_values(*values)
-  end
-  
-  # @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 << '>'
-    }
+    excess = _autonyms.last(size - values.size)
+    set_defaults(*excess)
   end
 
   # @return [self]
@@ -49,4 +23,27 @@ class Striuct; module InstanceMethods
 
   # @endgroup
 
+  # @group Default Value
+
+  # @return [self]
+  def set_defaults(*target_autonyms)
+    target_autonyms.each do |autonym|
+      if has_default? autonym
+        default = default_value_for autonym
+        self[autonym] = (
+          if default_type_for(autonym) == :lazy
+            args = [self, autonym][0, default.arity]
+            default.call(*args)
+          else
+            default
+          end
+        )
+      end
+    end
+    
+    self
+  end
+
+  # @endgroup
+
 end; end

data/lib/striuct/instancemethods/requirements.rb

@@ -1,8 +1,9 @@
 require_relative 'delegate_class_methods'
 require_relative 'keyvalidatable'
-require_relative 'inner'
+require_relative 'inner_accessor'
 require_relative 'object'
 require_relative 'compare'
+require_relative 'to_s'
 require_relative 'values'
 require_relative 'cast'
 require_relative 'default'
@@ -12,4 +13,4 @@ require_relative 'subscript'
 require_relative 'assign'
 require_relative 'lock'
 require_relative 'validation'
-require_relative 'safety'
+require_relative 'safety'