awesome_nested_set 2.1.3 → 2.1.4

data/CHANGELOG

@@ -1,3 +1,9 @@
+2.1.4
+* nested_set_options accept both Class & AR Relation. [Semyon Perepelitsa]
+* Reduce the number of queries triggered by the canonical usage of `i.level` in the `nested_set` helpers. [thedarkone]
+* Specifically require active_record [Bogdan Gusiev]
+* compute_level now checks for a non nil association target. [Joel Nimety]
+
 2.1.3
 * Update child depth when parent node is moved. [Amanda Wagener]
 * Added move_to_child_with_index. [Ben Zhang]

data/lib/awesome_nested_set.rb

@@ -1,4 +1,5 @@
 require 'awesome_nested_set/awesome_nested_set'
+require 'active_record'
 ActiveRecord::Base.send :extend, CollectiveIdea::Acts::NestedSet
 
 if defined?(ActionView)

data/lib/awesome_nested_set/awesome_nested_set.rb

@@ -259,6 +259,16 @@ module CollectiveIdea #:nodoc:
               children.each { |c| yield(c, path.length-1) }
             end
           end
+
+          def associate_parents(objects)
+            id_indexed = objects.index_by(&:id)
+            objects.each do |object|
+              if !(association = object.association(:parent)).loaded? && (parent = id_indexed[object.parent_id])
+                association.target = parent
+                association.set_inverse_instance(parent)
+              end
+            end
+          end
         end
 
         # Any instance method that returns a collection makes use of Rails 2.1's named_scope (which is bundled for Rails 2.0), so it can be treated as a finder.
@@ -338,7 +348,7 @@ module CollectiveIdea #:nodoc:
         # Returns the level of this object in the tree
         # root level is 0
         def level
-          parent_id.nil? ? 0 : ancestors.count
+          parent_id.nil? ? 0 : compute_level
         end
 
         # Returns a set of itself and all of its nested children
@@ -444,6 +454,14 @@ module CollectiveIdea #:nodoc:
         end
 
       protected
+        def compute_level
+          node, nesting = self, 0
+          while (association = node.association(:parent)).loaded? && association.target
+            nesting += 1
+            node = node.parent
+          end
+          node == self ? ancestors.count : node.level + nesting
+        end
 
         def without_self(scope)
           scope.where(["#{self.class.quoted_table_name}.#{self.class.primary_key} != ?", self])
@@ -487,7 +505,7 @@ module CollectiveIdea #:nodoc:
 
         # on creation, set automatically lft and rgt to the end of the tree
         def set_default_left_and_right
-          highest_right_row = nested_set_scope(:order => "#{quoted_right_column_name} desc").find(:first, :limit => 1,:lock => true )
+          highest_right_row = nested_set_scope(:order => "#{quoted_right_column_name} desc").limit(1).lock(true).first
           maxright = highest_right_row ? (highest_right_row[right_column_name] || 0) : 0
           # adds the new node to the right of all existing nodes
           self[left_column_name] = maxright + 1
@@ -517,11 +535,8 @@ module CollectiveIdea #:nodoc:
           in_tenacious_transaction do
             reload_nested_set
             # select the rows in the model that extend past the deletion point and apply a lock
-            self.class.base_class.find(:all,
-              :select => "id",
-              :conditions => ["#{quoted_left_column_name} >= ?", left],
-              :lock => true
-            )
+            nested_set_scope.where(["#{quoted_left_column_name} >= ?", left]).
+                                  select(id).lock(true)
 
             if acts_as_nested_set_options[:dependent] == :destroy
               descendants.each do |model|
@@ -529,21 +544,18 @@ module CollectiveIdea #:nodoc:
                 model.destroy
               end
             else
-              nested_set_scope.delete_all(
-                ["#{quoted_left_column_name} > ? AND #{quoted_right_column_name} < ?",
-                  left, right]
-              )
+              nested_set_scope.where(["#{quoted_left_column_name} > ? AND #{quoted_right_column_name} < ?", left, right]).
+                               delete_all
             end
 
             # update lefts and rights for remaining nodes
             diff = right - left + 1
-            nested_set_scope.update_all(
-              ["#{quoted_left_column_name} = (#{quoted_left_column_name} - ?)", diff],
-              ["#{quoted_left_column_name} > ?", right]
+            nested_set_scope.where(["#{quoted_left_column_name} > ?", right]).update_all(
+              ["#{quoted_left_column_name} = (#{quoted_left_column_name} - ?)", diff]
             )
-            nested_set_scope.update_all(
-              ["#{quoted_right_column_name} = (#{quoted_right_column_name} - ?)", diff],
-              ["#{quoted_right_column_name} > ?", right]
+
+            nested_set_scope.where(["#{quoted_right_column_name} > ?", right]).update_all(
+              ["#{quoted_right_column_name} = (#{quoted_right_column_name} - ?)", diff]
             )
 
             # Don't allow multiple calls to destroy to corrupt the set

data/lib/awesome_nested_set/helper.rb

@@ -25,12 +25,12 @@ module CollectiveIdea #:nodoc:
           if class_or_item.is_a? Array
             items = class_or_item.reject { |e| !e.root? }
           else
-            class_or_item = class_or_item.roots if class_or_item.is_a?(Class)
+            class_or_item = class_or_item.roots if class_or_item.respond_to?(:scoped)
             items = Array(class_or_item)
           end
           result = []
           items.each do |root|
-            result += root.self_and_descendants.map do |i|
+            result += root.class.associate_parents(root.self_and_descendants).map do |i|
               if mover.nil? || mover.new_record? || mover.move_possible?(i)
                 [yield(i), i.id]
               end
@@ -66,7 +66,7 @@ module CollectiveIdea #:nodoc:
           result = []
           children = []
           items.each do |root|
-            root.self_and_descendants.map do |i|
+            root.class.associate_parents(root.self_and_descendants).map do |i|
               if mover.nil? || mover.new_record? || mover.move_possible?(i)
                 if !i.leaf?
                   children.sort_by! &order

data/lib/awesome_nested_set/version.rb

@@ -1,3 +1,3 @@
 module AwesomeNestedSet
-  VERSION = '2.1.3' unless defined?(::AwesomeNestedSet::VERSION)
+  VERSION = '2.1.4' unless defined?(::AwesomeNestedSet::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awesome_nested_set
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-11 00:00:00.000000000 Z
+date: 2012-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: An awesome nested set implementation for Active Record