awesome_nested_set 2.1.2 → 2.1.3

data/CHANGELOG

@@ -1,3 +1,12 @@
+2.1.3
+* Update child depth when parent node is moved. [Amanda Wagener]
+* Added move_to_child_with_index. [Ben Zhang]
+* Optimised self_and_descendants for when there's an index on lft. [Mark Torrance]
+* Added support for an unsaved record to return the right 'root'. [Philip Arndt]
+
+2.1.2
+* Fixed regressions introduced. [Philip Arndt]
+
 2.1.1
 * Added 'depth' which indicates how many levels deep the node is.
   This only works when you have a column called 'depth' in your table,

data/lib/awesome_nested_set/awesome_nested_set.rb

@@ -292,12 +292,20 @@ module CollectiveIdea #:nodoc:
 
         # Returns true is this is a child node
         def child?
-          !parent_id.nil?
+          !root?
         end
 
         # Returns root
         def root
-          self_and_ancestors.where(parent_column_name => nil).first
+          if persisted?
+            self_and_ancestors.where(parent_column_name => nil).first
+          else
+            if parent_id && current_parent = nested_set_scope.find(parent_id)
+              current_parent.root
+            else
+              self
+            end
+          end
         end
 
         # Returns the array of all parents and self
@@ -336,7 +344,8 @@ module CollectiveIdea #:nodoc:
         # Returns a set of itself and all of its nested children
         def self_and_descendants
           nested_set_scope.where([
-            "#{self.class.quoted_table_name}.#{quoted_left_column_name} >= ? AND #{self.class.quoted_table_name}.#{quoted_right_column_name} <= ?", left, right
+            "#{self.class.quoted_table_name}.#{quoted_left_column_name} >= ? AND #{self.class.quoted_table_name}.#{quoted_left_column_name} < ?", left, right
+            # using _left_ for both sides here lets us benefit from an index on that column if one exists
           ])
         end
 
@@ -404,6 +413,17 @@ module CollectiveIdea #:nodoc:
           move_to node, :child
         end
 
+        # Move the node to the child of another node with specify index (you can pass id only)
+        def move_to_child_with_index(node, index)
+          if node.children.empty?
+            move_to_child_of(node)
+          elsif node.children.count == index
+            move_to_right_of(node.children.last)
+          else
+            move_to_left_of(node.children[index])
+          end
+        end
+
         # Move the node to root nodes
         def move_to_root
           move_to nil, :root
@@ -609,6 +629,7 @@ module CollectiveIdea #:nodoc:
             end
             target.reload_nested_set if target
             self.set_depth!
+            self.children.each(&:save)
             self.reload_nested_set
           end
         end

data/lib/awesome_nested_set/version.rb

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

metadata

@@ -1,49 +1,41 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: awesome_nested_set
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
+  version: 2.1.3
   prerelease: 
-  segments: 
-  - 2
-  - 1
-  - 2
-  version: 2.1.2
 platform: ruby
-authors: 
+authors:
 - Brandon Keepers
 - Daniel Morrison
 - Philip Arndt
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-26 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 description: An awesome nested set implementation for Active Record
 email: info@collectiveidea.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - lib/awesome_nested_set/awesome_nested_set.rb
 - lib/awesome_nested_set/helper.rb
 - lib/awesome_nested_set/version.rb
@@ -53,39 +45,31 @@ files:
 - CHANGELOG
 homepage: http://github.com/collectiveidea/awesome_nested_set
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
 - --inline-source
 - --line-numbers
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: An awesome nested set implementation for Active Record
 test_files: []
-
+has_rdoc: