simple_nested_set 0.0.29 → 0.0.30

data/lib/simple_nested_set/act_macro.rb

@@ -16,7 +16,7 @@ module SimpleNestedSet
       after_save     lambda { |r| r.nested_set.save! }
 
       belongs_to :parent, :class_name => self.name
-      has_many :children, :foreign_key => :parent_id, :class_name => self.name
+      has_many :children, :foreign_key => :parent_id, :class_name => self.name, :order => :lft
 
       default_scope :order => :lft
 
@@ -28,4 +28,4 @@ module SimpleNestedSet
       included_modules.include?(SimpleNestedSet::InstanceMethods)
     end
   end
-end
+end

data/lib/simple_nested_set/move/by_attributes.rb

@@ -36,7 +36,7 @@ module SimpleNestedSet
         end
 
         def move_by_parent_id?
-          attributes.key?(:parent_id) && parent_id != node.parent_id
+          node.parent_id_changed?
         end
 
         def move_by_left_id
@@ -52,7 +52,7 @@ module SimpleNestedSet
         end
 
         def parent_id
-          attributes[:parent_id].blank? ? nil : attributes[:parent_id].to_i
+          attributes[:parent_id] == 0 ? nil : attributes[:parent_id]
         end
 
         def left_id

data/lib/simple_nested_set/move/to_target.rb

@@ -71,7 +71,7 @@ module SimpleNestedSet
             when :child ; target.rgt
             when :left  ; target.lft
             when :right ; target.rgt + 1
-            when :root  ; roots.empty? ? 1 : roots.last.rgt + 1
+            when :root  ; roots.empty? ? 1 : roots.where('id <> ?', node.id).last.rgt + 1
           end
           bound > node.rgt ? bound - 1 : bound
         end
@@ -91,4 +91,4 @@ module SimpleNestedSet
       end
     end
   end
-end
+end

data/lib/simple_nested_set/nested_set.rb

@@ -25,7 +25,7 @@ module SimpleNestedSet
 
       def extract_attributes!(attributes)
         attributes.slice(*SimpleNestedSet::ATTRIBUTES).tap do
-          attributes.except!(*(SimpleNestedSet::ATTRIBUTES - [:path]))
+          attributes.except!(*(SimpleNestedSet::ATTRIBUTES - [:path, :parent, :parent_id]))
         end if attributes.respond_to?(:slice)
       end
     end
@@ -40,14 +40,15 @@ module SimpleNestedSet
     end
 
     def save!
-      attributes = node.instance_variable_get(:@_nested_set_attributes)
+      attributes = node.instance_variable_get(:@_nested_set_attributes) || {}
       node.instance_variable_set(:@_nested_set_attributes, nil)
+      attributes.merge!(:parent_id => node.parent_id) if node.parent_id_changed?
 
       if self.class.move_after_save
         move_by_attributes(attributes) unless attributes.blank?
         denormalize!
       elsif attributes
-        attributes.each do |key, value|
+        attributes.except(:parent_id).each do |key, value|
           node.update_attribute(key, value)
         end
       end
@@ -100,7 +101,6 @@ module SimpleNestedSet
     def populate_associations(nodes)
       node.children.target = nodes.select do |child|
         next unless child.parent_id == node.id
-        nodes.delete(child)
         child.nested_set.populate_associations(nodes)
         child.parent = node
       end

data/lib/simple_nested_set/patches/arel_table_initialization.rb

@@ -67,7 +67,7 @@ when '1.0.1'
       end
     end
   end
-when /2\.0\.[5-7]/
+when /2\.0\.[5-9]/
   Gem.patching('arel', Arel::VERSION) do
     Arel::Table.class_eval do
       attr_reader :options # this line is added

data/lib/simple_nested_set/version.rb

@@ -1,3 +1,3 @@
 module SimpleNestedSet
-  VERSION = "0.0.29"
+  VERSION = "0.0.30"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_nested_set
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 35
   prerelease: false
   segments: 
   - 0
   - 0
-  - 29
-  version: 0.0.29
+  - 30
+  version: 0.0.30
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-25 00:00:00 +01:00
+date: 2011-02-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency