simple_nested_set 0.0.24 → 0.0.25

data/lib/simple_nested_set/class_methods.rb

@@ -37,12 +37,20 @@ module SimpleNestedSet
       where(:parent_id => parent_id).order(:lft)
     end
 
-    def with_ancestors(lft, rgt)
-      where(arel_table[:lft].lt(lft).and(arel_table[:rgt].gt(rgt))).order(:lft)
+    def with_ancestors(lft, rgt, opts = {})
+      if opts.fetch(:include_self, false)
+        where(arel_table[:lft].lteq(lft).and(arel_table[:rgt].gteq(rgt))).order(:lft)
+      else
+        where(arel_table[:lft].lt(lft).and(arel_table[:rgt].gt(rgt))).order(:lft)
+      end
     end
 
-    def with_descendants(lft, rgt)
-      where(arel_table[:lft].gt(lft).and(arel_table[:rgt].lt(rgt))).order(:lft)
+    def with_descendants(lft, rgt, opts = {})
+      if opts.fetch(:include_self, false)
+        where(arel_table[:lft].gteq(lft).and(arel_table[:rgt].lteq(rgt))).order(:lft)
+      else
+        where(arel_table[:lft].gt(lft).and(arel_table[:rgt].lt(rgt))).order(:lft)
+      end
     end
 
     def with_left_sibling(lft)
@@ -57,5 +65,18 @@ module SimpleNestedSet
       # where("#{arel_table[:lft].to_sql} = #{arel_table[:rgt].to_sql} - 1").order(:lft)
       where("#{arel_table.name}.lft = #{arel_table.name}.rgt - 1").order(:lft)
     end
+
+    def nested_set_transaction(sort_order = :id)
+      begin
+        nested_set_class.move_after_save = false
+        self.transaction do
+          yield self
+          # nested_set_class.new(self).rebuild_by_parents!
+          Rebuild::FromParents.new.run(self, sort_order)
+        end
+      ensure
+        nested_set_class.move_after_save = true
+      end
+    end
   end
 end

data/lib/simple_nested_set/instance_methods.rb

@@ -63,13 +63,13 @@ module SimpleNestedSet
     end
 
     # Returns an array of all parents
-    def ancestors
-      nested_set.with_ancestors(lft, rgt)
+    def ancestors(opts = {})
+      nested_set.with_ancestors(lft, rgt, opts)
     end
 
     # Returns the array of all parents and self
     def self_and_ancestors
-      ancestors + [self]
+      ancestors(:include_self => true)
     end
 
     # Returns true if this is a descendent of the given node
@@ -83,13 +83,13 @@ module SimpleNestedSet
     end
 
     # Returns a set of all of its children and nested children.
-    def descendants
-      rgt - lft == 1 ? []  : nested_set.with_descendants(lft, rgt)
+    def descendants(opts = {})
+      nested_set.with_descendants(lft, rgt, opts)
     end
 
     # Returns a set of itself and all of its nested children.
     def self_and_descendants
-      [self] + descendants
+      descendants(:include_self => true)
     end
 
     # Returns the number of descendants

data/lib/simple_nested_set/nested_set.rb

@@ -2,12 +2,13 @@ module SimpleNestedSet
   class NestedSet < ActiveRecord::Relation
     include SqlAbstraction
 
-    class_inheritable_accessor :node_class, :scope_names
+    class_inheritable_accessor :node_class, :scope_names, :move_after_save
 
     class << self
       def build_class(model, scopes)
         model.const_get(:NestedSet) rescue model.const_set(:NestedSet, Class.new(NestedSet)).tap do |node_class|
           node_class.node_class = model
+          node_class.move_after_save = true
           node_class.scope_names = Array(scopes).map { |s| s.to_s =~ /_id$/ ? s.to_sym : :"#{s}_id" }
         end
       end
@@ -41,8 +42,15 @@ module SimpleNestedSet
     def save!
       attributes = node.instance_variable_get(:@_nested_set_attributes)
       node.instance_variable_set(:@_nested_set_attributes, nil)
-      move_by_attributes(attributes) unless attributes.blank?
-      denormalize!
+
+      if self.class.move_after_save
+        move_by_attributes(attributes) unless attributes.blank?
+        denormalize!
+      elsif attributes
+        attributes.each do |key, value|
+          node.update_attribute(key, value)
+        end
+      end
     end
 
     # FIXME we don't always want to call this on after_save, do we? it's only relevant when
@@ -121,6 +129,10 @@ module SimpleNestedSet
       Rebuild::FromPaths.new.run(self)
     end
 
+    def rebuild_from_parents!(sort_order = nil)
+      Rebuild::FromParents.new.run(self, sort_order)
+    end
+
     def denormalize_level_query
       aliaz = arel_table.as(:l)
       query = aliaz.project(aliaz[:id].count).

data/lib/simple_nested_set/rebuild/from_parents.rb

@@ -0,0 +1,56 @@
+module SimpleNestedSet
+  module Rebuild
+    class FromParents
+      attr_writer :num
+
+      def num
+        @num ||= 0
+      end
+
+      def run(nested_set, sort_order = nil)
+        order_columns = ([:parent_id] + Array[sort_order]).compact
+
+        nodes = if nested_set.respond_to?(:except)
+                  nested_set.except(:order).order(order_columns)
+                else
+                  nested_set.reorder(order_columns)
+                end.to_a
+
+        renumber(nodes.dup)
+        nodes.each(&:save)
+      end
+
+      def renumber(nodes)
+        until nodes.empty?
+          node = nodes.shift
+          node.lft = self.num += 1
+          num = renumber(extract_children(node, nodes))
+          node.rgt = self.num += 1
+        end
+        num
+      end
+
+      def extract_children(node, nodes)
+        children = nodes.select { |child| child?(node, child) }
+        nodes.replace(nodes - children)
+        children
+      end
+
+      def child?(node, child)
+        if child.root?
+          false
+        elsif direct_child?(node, child)
+          true
+        else
+          # recurse to find indirect children,
+          # i.e. the child is one of the grandchildren of the node
+          child?(node, child.parent)
+        end
+      end
+
+      def direct_child? node, child
+        child.parent_id == node.id
+      end
+    end
+  end
+end

data/lib/simple_nested_set/version.rb

@@ -1,3 +1,3 @@
 module SimpleNestedSet
-  VERSION = "0.0.24"
+  VERSION = "0.0.25"
 end

data/lib/simple_nested_set.rb

@@ -21,6 +21,7 @@ module SimpleNestedSet
 
   module Rebuild
     autoload :FromPaths,     'simple_nested_set/rebuild/from_paths'
+    autoload :FromParents,   'simple_nested_set/rebuild/from_parents'
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_nested_set
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 45
   prerelease: false
   segments: 
   - 0
   - 0
-  - 24
-  version: 0.0.24
+  - 25
+  version: 0.0.25
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-21 00:00:00 +01:00
+date: 2010-11-29 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,12 +82,14 @@ dependencies:
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
         - 0
-        version: "0"
+        - 5
+        - 2
+        version: 0.5.2
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -122,6 +124,7 @@ files:
 - lib/simple_nested_set/move/to_target.rb
 - lib/simple_nested_set/nested_set.rb
 - lib/simple_nested_set/patches/arel_table_initialization.rb
+- lib/simple_nested_set/rebuild/from_parents.rb
 - lib/simple_nested_set/rebuild/from_paths.rb
 - lib/simple_nested_set/sql_abstraction.rb
 - lib/simple_nested_set/version.rb