closure_tree 1.0.0.beta3 → 1.0.0.beta5

data/README.rdoc

@@ -105,6 +105,7 @@ Note that the other columns will be null if nodes are created, other than auto-g
 [tag.root?] returns true if this is a root node
 [tag.child?] returns true if this is a child node. It has a parent.
 [tag.leaf?] returns true if this is a leaf node. It has no children.
+[tag.leaves] returns an array of all the nodes in self_and_descendants that are leaves.
 [tag.level] returns the level, or "generation", for this node in the tree. A root node = 0
 [tag.parent] returns the node's immediate parent
 [tag.children] returns an array of immediate children (just those in the next level).

data/lib/closure_tree/acts_as_tree.rb

@@ -33,23 +33,23 @@ module ClosureTree #:nodoc:
                :foreign_key => parent_column_name,
                :before_add => :add_child
 
-      has_many :ancestors_hierarchy,
-               :class_name => hierarchy_class_name,
-               :foreign_key => "descendant_id"
-
-      has_many :ancestors, :through => :ancestors_hierarchy,
-               :order => "generations asc"
-
-      has_many :descendants_hierarchy,
-               :class_name => hierarchy_class_name,
-               :foreign_key => "ancestor_id"
-
-      has_many :descendants, :through => :descendants_hierarchy,
-               :order => "generations asc"
+      has_and_belongs_to_many :ancestors,
+                              :class_name => base_class.to_s,
+                              :join_table => hierarchy_table_name,
+                              :foreign_key => "descendant_id",
+                              :association_foreign_key => "ancestor_id",
+                              :order => "generations asc"
+
+      has_and_belongs_to_many :descendants,
+                              :class_name => base_class.to_s,
+                              :join_table => hierarchy_table_name,
+                              :foreign_key => "ancestor_id",
+                              :association_foreign_key => "descendant_id",
+                              :order => "generations asc"
 
       scope :roots, where(parent_column_name => nil)
 
-      scope :leaves, includes(:descendants_hierarchy).where("#{hierarchy_table_name}.descendant_id is null")
+      scope :leaves, includes(:descendants).where("#{hierarchy_table_name}.descendant_id is null")
     end
   end
 
@@ -69,13 +69,19 @@ module ClosureTree #:nodoc:
         parent_id.nil?
       end
 
+      # Returns self if +root?+ or the root ancestor
+      def root
+        root? ? self : ancestors.last
+      end
+
       # Returns true if this node has no children.
       def leaf?
         children.empty?
       end
 
       def leaves
-        self.class.scoped.includes(:descendants_hierarchy).where("#{hierarchy_table_name}.descendant_id is null and #{hierarchy_table_name}.ancestor_id = #{id}")
+        return [self] if leaf?
+        Tag.leaves.includes(:ancestors).where("ancestors_tags.id = ?", self.id)
       end
 
       # Returns true if this node has a parent, and is not a root.
@@ -210,8 +216,6 @@ module ClosureTree #:nodoc:
   # Mixed into both classes and instances to provide easy access to the column names
   module Columns
 
-    protected
-
     def parent_column_name
       closure_tree_options[:parent_column_name]
     end

data/lib/closure_tree/version.rb

@@ -1,3 +1,3 @@
 module ClosureTree
-  VERSION = "1.0.0.beta3" unless defined?(::ClosureTree::VERSION)
+  VERSION = "1.0.0.beta5" unless defined?(::ClosureTree::VERSION)
 end

data/test/dummy/test/unit/tag_test.rb

@@ -100,5 +100,19 @@ class TagTest < ActiveSupport::TestCase
     assert_equal [tags(:california), tags(:united_states), tags(:places)], city.ancestors
     assert_equal [city, tags(:california), tags(:united_states), tags(:places)], city.self_and_ancestors
   end
+
+  def test_root
+    assert_equal tags(:grandparent), tags(:grandparent).root
+    assert_equal tags(:grandparent), tags(:parent).root
+    assert_equal tags(:grandparent), tags(:child).root
+  end
+
+  def test_leaves
+    assert Tag.leaves.include? tags(:child)
+    assert Tag.leaves.select{|t|!t.leaf?}.empty?
+    assert_equal [tags(:child)], tags(:grandparent).leaves
+    assert_equal [tags(:child)], tags(:parent).leaves
+    assert_equal [tags(:child)], tags(:child).leaves
+  end
 end
 

metadata

@@ -1,38 +1,35 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: closure_tree
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.0.0.beta5
   prerelease: 6
-  version: 1.0.0.beta3
 platform: ruby
 authors: []
-
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-26 00:00:00 -07:00
+date: 2011-05-29 00:00:00.000000000 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2160266260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-description: "  A mostly-API-compatible replacement for the acts_as_tree and awesome_nested_set gems,\n  but with much better mutation performance thanks to the Closure Tree storage algorithm\n"
+  version_requirements: *2160266260
+description: ! "  A mostly-API-compatible replacement for the acts_as_tree and awesome_nested_set
+  gems,\n  but with much better mutation performance thanks to the Closure Tree storage
+  algorithm\n"
 email: 
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/closure_tree/acts_as_tree.rb
 - lib/closure_tree/version.rb
 - lib/closure_tree.rb
@@ -62,35 +59,32 @@ files:
 has_rdoc: true
 homepage: 
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 2257595380188246970
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1822137668731567771
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Hierarchies for ActiveRecord models using a Closure Tree storage algorithm
-test_files: 
+test_files:
 - test/dummy/Rakefile
 - test/dummy/app/models/.gitkeep
 - test/dummy/app/models/tag.rb