closure_tree 3.0.4 → 3.1.0

data/README.md

@@ -9,6 +9,12 @@ See [Bill Karwin](http://karwin.blogspot.com/)'s excellent
 [Models for hierarchical data presentation](http://www.slideshare.net/billkarwin/models-for-hierarchical-data)
 for a description of different tree storage algorithms.
 
+Closure tree is [tested under every combination](https://secure.travis-ci.org/mceachen/closure_tree.png?branch=master) of
+
+* Ruby 1.8.7 and Ruby 1.9.3
+* The latest Rails 3.0, 3.1, and 3.2 branches, and
+* Using MySQL, Postgresql, and SQLite.
+
 ## Installation
 
 Note that closure_tree only supports Rails 3.0 and later, and has test coverage for MySQL, PostgreSQL, and SQLite.
@@ -181,6 +187,10 @@ class WhatTag < Tag ; end
 
 ## Change log
 
+### 3.1.0
+
+* Switched to using ```has_many :though``` rather than ```has_and_belongs_to_many```
+
 ### 3.0.4
 
 * Merged [pull request](https://github.com/mceachen/closure_tree/pull/8) to fix ```.siblings``` and ```.self_and_siblings```

data/lib/closure_tree/acts_as_tree.rb

@@ -24,6 +24,11 @@ module ClosureTree
         belongs_to :ancestor, :class_name => "#{ct_class.to_s}"
         belongs_to :descendant, :class_name => "#{ct_class.to_s}"
         attr_accessible :ancestor, :descendant, :generations
+        def ==(comparison_object)
+          comparison_object.instance_of?(self.class) &&
+          self.attributes == comparison_object.attributes
+        end
+        alias :eql? :==
       RUBY
 
       include ClosureTree::Model
@@ -42,18 +47,26 @@ module ClosureTree
         :foreign_key => parent_column_name,
         :dependent => closure_tree_options[:dependent]
 
-      has_and_belongs_to_many :self_and_ancestors,
-        :class_name => ct_class.to_s,
-        :join_table => hierarchy_table_name,
+      has_many :ancestor_hierarchies,
+        :class_name => hierarchy_class_name,
         :foreign_key => "descendant_id",
-        :association_foreign_key => "ancestor_id",
+        :order => "generations asc",
+        :dependent => :destroy
+
+      has_many :self_and_ancestors,
+        :through => :ancestor_hierarchies,
+        :source => :ancestor,
         :order => "generations asc"
 
-      has_and_belongs_to_many :self_and_descendants,
-        :class_name => ct_class.to_s,
-        :join_table => hierarchy_table_name,
+      has_many :descendant_hierarchies,
+        :class_name => hierarchy_class_name,
         :foreign_key => "ancestor_id",
-        :association_foreign_key => "descendant_id",
+        :order => "generations asc",
+        :dependent => :destroy
+
+      has_many :self_and_descendants,
+        :through => :descendant_hierarchies,
+        :source => :descendant,
         :order => "generations asc"
 
       scope :roots, where(parent_column_name => nil)
@@ -71,7 +84,7 @@ module ClosureTree
 
     # Returns true if this node has no parents.
     def root?
-      parent.nil?
+      _parent_id.nil?
     end
 
     # Returns true if this node has a parent, and is not a root.
@@ -86,7 +99,7 @@ module ClosureTree
 
     # Returns the farthest ancestor, or self if +root?+
     def root
-      root? ? self : ancestors.last
+      self_and_ancestors.where(parent_column_name.to_sym => nil).first
     end
 
     def leaves
@@ -136,7 +149,7 @@ module ClosureTree
 
     # Find a child node whose +ancestry_path+ minus self.ancestry_path is +path+.
     def find_by_path(path)
-      path = [path] unless path.is_a? Enumerable
+      path = path.is_a?(Enumerable) ? path.dup : [path]
       node = self
       while !path.empty? && node
         node = node.children.send("find_by_#{name_column}", path.shift)
@@ -146,7 +159,7 @@ module ClosureTree
 
     # Find a child node whose +ancestry_path+ minus self.ancestry_path is +path+
     def find_or_create_by_path(path, attributes = {})
-      path = [path] unless path.is_a? Enumerable
+      path = path.is_a?(Enumerable) ? path.dup : [path]
       node = self
       attrs = {}
       attrs[:type] = self.type if ct_subclass? && ct_has_type?

data/lib/closure_tree/version.rb

@@ -1,3 +1,3 @@
 module ClosureTree
-  VERSION = "3.0.4" unless defined?(::ClosureTree::VERSION)
+  VERSION = "3.1.0" unless defined?(::ClosureTree::VERSION)
 end

data/spec/tag_spec.rb

@@ -6,7 +6,6 @@ shared_examples_for Tag do
     def nuke_db
       Tag.delete_all
       TagHierarchy.delete_all
-      DestroyedTag.delete_all
     end
 
     before :each do
@@ -42,6 +41,7 @@ shared_examples_for Tag do
         @root = Tag.create! :name => "root"
         @mid = @root.children.create! :name => "mid"
         @leaf = @mid.children.create! :name => "leaf"
+        DestroyedTag.delete_all
       end
 
       it "should create all tags" do
@@ -100,6 +100,23 @@ shared_examples_for Tag do
         @root.children << @leaf
         Tag.leaves.should =~ [@leaf, @mid]
       end
+      
+      it "cleans up hierarchy references for leaves" do
+        @leaf.destroy
+        TagHierarchy.find_all_by_ancestor_id(@leaf.id).should be_empty
+        TagHierarchy.find_all_by_descendant_id(@leaf.id).should be_empty
+      end
+
+      it "cleans up hierarchy references" do
+        @mid.destroy
+        TagHierarchy.find_all_by_ancestor_id(@mid.id).should be_empty
+        TagHierarchy.find_all_by_descendant_id(@mid.id).should be_empty
+        @root.reload.should be_root
+        root_hiers = @root.ancestor_hierarchies.to_a
+        root_hiers.size.should == 1
+        TagHierarchy.find_all_by_ancestor_id(@root.id).should == root_hiers
+        TagHierarchy.find_all_by_descendant_id(@root.id).should == root_hiers
+      end
     end
   end
 
@@ -109,6 +126,7 @@ shared_examples_for Tag do
 
     before :each do
       Tag.rebuild!
+      DestroyedTag.delete_all
     end
 
     context "class injection" do
@@ -199,8 +217,8 @@ shared_examples_for Tag do
         l1 = Tag.find_or_create_by_path(%w{roottest1 branch1 leaf1})
         l2 = Tag.find_or_create_by_path(%w{roottest2 branch2 leaf2})
         l1.children << l2.root
-        l1.ancestry_path.should == %w{roottest1 branch1 leaf1}
-        l2.ancestry_path.should == %w{roottest1 branch1 leaf1 roottest2 branch2 leaf2}
+        l1.reload.ancestry_path.should == %w{roottest1 branch1 leaf1}
+        l2.reload.ancestry_path.should == %w{roottest1 branch1 leaf1 roottest2 branch2 leaf2}
       end
 
       it "should cascade delete all children" do
@@ -238,12 +256,12 @@ shared_examples_for Tag do
         tags(:a1).self_and_siblings.to_a.should =~ Tag.roots.to_a
       end
 
-      it "should assemble ancestors correctly" do
+      it "assembles ancestors" do
         tags(:child).ancestors.should == [tags(:parent), tags(:grandparent)]
         tags(:child).self_and_ancestors.should == [tags(:child), tags(:parent), tags(:grandparent)]
       end
 
-      it "should assemble descendants correctly" do
+      it "assembles descendants" do
         tags(:parent).descendants.should == [tags(:child)]
         tags(:parent).self_and_descendants.should == [tags(:parent), tags(:child)]
         tags(:grandparent).descendants.should == [tags(:parent), tags(:child)]

data/spec/user_spec.rb

@@ -37,6 +37,7 @@ describe "empty db" do
       @root = User.create! :email => "poppy@t.co"
       @mid = @root.children.create! :email => "matt@t.co"
       @leaf = @mid.children.create! :email => "james@t.co"
+      @root_id = @root.id
     end
 
     it "should create all Users" do
@@ -63,13 +64,15 @@ describe "empty db" do
       @root.destroy
       assert_mid_and_leaf_remain
     end
-  end
-end
 
-def assert_mid_and_leaf_remain
-  @mid.ancestry_path.should == %w{matt@t.co}
-  @leaf.ancestry_path.should == %w{matt@t.co james@t.co}
-  @mid.self_and_descendants.should =~ [@mid, @leaf]
-  User.roots.should == [@mid]
-  User.leaves.should == [@leaf]
+    def assert_mid_and_leaf_remain
+      ReferralHierarchy.find_all_by_ancestor_id(@root_id).should be_empty
+      ReferralHierarchy.find_all_by_descendant_id(@root_id).should be_empty
+      @mid.ancestry_path.should == %w{matt@t.co}
+      @leaf.ancestry_path.should == %w{matt@t.co james@t.co}
+      @mid.self_and_descendants.should =~ [@mid, @leaf]
+      User.roots.should == [@mid]
+      User.leaves.should == [@leaf]
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: closure_tree
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-11 00:00:00.000000000 Z
+date: 2012-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -192,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1662601254141526016
+      hash: 1583374080415694998
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1662601254141526016
+      hash: 1583374080415694998
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.21