awesome_nested_set 3.0.0.rc.4 → 3.0.0.rc.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b906a0322b3f2d297483d2ba0b15ff50388291a6
-  data.tar.gz: 350093eb665d7ae7c23de6338d0f1793c11d8e8a
+  metadata.gz: 9af145388371e47258be0fb9ed3c46ea172a6c3b
+  data.tar.gz: 4273003fd7e7fc00b0a5758001f1cc92af41ffeb
 SHA512:
-  metadata.gz: 6e90aeca23cb8729cccbf9b87f47176363fc009797eb0ec929823093ebdcd2a4c7dfd590bb2aee131defb15b0de8780a32d5ade6ad0e8de6c2897a7522c5ae84
-  data.tar.gz: c09e4c671b3c45e7092ccde2c5c9f0e865fc6748cc85433350f342b3e5f83cf0737459ff6f15cabc989afb78df53198a5beba908c4cf5a9afd7672e75e76491a
+  metadata.gz: 035d190dd06666e3fe5d01a36c70223b5150b27d21df6d3bcec5e5923180bde66090eee1f41263747b662f5d6b690aa55d509d8a14209e1dc0831d8424a8ff62
+  data.tar.gz: 99c75707c323da2add1d619c652fae8357396c75c3034a4c9dca92a359a24ed278e0501adf775b007d14e63a3d1c1c4155e1ed3b94f8ce84b756ed2c7a29507a

data/lib/awesome_nested_set/model.rb

@@ -190,10 +190,35 @@ module CollectiveIdea #:nodoc:
 
           in_tenacious_transaction do
             reload
-            nested_set_scope.primary_key_scope(primary_id).
-              update_all(["#{quoted_depth_column_name} = ?", level])
+            update_depth(level)
+          end
+        end
+
+        def set_depth_for_self_and_descendants!
+          return unless has_depth_column?
+
+          in_tenacious_transaction do
+            reload
+            self_and_descendants.select(primary_column_name).lock(true)
+            old_depth = self[depth_column_name] || 0
+            new_depth = level
+            update_depth(new_depth)
+            change_descendants_depth!(new_depth - old_depth)
+            new_depth
+          end
+        end
+
+        def update_depth(depth)
+          nested_set_scope.primary_key_scope(primary_id).
+              update_all(["#{quoted_depth_column_name} = ?", depth])
+          self[depth_column_name] = depth
+        end
+
+        def change_descendants_depth!(diff)
+          if !leaf? && diff != 0
+            sign = "++-"[diff <=> 0]
+            descendants.update_all("#{quoted_depth_column_name} = #{quoted_depth_column_name} #{sign} #{diff.abs}")
           end
-          self[depth_column_name] = self.level
         end
 
         def set_default_left_and_right

data/lib/awesome_nested_set/model/movable.rb

@@ -104,8 +104,7 @@ module CollectiveIdea #:nodoc:
 
           def after_move_to(target, position)
             target.reload_nested_set if target
-            self.set_depth!
-            self.descendants.each(&:save)
+            self.set_depth_for_self_and_descendants!
             self.reload_nested_set
           end
 

data/lib/awesome_nested_set/version.rb

@@ -1,3 +1,3 @@
 module AwesomeNestedSet
-  VERSION = '3.0.0.rc.4' unless defined?(::AwesomeNestedSet::VERSION)
+  VERSION = '3.0.0.rc.5' unless defined?(::AwesomeNestedSet::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awesome_nested_set
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc.4
+  version: 3.0.0.rc.5
 platform: ruby
 authors:
 - Brandon Keepers
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord