simple_nested_set 0.0.2 → 0.0.3

data/lib/simple_nested_set/act_macro.rb

@@ -14,7 +14,7 @@ module SimpleNestedSet
       before_destroy    lambda { |r| r.nested_set.prune_branch }
 
       belongs_to :parent, :class_name => self.name
-      has_many :children, :foreign_key => :parent_id, :class_name => self.base_class.name
+      has_many :children, :foreign_key => :parent_id, :class_name => class_of_active_record_descendant(self).name
 
       default_scope :order => :lft
 

data/lib/simple_nested_set/move/by_attributes.rb

@@ -19,7 +19,7 @@ module SimpleNestedSet
       def initialize(node, attributes)
         @node, @attributes = node, attributes
         normalize_attributes!
-        protect_inconsistent_move!(parent_id, left_id, right_id)
+        protect_inconsistent_move!
       end
 
       def perform
@@ -39,14 +39,14 @@ module SimpleNestedSet
           attributes.each { |key, value| attributes[key] = nil if value == 'null' }
 
           # if left_id is given but blank, set right_id to leftmost sibling
-          if attributes.has_key?(:left_id) && attributes[:left_id].blank? && siblings.any?
-            attributes[:right_id] = siblings.first.id
-          end
+          attributes[:right_id] = siblings.first.id if blank_given?(:left_id) && siblings.any?
 
           # if right_id is given but blank, set left_id to rightmost sibling
-          if attributes.has_key?(:right_id) && attributes[:right_id].blank? && siblings.any?
-            attributes[:left_id] = siblings.last.id
-          end
+          attributes[:left_id]  = siblings.last.id if blank_given?(:right_id) && siblings.any?
+        end
+
+        def blank_given?(key)
+          attributes.has_key?(key) && attributes[key].blank? && siblings.any?
         end
 
         def siblings

data/lib/simple_nested_set/move/protection.rb

@@ -14,8 +14,8 @@ module SimpleNestedSet
         impossible_move!("A node can't be moved to a different scope") if target && !nested_set.same_scope?(target)
       end
 
-      def protect_inconsistent_move!(parent_id, left_id, right_id)
-        left  = nested_set.find(left_id) if left_id
+      def protect_inconsistent_move!
+        left  = nested_set.find(left_id)  if left_id
         right = nested_set.find(right_id) if right_id
 
         if left && right && (!left.right_sibling || left.right_sibling.id != right_id)

data/lib/simple_nested_set/move/to_target.rb

@@ -10,7 +10,6 @@ module SimpleNestedSet
       def initialize(node, target, position)
         @node, @target, @position = node, target, position
         @target = nested_set.find(target) if target && !target.is_a?(ActiveRecord::Base)
-
         protect_impossible_move!
       end
 

data/lib/simple_nested_set/version.rb

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

metadata

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