closure_tree 3.3.1 → 3.3.2

data/README.md

@@ -308,7 +308,7 @@ root.children.collect(&:name)
 
 ## Testing
 
-Closure tree is [tested under every combination](https://secure.travis-ci.org/mceachen/closure_tree.png?branch=master) of
+Closure tree is [tested under every combination](http://travis-ci.org/#!/mceachen/closure_tree) of
 
 * Ruby 1.8.7 and Ruby 1.9.3
 * The latest Rails 3.0, 3.1, and 3.2 branches, and
@@ -317,6 +317,10 @@ Closure tree is [tested under every combination](https://secure.travis-ci.org/mc
 
 ## Change log
 
+### 3.3.2
+
+* Merged calebphillips' patch for a more efficient leaves query
+
 ### 3.3.1
 
 * Added support for partially-unsaved hierarchies [issue 13](https://github.com/mceachen/closure_tree/issues/13):

data/lib/closure_tree/acts_as_tree.rb

@@ -86,13 +86,20 @@ module ClosureTree
       end
 
       def self.leaves
-        s = where("#{quoted_table_name}.#{primary_key} IN
-        (SELECT ancestor_id
-         FROM #{quoted_hierarchy_table_name}
-         GROUP BY 1
-         HAVING MAX(#{quoted_hierarchy_table_name}.generations) = 0)")
+        s = joins(leaves_join_sql)
         order_option ? s.order(order_option) : s
       end
+
+      def self.leaves_join_sql
+        <<-SQL
+        INNER JOIN
+        (SELECT ancestor_id
+        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)
+        SQL
+      end
     end
   end
 

data/lib/closure_tree/version.rb

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

data/spec/cuisine_type_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe CuisineType do
+  it "finds self and parents properly" do
+    e = CuisineType.new(:name => "e")
+    m = CuisineType.new(:name => "m")
+    e.children << m
+    e.save
+
+    m.parent.should == e
+    m.self_and_ancestors.should == [m, e]
+
+    # make sure reloading doesn't affect the self_and_ancestors:
+    m.reload
+    m.self_and_ancestors.should == [m, e]
+  end
+
+  it "sets the table_name of the hierarchy class properly" do
+    CuisineTypeHierarchy.table_name.should == "cuisine_type_hierarchies"
+  end
+end

data/spec/db/schema.rb

@@ -59,4 +59,14 @@ ActiveRecord::Schema.define(:version => 0) do
   add_index :label_hierarchies, [:ancestor_id, :descendant_id], :unique => true
   add_index :label_hierarchies, [:descendant_id]
 
+  create_table "cuisine_types", :force => true do |t|
+    t.string   "name"
+    t.integer  "parent_id"
+  end
+
+  create_table "cuisine_type_hierarchies", :id => false, :force => true do |t|
+    t.integer "ancestor_id",   :null => false
+    t.integer "descendant_id", :null => false
+    t.integer "generations",   :null => false
+  end
 end

data/spec/support/models.rb

@@ -56,3 +56,7 @@ end
 
 class DirectoryLabel < Label
 end
+
+class CuisineType < ActiveRecord::Base
+  acts_as_tree
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: closure_tree
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
+date: 2012-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -170,6 +170,7 @@ files:
 - MIT-LICENSE
 - Rakefile
 - README.md
+- spec/cuisine_type_spec.rb
 - spec/db/database.yml
 - spec/db/schema.rb
 - spec/fixtures/labels.yml
@@ -193,7 +194,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2911561954531339982
+      hash: 2505204839193156816
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -202,14 +203,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2911561954531339982
+      hash: 2505204839193156816
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Hierarchies for ActiveRecord models using a Closure Tree storage algorithm
 test_files:
+- spec/cuisine_type_spec.rb
 - spec/db/database.yml
 - spec/db/schema.rb
 - spec/fixtures/labels.yml