closure_tree 3.8.1 → 3.8.2

data/README.md

@@ -13,9 +13,10 @@ closure_tree has some great features:
 
 * __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.
+  * Grab all your descendants in 1 SELECT.
+  * Get all your siblings in 1 SELECT.
+  * Fetch all [7-degrees-of-bacon in a nested hash](#nested-hashes) in 1 SELECT.
+  * [Find a node by path](#find_or_create_by_path) in 1 SELECT.
 * __Best-in-class mutation performance__:
   * 2 SQL INSERTs on node creation
   * 3 SQL INSERT/UPDATEs on node reparenting
@@ -425,6 +426,10 @@ Parallelism is not tested with Rails 3.0.x nor 3.1.x due to this
 
 ## Change log
 
+### 3.8.2
+
+* find_by_path uses 1 SELECT now. BOOM.
+
 ### 3.8.1
 
 * Double-check locking for find_or_create_by_path

data/lib/closure_tree/columns.rb

@@ -45,6 +45,14 @@ module ClosureTree
       connection.quote_column_name parent_column_name
     end
 
+    def quoted_name_column
+      connection.quote_column_name name_column
+    end
+
+    def ct_quote(field)
+      connection.quote(field)
+    end
+
     def order_option
       closure_tree_options[:order]
     end

data/lib/closure_tree/model.rb

@@ -124,12 +124,9 @@ module ClosureTree
 
     # Find a child node whose +ancestry_path+ minus self.ancestry_path is +path+.
     def find_by_path(path)
-      path = path.is_a?(Enumerable) ? path.dup : [path]
-      node = self
-      while !path.empty? && node
-        node = node.children.where(name_sym => path.shift).first
-      end
-      node
+      return self if path.empty?
+      parent_constraint = "#{quoted_parent_column_name} = #{ct_quote(id)}"
+      ct_class.ct_scoped_to_path(path, parent_constraint).first
     end
 
     # Find a child node whose +ancestry_path+ minus self.ancestry_path is +path+
@@ -207,13 +204,14 @@ module ClosureTree
         delete_hierarchy_references unless @was_new_record
         hierarchy_class.create!(:ancestor => self, :descendant => self, :generations => 0)
         unless root?
-          connection.execute <<-SQL
-          INSERT INTO #{quoted_hierarchy_table_name}
-            (ancestor_id, descendant_id, generations)
-          SELECT x.ancestor_id, #{ct_quote(id)}, x.generations + 1
-          FROM #{quoted_hierarchy_table_name} x
-          WHERE x.descendant_id = #{ct_quote(self.ct_parent_id)}
+          sql = <<-SQL
+            INSERT INTO #{quoted_hierarchy_table_name}
+              (ancestor_id, descendant_id, generations)
+            SELECT x.ancestor_id, #{ct_quote(id)}, x.generations + 1
+            FROM #{quoted_hierarchy_table_name} x
+            WHERE x.descendant_id = #{ct_quote(self.ct_parent_id)}
           SQL
+          connection.execute sql.strip
         end
         children.each { |c| c.rebuild! }
       end
@@ -255,10 +253,6 @@ module ClosureTree
       end
     end
 
-    def ct_quote(field)
-      self.class.connection.quote(field)
-    end
-
     # TODO: _parent_id will be removed in the next major version
     alias :_parent_id :ct_parent_id
 
@@ -322,9 +316,22 @@ module ClosureTree
 
       # Find the node whose +ancestry_path+ is +path+
       def find_by_path(path)
-        subpath = path.dup
-        root = roots.where(name_sym => subpath.shift).first
-        root.find_by_path(subpath) if root
+        parent_constraint = "#{quoted_parent_column_name} IS NULL"
+        ct_scoped_to_path(path, parent_constraint).first
+      end
+
+      def ct_scoped_to_path(path, parent_constraint)
+        path = path.is_a?(Enumerable) ? path.dup : [path]
+        scope = scoped.where(name_sym => path.last).readonly(false)
+        path[0..-2].reverse.each_with_index do |ea, idx|
+          subtable = idx == 0 ? quoted_table_name : "p#{idx - 1}"
+          scope = scope.joins(<<-SQL)
+            INNER JOIN #{quoted_table_name} AS p#{idx} ON p#{idx}.id = #{subtable}.#{parent_column_name}
+          SQL
+          scope = scope.where("p#{idx}.#{quoted_name_column} = #{ct_quote(ea)}")
+        end
+        root_table_name = path.size > 1 ? "p#{path.size - 2}" : quoted_table_name
+        scope.where("#{root_table_name}.#{parent_constraint}")
       end
 
       # Find or create nodes such that the +ancestry_path+ is +path+

data/lib/closure_tree/version.rb

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

data/spec/tag_spec.rb

@@ -146,6 +146,81 @@ shared_examples_for "Tag (1)" do
     end
 
   end
+
+  context "paths" do
+    before :each do
+      @child = Tag.find_or_create_by_path(%w(grandparent parent child))
+      @child.title = "Kid"
+      @parent = @child.parent
+      @parent.title = "Mom"
+      @grandparent = @parent.parent
+      @grandparent.title = "Nonnie"
+      [@child, @parent, @grandparent].each { |ea| ea.save! }
+    end
+
+    it "should build ancestry path" do
+      @child.ancestry_path.should == %w{grandparent parent child}
+      @child.ancestry_path(:name).should == %w{grandparent parent child}
+      @child.ancestry_path(:title).should == %w{Nonnie Mom Kid}
+    end
+
+    it "should find by path" do
+      # class method:
+      Tag.find_by_path(%w{grandparent parent child}).should == @child
+      # instance method:
+      @parent.find_by_path(%w{child}).should == @child
+      @grandparent.find_by_path(%w{parent child}).should == @child
+      @parent.find_by_path(%w{child larvae}).should be_nil
+    end
+
+    it "finds correctly rooted paths" do
+      decoy = Tag.find_or_create_by_path %w(a b c d)
+      b_d = Tag.find_or_create_by_path %w(b c d)
+      Tag.find_by_path(%w(b c d)).should == b_d
+      Tag.find_by_path(%w(c d)).should be_nil
+    end
+
+    it "find_by_path for 1 node" do
+      b = Tag.find_or_create_by_path %w(a b)
+      b2 = b.root.find_by_path(%w(b))
+      b2.should == b
+    end
+
+    it "find_by_path for 2 nodes" do
+      c = Tag.find_or_create_by_path %w(a b c)
+      c.root.find_by_path(%w(b c)).should == c
+      c.root.find_by_path(%w(a c)).should be_nil
+      c.root.find_by_path(%w(c)).should be_nil
+    end
+
+    it "find_by_path for 3 nodes" do
+      d = Tag.find_or_create_by_path %w(a b c d)
+      d.root.find_by_path(%w(b c d)).should == d
+      Tag.find_by_path(%w(a b c d)).should == d
+      Tag.find_by_path(%w(d)).should be_nil
+    end
+
+    it "should return nil for missing nodes" do
+      Tag.find_by_path(%w{missing}).should be_nil
+      Tag.find_by_path(%w{grandparent missing}).should be_nil
+      Tag.find_by_path(%w{grandparent parent missing}).should be_nil
+      Tag.find_by_path(%w{grandparent parent missing child}).should be_nil
+    end
+
+    it "should find or create by path" do
+      # class method:
+      grandparent = Tag.find_or_create_by_path(%w{grandparent})
+      grandparent.should == @grandparent
+      child = Tag.find_or_create_by_path(%w{grandparent parent child})
+      child.should == @child
+      Tag.find_or_create_by_path(%w{events anniversary}).ancestry_path.should == %w{events anniversary}
+      a = Tag.find_or_create_by_path(%w{a})
+      a.ancestry_path.should == %w{a}
+      # instance method:
+      a.find_or_create_by_path(%w{b c}).ancestry_path.should == %w{a b c}
+    end
+  end
+
 end
 
 shared_examples_for "Tag (2)" do
@@ -316,43 +391,6 @@ shared_examples_for "Tag (2)" do
       end
     end
 
-    context "paths" do
-
-      it "should build ancestry path" do
-        tags(:child).ancestry_path.should == %w{grandparent parent child}
-        tags(:child).ancestry_path(:name).should == %w{grandparent parent child}
-        tags(:child).ancestry_path(:title).should == %w{Nonnie Mom Kid}
-      end
-
-      it "should find by path" do
-        # class method:
-        Tag.find_by_path(%w{grandparent parent child}).should == tags(:child)
-        # instance method:
-        tags(:parent).find_by_path(%w{child}).should == tags(:child)
-        tags(:grandparent).find_by_path(%w{parent child}).should == tags(:child)
-        tags(:parent).find_by_path(%w{child larvae}).should be_nil
-      end
-
-      it "should return nil for missing nodes" do
-        Tag.find_by_path(%w{missing}).should be_nil
-        Tag.find_by_path(%w{grandparent missing}).should be_nil
-        Tag.find_by_path(%w{grandparent parent missing}).should be_nil
-        Tag.find_by_path(%w{grandparent parent missing child}).should be_nil
-      end
-
-      it "should find or create by path" do
-        # class method:
-        grandparent = Tag.find_or_create_by_path(%w{grandparent})
-        grandparent.should == tags(:grandparent)
-        child = Tag.find_or_create_by_path(%w{grandparent parent child})
-        child.should == tags(:child)
-        Tag.find_or_create_by_path(%w{events anniversary}).ancestry_path.should == %w{events anniversary}
-        a = Tag.find_or_create_by_path(%w{a})
-        a.ancestry_path.should == %w{a}
-        # instance method:
-        a.find_or_create_by_path(%w{b c}).ancestry_path.should == %w{a b c}
-      end
-    end
 
     def validate_city_tag city
       tags(:california).children.include?(city).should_not be_nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: closure_tree
 version: !ruby/object:Gem::Version
-  version: 3.8.1
+  version: 3.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-25 00:00:00.000000000 Z
+date: 2013-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -248,7 +248,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3183043301926645290
+      hash: 625197628069455012
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -257,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3183043301926645290
+      hash: 625197628069455012
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23