awesome_nested_set 2.1.5 → 2.1.6

data/CHANGELOG

@@ -1,3 +1,8 @@
+2.1.6
+* Fixed rebuild! when there is a default_scope with order [Adrian Serafin]
+* Testing with stable bundler, ruby 2.0, MySQL and PostgreSQL [Philip Arndt]
+* Optimized move_to for large trees [ericsmith66]
+
 2.1.5
 * Worked around issues where AR#association wasn't present on Rails 3.0.x. [Philip Arndt]
 * Adds option 'order_column' which defaults to 'left_column_name'. [gudata]

data/lib/awesome_nested_set/awesome_nested_set.rb

@@ -181,34 +181,37 @@ module CollectiveIdea #:nodoc:
           # Rebuilds the left & rights if unset or invalid.
           # Also very useful for converting from acts_as_tree.
           def rebuild!(validate_nodes = true)
-            # Don't rebuild a valid tree.
-            return true if valid?
-
-            scope = lambda{|node|}
-            if acts_as_nested_set_options[:scope]
-              scope = lambda{|node|
-                scope_column_names.inject(""){|str, column_name|
-                  str << "AND #{connection.quote_column_name(column_name)} = #{connection.quote(node.send(column_name.to_sym))} "
+            # default_scope with order may break database queries so we do all operation without scope
+            unscoped do
+              # Don't rebuild a valid tree.
+              return true if valid?
+
+              scope = lambda{|node|}
+              if acts_as_nested_set_options[:scope]
+                scope = lambda{|node|
+                  scope_column_names.inject(""){|str, column_name|
+                    str << "AND #{connection.quote_column_name(column_name)} = #{connection.quote(node.send(column_name.to_sym))} "
+                  }
                 }
-              }
-            end
-            indices = {}
-
-            set_left_and_rights = lambda do |node|
-              # set left
-              node[left_column_name] = indices[scope.call(node)] += 1
-              # find
-              where(["#{quoted_parent_column_full_name} = ? #{scope.call(node)}", node]).order("#{quoted_left_column_full_name}, #{quoted_right_column_full_name}, id").each{|n| set_left_and_rights.call(n) }
-              # set right
-              node[right_column_name] = indices[scope.call(node)] += 1
-              node.save!(:validate => validate_nodes)
-            end
+              end
+              indices = {}
+
+              set_left_and_rights = lambda do |node|
+                # set left
+                node[left_column_name] = indices[scope.call(node)] += 1
+                # find
+                where(["#{quoted_parent_column_full_name} = ? #{scope.call(node)}", node]).order("#{quoted_left_column_full_name}, #{quoted_right_column_full_name}, id").each{|n| set_left_and_rights.call(n) }
+                # set right
+                node[right_column_name] = indices[scope.call(node)] += 1
+                node.save!(:validate => validate_nodes)
+              end
 
-            # Find root node(s)
-            root_nodes = where("#{quoted_parent_column_full_name} IS NULL").order("#{quoted_left_column_full_name}, #{quoted_right_column_full_name}, id").each do |root_node|
-              # setup index for this scope
-              indices[scope.call(root_node)] ||= 0
-              set_left_and_rights.call(root_node)
+              # Find root node(s)
+              root_nodes = where("#{quoted_parent_column_full_name} IS NULL").order("#{quoted_left_column_full_name}, #{quoted_right_column_full_name}, id").each do |root_node|
+                # setup index for this scope
+                indices[scope.call(root_node)] ||= 0
+                set_left_and_rights.call(root_node)
+              end
             end
           end
 
@@ -652,7 +655,27 @@ module CollectiveIdea #:nodoc:
                 else          target[parent_column_name]
               end
 
-              self.nested_set_scope.update_all([
+              where_statement = ["not (#{quoted_left_column_name} = CASE " +
+                                     "WHEN #{quoted_left_column_name} BETWEEN :a AND :b " +
+                                     "THEN #{quoted_left_column_name} + :d - :b " +
+                                     "WHEN #{quoted_left_column_name} BETWEEN :c AND :d " +
+                                     "THEN #{quoted_left_column_name} + :a - :c " +
+                                     "ELSE #{quoted_left_column_name} END AND " +
+                                     "#{quoted_right_column_name} = CASE " +
+                                     "WHEN #{quoted_right_column_name} BETWEEN :a AND :b " +
+                                     "THEN #{quoted_right_column_name} + :d - :b " +
+                                     "WHEN #{quoted_right_column_name} BETWEEN :c AND :d " +
+                                     "THEN #{quoted_right_column_name} + :a - :c " +
+                                     "ELSE #{quoted_right_column_name} END AND " +
+                                     "#{quoted_parent_column_name} = CASE " +
+                                     "WHEN #{self.class.base_class.primary_key} = :id THEN :new_parent " +
+                                     "ELSE #{quoted_parent_column_name} END)" ,
+                                 {:a => a, :b => b, :c => c, :d => d, :id => self.id, :new_parent => new_parent}    ]
+
+
+
+
+              self.nested_set_scope.where(*where_statement).update_all([
                 "#{quoted_left_column_name} = CASE " +
                   "WHEN #{quoted_left_column_name} BETWEEN :a AND :b " +
                     "THEN #{quoted_left_column_name} + :d - :b " +

data/lib/awesome_nested_set/version.rb

@@ -1,3 +1,3 @@
 module AwesomeNestedSet
-  VERSION = '2.1.5' unless defined?(::AwesomeNestedSet::VERSION)
+  VERSION = '2.1.6' 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.5
+  version: 2.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
+date: 2013-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,7 +44,39 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.12'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10'
+- !ruby/object:Gem::Dependency
+  name: combustion
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.3
 description: An awesome nested set implementation for Active Record
 email: info@collectiveidea.com
 executables: []
@@ -60,7 +92,8 @@ files:
 - README.rdoc
 - CHANGELOG
 homepage: http://github.com/collectiveidea/awesome_nested_set
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options:
 - --main
@@ -83,9 +116,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: An awesome nested set implementation for Active Record
 test_files: []
-has_rdoc: