simple_nested_set 0.0.3 → 0.0.4

data/lib/simple_nested_set/act_macro.rb

@@ -6,9 +6,7 @@ module SimpleNestedSet
       include SimpleNestedSet::InstanceMethods
       extend SimpleNestedSet::ClassMethods
 
-      # TODO get callbacks working
-      # define_callbacks :move, :terminator => "result == false"
-      # before_move :init_as_node
+      define_callbacks :move, :terminator => "result == false"
 
       before_validation lambda { |r| r.nested_set.init_as_node }
       before_destroy    lambda { |r| r.nested_set.prune_branch }

data/lib/simple_nested_set/class_methods.rb

@@ -2,6 +2,14 @@ require 'active_support/core_ext/hash/slice'
 
 module SimpleNestedSet
   module ClassMethods
+    def before_move(*args, &block)
+      set_callback(:move, :before, *args, &block)
+    end
+
+    def after_move(*args, &block)
+      set_callback(:move, :after, *args, &block)
+    end
+
     def create(attributes)
       nested_set_class.with_move_by_attributes(attributes) { super }
     end

data/lib/simple_nested_set/move/to_target.rb

@@ -14,9 +14,14 @@ module SimpleNestedSet
       end
 
       def perform
-        unless bound == node.rgt || bound == node.lft # there would be no change
-          reload
-          nested_set.transaction { nested_set.update_all(query) }
+        node.run_callbacks(:move) do
+          # reload
+          unless bound == node.rgt || bound == node.lft # there would be no change
+            nested_set.transaction do
+              # node.save!
+              nested_set.update_all(query)
+            end
+          end
           reload
         end
       end

data/lib/simple_nested_set/nested_set.rb

@@ -25,9 +25,12 @@ module SimpleNestedSet
       def with_move_by_attributes(attributes, node = nil)
         node_class.transaction do
           nested_set_attributes = extract_nested_set_attributes!(attributes)
-          result = yield
-          (node || result).nested_set.move_by_attributes(nested_set_attributes) unless nested_set_attributes.empty?
-          result
+          yield.tap do |result|
+            unless nested_set_attributes.empty?
+              node ||= result
+              node.nested_set.move_by_attributes(nested_set_attributes)
+            end
+          end
         end
       end
 
@@ -75,6 +78,7 @@ module SimpleNestedSet
         max_right = maximum(:rgt) || 0
         node.lft, node.rgt = max_right + 1, max_right + 2
       end
+      true
     end
 
     # Prunes a branch off of the tree, shifting all of the elements on the right

data/lib/simple_nested_set/version.rb

@@ -1,3 +1,3 @@
 module SimpleNestedSet
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/simple_nested_set.rb

@@ -1,3 +1,5 @@
+require 'active_record'
+
 module SimpleNestedSet
   autoload :ActMacro,        'simple_nested_set/act_macro'
   autoload :ClassMethods,    'simple_nested_set/class_methods'
@@ -8,6 +10,8 @@ module SimpleNestedSet
     autoload :ByAttributes,  'simple_nested_set/move/by_attributes'
     autoload :ToTarget,      'simple_nested_set/move/to_target'
     autoload :Protection,    'simple_nested_set/move/protection'
+    autoload :Impossible,    'simple_nested_set/move/protection'
+    autoload :Inconsistent,  'simple_nested_set/move/protection'
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_nested_set
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-12 00:00:00 +02:00
+date: 2010-08-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency