parallel-ancestry 1.0.4 → 1.0.5

data/CHANGELOG.rdoc

@@ -13,3 +13,7 @@ Shortened :initialize_base_instance_for_include and :initialize_base_instance_fo
 
 Renamed :match_ancestor_searching_upward to :match_ancestor because ancestors are always found by searching upward.
 Fixes for ancestor lookup when arriving at Class.
+
+== 6/15/2012
+
+Added unique-array for children and parents, which means now :include? etc. use hash lookup internally.

data/lib/parallel-ancestry.rb

@@ -1,5 +1,6 @@
 
 require 'module-cluster'
+require 'unique-array'
 
 module ::ParallelAncestry
   
@@ -9,9 +10,10 @@ basepath = 'parallel-ancestry/ParallelAncestry'
 
 files = [
   
-  'ModuleSubclassInheritance',
   'Inheritance',
-  'Inheritance/ModuleSubclassInheritance'
+  'Inheritance/ModuleSubclassInheritance',
+
+  'ModuleSubclassInheritance'
     
 ]
 

data/lib/parallel-ancestry/ParallelAncestry.rb

@@ -1,7 +1,7 @@
 
 module ::ParallelAncestry
 
-  InstanceAncestryStruct = ::Struct.new( :children_hash, :parents_array, :parents_hash )
+  InstanceAncestryStruct = ::Struct.new( :children, :parents )
 
   extend ::ModuleCluster::Define::Block::ClassOrModule
   
@@ -32,7 +32,7 @@ module ::ParallelAncestry
   # @return [Array<Object>] An array containing references to children.
   def children( instance )
     
-    return children_hash( instance ).keys
+    return ancestor_struct( instance ).children ||= ::UniqueArray.new( self )
 
   end
 
@@ -45,7 +45,7 @@ module ::ParallelAncestry
   # @return [Array<Object>] An array containing references to immediate parents for any configuration.
   def parents( instance )
     
-    return parents_array( instance )
+    return ancestor_struct( instance ).parents ||= ::UniqueArray.new( self )
 
   end
 
@@ -58,15 +58,7 @@ module ::ParallelAncestry
   # @return [true, false] true or false.
   def has_parents?( instance )
     
-    has_parents = false
-    
-    ancestor_struct = ancestor_struct( instance )
-    
-    if ancestor_struct.parents_array
-      has_parents = ! ancestor_struct.parents_array.empty?
-    end
-    
-    return has_parents
+    return ! parents( instance ).empty?
 
   end
 
@@ -79,15 +71,7 @@ module ::ParallelAncestry
   # @return [true, false] true or false.
   def has_children?( instance )
     
-    has_children = false
-    
-    ancestor_struct = ancestor_struct( instance )
-    
-    if ancestor_struct.children_hash
-      has_children = ! ancestor_struct.children_hash.empty?
-    end
-    
-    return has_children
+    return ! children( instance ).empty?
 
   end
 
@@ -101,19 +85,14 @@ module ::ParallelAncestry
   # @return [Array<Object>] An array containing references to children.
   def register_child_for_parent( child, parent )
 
-    parents_of_child_hash = parents_hash( child )
-    children_of_parent_hash = children_hash( parent )
+    parents_of_child = parents( child )
+    children_of_parent = children( parent )
 
-    unless children_of_parent_hash.has_key?( child )
-      # child order shouldn't be relevant
-      children_of_parent_hash[ child ] = true
-    end
+    # child order shouldn't be relevant
+    children_of_parent.push( child )
     
-    unless parents_of_child_hash.has_key?( parent )
-      parents_of_child_hash[ parent ] = true
-      # parent order determines who wins conflicts, so we keep youngest first
-      parents_array( child ).unshift( parent )
-    end
+    # parent order determines who wins conflicts, so we keep youngest first
+    parents_of_child.unshift( parent )
 
     return self
 
@@ -373,34 +352,4 @@ module ::ParallelAncestry
     
   end
 
-  ###################
-  #  children_hash  #
-  ###################
-  
-  def children_hash( instance )
-    
-    return ancestor_struct( instance ).children_hash ||= { }
-
-  end
-
-  ##################
-  #  parents_hash  #
-  ##################
-  
-  def parents_hash( instance )
-    
-    return ancestor_struct( instance ).parents_hash ||= { }
-
-  end
-
-  ###################
-  #  parents_array  #
-  ###################
-  
-  def parents_array( instance )
-    
-    return ancestor_struct( instance ).parents_array ||= [ ]
-
-  end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parallel-ancestry
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-12 00:00:00.000000000 Z
+date: 2012-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: module-cluster
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: unique-array
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Create and track parallel inheritance hierarchies. Hook parallel hierarchies
   (by including a module) to automatically update/register ancestry at include and
   extend, or update/register only manually. Manual registration permits definitions