closure_tree 3.6.2 → 3.6.3

data/README.md

@@ -1,16 +1,16 @@
-# Closure Tree
+# Closure Tree [![Build Status](https://secure.travis-ci.org/mceachen/closure_tree.png?branch=master)](http://travis-ci.org/mceachen/closure_tree)
 
 Closure Tree is a mostly-API-compatible replacement for the
 [ancestry](https://github.com/stefankroes/ancestry),
 [acts_as_tree](https://github.com/amerine/acts_as_tree) and
 [awesome_nested_set](https://github.com/collectiveidea/awesome_nested_set/) gems, giving you:
 
-* Best-in-class select performance:
+* __Best-in-class select performance__:
   * Fetch your whole ancestor lineage in 1 SELECT.
   * Grab all your descendants: 1 SELECT.
   * Get all your siblings: 1 SELECT.
   * Fetch all [7-degrees-of-bacon in a nested hash](#nested-hashes): 1 SELECT.
-* Best-in-class mutation performance:
+* __Best-in-class mutation performance__:
   * 2 SQL INSERTs on node creation
   * 3 SQL INSERT/UPDATEs on node reparenting
 * Support for reparenting children (and all their progeny)
@@ -357,10 +357,16 @@ Closure tree is [tested under every combination](http://travis-ci.org/#!/mceache
 
 * Ruby 1.8.7 and Ruby 1.9.3
 * The latest Rails 3.0, 3.1, and 3.2 branches, and
-* MySQL, PostgreSQL, and SQLite.
+* MySQL, PostgreSQL, & SQLite.
 
 ## Change log
 
+
+### 3.6.3
+
+* Fixed [issue 24](https://github.com/mceachen/closure_tree/issues/24), which optimized ```#hash_tree```
+  for roots. Thanks, [Saverio Trioni](https://github.com/rewritten)!
+
 ### 3.6.2
 
 * Fixed [issue 23](https://github.com/mceachen/closure_tree/issues/23), which added support for ```#siblings```

data/lib/closure_tree/acts_as_tree.rb

@@ -86,8 +86,34 @@ module ClosureTree
         where(parent_column_name => nil)
       end
 
+      # Note that options[:limit_depth] defaults to 10. This might be crazy-big, depending on your tree shape.
       def self.hash_tree(options = {})
-        roots.inject(ActiveSupport::OrderedHash.new) { |h, ea| h.merge(ea.hash_tree(options)) }
+        tree = ActiveSupport::OrderedHash.new
+        id_to_hash = {}
+        limit_depth = (options[:limit_depth] || 10).to_i
+        scope = joins(<<-SQL)
+          INNER JOIN (
+            SELECT #{primary_key} as root_id
+              FROM #{quoted_table_name}
+              WHERE #{quoted_parent_column_name} IS NULL
+            ) AS roots ON (1 = 1)
+          INNER JOIN (
+            SELECT ancestor_id, descendant_id, MAX(generations) as max_gen
+            FROM #{quoted_hierarchy_table_name}
+            GROUP BY 1, 2
+            HAVING MAX(generations) <= #{limit_depth - 1}
+          ) AS nodes ON (roots.root_id = nodes.ancestor_id) AND
+            #{quoted_table_name}.#{primary_key} = nodes.descendant_id
+        SQL
+        scope.order(append_order("max_gen")).each do |ea|
+          h = id_to_hash[ea.id] = ActiveSupport::OrderedHash.new
+          if ea.root?
+            tree[ea] = h
+          else
+            id_to_hash[ea.ct_parent_id][ea] = h
+          end
+        end
+        tree
       end
 
       def find_all_by_generation(generation_level)
@@ -257,6 +283,10 @@ module ClosureTree
       tree
     end
 
+    def ct_parent_id
+      read_attribute(parent_column_sym)
+    end
+
     protected
 
     def ct_validate
@@ -325,9 +355,6 @@ module ClosureTree
       scope.select(:id).collect(&:id)
     end
 
-    def ct_parent_id
-      read_attribute(parent_column_sym)
-    end
 
     # TODO: _parent_id will be removed in the next major version
     alias :_parent_id :ct_parent_id

data/lib/closure_tree/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: closure_tree
 version: !ruby/object:Gem::Version
-  version: 3.6.2
+  version: 3.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-22 00:00:00.000000000 Z
+date: 2012-09-30 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: -956461018663594337
+      hash: -1870454341396568089
 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: -956461018663594337
+      hash: -1870454341396568089
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23