closure_tree 3.4.2 → 3.4.3

data/README.md

@@ -323,6 +323,10 @@ Closure tree is [tested under every combination](http://travis-ci.org/#!/mceache
 
 ## Change log
 
+### 3.4.3
+
+* Fixed [issue 19](https://github.com/mceachen/closure_tree/issues/19), which caused
+  ```self_and_siblings``` to fail if ```parent_id``` was not the ```parent_column_name```
 
 ### 3.4.2
 

data/lib/closure_tree/acts_as_tree.rb

@@ -88,19 +88,15 @@ module ClosureTree
       end
 
       def self.leaves
-        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)
+        s = joins(<<-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
+        order_option ? s.order(order_option) : s
       end
     end
   end
@@ -129,14 +125,7 @@ module ClosureTree
     end
 
     def leaves
-      return [self] if leaf?
-      self.class.leaves.where(<<-SQL
-#{quoted_table_name}.#{self.class.primary_key} IN (
-          SELECT descendant_id
-          FROM #{quoted_hierarchy_table_name}
-          WHERE ancestor_id = #{id})
-      SQL
-      )
+      self_and_descendants.leaves
     end
 
     def depth
@@ -169,7 +158,7 @@ module ClosureTree
     end
 
     def self_and_siblings
-      s = self.class.scoped.where(:parent_id => parent)
+      s = self.class.scoped.where(parent_column_sym => parent)
       quoted_order_column ? s.order(quoted_order_column) : s
     end
 
@@ -279,6 +268,7 @@ module ClosureTree
       # The crazy double-wrapped sub-subselect works around MySQL's limitation of subselects on the same table that is being mutated.
       # It shouldn't affect performance of postgresql.
       # See http://dev.mysql.com/doc/refman/5.0/en/subquery-errors.html
+      # Also: PostgreSQL doesn't support INNER JOIN on DELETE, so we can't use that.
       connection.execute <<-SQL
         DELETE FROM #{quoted_hierarchy_table_name}
         WHERE descendant_id IN (

data/lib/closure_tree/version.rb

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

data/spec/db/schema.rb

@@ -47,7 +47,7 @@ ActiveRecord::Schema.define(:version => 0) do
     t.string   "name"
     t.string   "type"
     t.integer  "sort_order"
-    t.integer  "parent_id"
+    t.integer  "mother_id"
   end
 
   create_table "label_hierarchies", :id => false, :force => true do |t|

data/spec/label_spec.rb

@@ -158,7 +158,7 @@ describe Label do
       labels(:c2).append_sibling(labels(:e2), false)
       labels(:e2).self_and_siblings.to_a.should == [labels(:b1), labels(:b2), labels(:c2), labels(:e2)]
       labels(:a1).self_and_descendants.collect(&:name).should == %w(a1 b1 b2 c2 e2 d2 c1-six c1-seven c1-eight c1-nine)
-      labels(:a1).leaves.collect(&:name).should == %w(d2 b2 e2 c1-six c1-seven c1-eight c1-nine)
+      labels(:a1).leaves.collect(&:name).should == %w(b2 e2 d2 c1-six c1-seven c1-eight c1-nine)
     end
   end
 end

data/spec/support/models.rb

@@ -41,7 +41,7 @@ end
 
 class Label < ActiveRecord::Base
   attr_accessible :name # < - make sure order doesn't matter
-  acts_as_tree :order => "sort_order"
+  acts_as_tree :order => "sort_order", :parent_column_name => "mother_id"
 
   def to_s
     "#{self.class}: #{name}"

metadata

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