closure_tree 3.5.0 → 3.5.1

data/README.md

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

data/lib/closure_tree/acts_as_tree.rb

@@ -87,23 +87,9 @@ module ClosureTree
         roots.inject(ActiveSupport::OrderedHash.new) { |h, ea| h.merge(ea.hash_tree(options)) }
       end
 
-      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
-          INNER JOIN (
-            SELECT ancestor_id, descendant_id
-            FROM #{quoted_hierarchy_table_name}
-            GROUP BY 1, 2
-            HAVING MAX(#{quoted_hierarchy_table_name}.generations) = #{generation_level.to_i}
-          ) AS descendants
-          ON #{quoted_table_name}.#{primary_key} = descendants.descendant_id
-            AND roots.root_id = ancestor_id
-        SQL
-        order_option ? s.order(order_option) : s
+      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 }
       end
 
       def self.leaves

data/lib/closure_tree/version.rb

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

metadata

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