closure_tree 3.5.1 → 3.5.2

data/README.md

@@ -331,7 +331,7 @@ Closure tree is [tested under every combination](http://travis-ci.org/#!/mceache
 
 ## Change log
 
-### 3.5.1
+### 3.5.2
 
 * Added ```find_all_by_generation```
   for [feature request 17](https://github.com/mceachen/closure_tree/issues/17).

data/lib/closure_tree/acts_as_tree.rb

@@ -87,9 +87,24 @@ module ClosureTree
         roots.inject(ActiveSupport::OrderedHash.new) { |h, ea| h.merge(ea.hash_tree(options)) }
       end
 
-      def self.find_all_by_generation(generation_level)
-        # TODO: make this be a proper SQL select, not an inject.
-        roots.inject([]) { |a, ea| a + ea.find_all_by_generation(generation_level).to_a }
+      def find_all_by_generation(generation_level)
+        s = 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
+            FROM #{quoted_hierarchy_table_name}
+            GROUP BY 1, 2
+            HAVING MAX(generations) = #{generation_level.to_i}
+          ) AS descendants ON (
+            #{quoted_table_name}.#{primary_key} = descendants.descendant_id
+            AND roots.root_id = descendants.ancestor_id
+          )
+        SQL
+        order_option ? s.order(order_option) : s
       end
 
       def self.leaves
@@ -99,7 +114,7 @@ module ClosureTree
             FROM #{quoted_hierarchy_table_name}
             GROUP BY 1
             HAVING MAX(#{quoted_hierarchy_table_name}.generations) = 0
-          ) AS leaves ON #{quoted_table_name}.#{primary_key} = leaves.ancestor_id
+          ) AS leaves ON (#{quoted_table_name}.#{primary_key} = leaves.ancestor_id)
         SQL
         order_option ? s.order(order_option) : s
       end
@@ -218,7 +233,7 @@ module ClosureTree
             WHERE ancestor_id = #{self.id}
             GROUP BY 1
             HAVING MAX(#{quoted_hierarchy_table_name}.generations) = #{generation_level.to_i}
-          ) AS descendants ON #{quoted_table_name}.#{self.class.primary_key} = descendants.descendant_id
+          ) AS descendants ON (#{quoted_table_name}.#{self.class.primary_key} = descendants.descendant_id)
       SQL
       order_option ? s.order(order_option) : s
     end

data/lib/closure_tree/version.rb

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

data/spec/label_spec.rb

@@ -64,46 +64,54 @@ describe Label do
       end
     end
   end
-
   context "find_all_by_generation" do
     before :all do
       nuke_db
-      @d1 = Label.find_or_create_by_path %w(a b c1 d1)
-      @d2 = Label.find_or_create_by_path %w(a b c2 d2)
+      @d1 = Label.find_or_create_by_path %w(a1 b1 c1 d1)
       @c1 = @d1.parent
+      @b1 = @c1.parent
+      @a1 = @b1.parent
+      @d2 = Label.find_or_create_by_path %w(a1 b1 c2 d2)
       @c2 = @d2.parent
-      @b = @c1.parent
-      @a = @b.parent
+      @d3 = Label.find_or_create_by_path %w(a2 b2 c3 d3)
+      @c3 = @d3.parent
+      @b2 = @c3.parent
+      @a2 = @b2.parent
+      Label.update_all("sort_order = id")
     end
 
     it "finds roots from the class method" do
-      Label.find_all_by_generation(1).to_a.should == [@b]
+      Label.find_all_by_generation(0).to_a.should == [@a1, @a2]
     end
 
     it "finds roots from themselves" do
-      @a.find_all_by_generation(0).to_a.should == [@a]
+      @a1.find_all_by_generation(0).to_a.should == [@a1]
     end
 
     it "finds itself for non-roots" do
-      @b.find_all_by_generation(0).to_a.should == [@b]
+      @b1.find_all_by_generation(0).to_a.should == [@b1]
     end
 
     it "finds children for roots" do
-      Label.find_all_by_generation(1).to_a.should == [@b]
+      Label.find_all_by_generation(1).to_a.should == [@b1, @b2]
     end
 
     it "finds children" do
-      @a.find_all_by_generation(1).to_a.should == [@b]
-      @b.find_all_by_generation(1).to_a.should == [@c1, @c2]
+      @a1.find_all_by_generation(1).to_a.should == [@b1]
+      @b1.find_all_by_generation(1).to_a.should == [@c1, @c2]
     end
 
     it "finds grandchildren for roots" do
-      Label.find_all_by_generation(2).to_a.should == [@c1, @c2]
+      Label.find_all_by_generation(2).to_a.should == [@c1, @c2, @c3]
     end
 
     it "finds grandchildren" do
-      @a.find_all_by_generation(2).to_a.should == [@c1, @c2]
-      @b.find_all_by_generation(2).to_a.should == [@d1, @d2]
+      @a1.find_all_by_generation(2).to_a.should == [@c1, @c2]
+      @b1.find_all_by_generation(2).to_a.should == [@d1, @d2]
+    end
+
+    it "finds great-grandchildren for roots" do
+      Label.find_all_by_generation(3).to_a.should == [@d1, @d2, @d3]
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: closure_tree
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -192,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 10070411071183028
+      hash: 4543577055875281407
 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: 10070411071183028
+      hash: 4543577055875281407
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23