simple_nested_set 0.0.9 → 0.0.10

data/lib/simple_nested_set/instance_methods.rb

@@ -7,8 +7,8 @@ module SimpleNestedSet
     end
 
     def attributes=(attributes)
-      @_nested_set_attributes = attributes.extract_nested_set_attributes!
-      super
+      @_nested_set_attributes = nested_set_class.extract_attributes!(attributes)
+      super(attributes)
     end
 
     # recursively populates the parent and children associations of self and
@@ -160,5 +160,10 @@ module SimpleNestedSet
     def move_to_right_of(node)
       nested_set.move_to(node, :right)
     end
+
+    # Makes this node to the given path
+    def move_to_path(path)
+      nested_set.move_to_path(path)
+    end
   end
 end

data/lib/simple_nested_set/move/by_attributes.rb

@@ -1,18 +1,9 @@
 module SimpleNestedSet
   module Move
     class ByAttributes
-      class << self
-        def attribute_reader(*names)
-          names.each do |name|
-            define_method(name) { attributes[name].blank? ? nil : attributes[name].to_i }
-          end
-        end
-      end
-
       include Protection
 
       attr_reader :node, :attributes
-      attribute_reader :parent_id, :left_id, :right_id
 
       delegate :nested_set, :to => :node
 
@@ -23,7 +14,9 @@ module SimpleNestedSet
       end
 
       def perform
-        if left_id && left_id != node.id
+        if path && node.path_changed?
+          node.move_to_path(path)
+        elsif left_id && left_id != node.id
           node.move_to_right_of(left_id)
         elsif right_id && right_id != node.id
           node.move_to_left_of(right_id)
@@ -34,6 +27,22 @@ module SimpleNestedSet
 
       protected
 
+        def parent_id
+          attributes[:parent_id].blank? ? nil : attributes[:parent_id].to_i
+        end
+
+        def left_id
+          attributes[:left_id].blank? ? nil : attributes[:left_id].to_i
+        end
+
+        def right_id
+          attributes[:right_id].blank? ? nil : attributes[:right_id].to_i
+        end
+
+        def path
+          attributes[:path].blank? ? nil : attributes[:path]
+        end
+
         def normalize_attributes!
           attributes.symbolize_keys!
           attributes.each { |key, value| attributes[key] = nil if value == 'null' }

data/lib/simple_nested_set/move/to_target.rb

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

data/lib/simple_nested_set/nested_set.rb

@@ -21,6 +21,12 @@ module SimpleNestedSet
           c.merge(name => scope.respond_to?(name) ? scope.send(name) : scope[name])
         end
       end
+
+      def extract_attributes!(attributes)
+        attributes.slice(*SimpleNestedSet::ATTRIBUTES).tap do
+          attributes.except!(*(SimpleNestedSet::ATTRIBUTES - [:path]))
+        end
+      end
     end
 
     attr_reader :node
@@ -52,9 +58,12 @@ module SimpleNestedSet
       scope_names.all? { |scope| node.send(scope) == other.send(scope) }
     end
 
-    # reload left, right, and parent
+    # reload nested set attributes
     def reload
-      node.reload(:select => attribute_names.join(', ')) unless node.new_record? # FIXME reloading doesn't seem to work?
+      reloaded = unscoped { find(node.id, :select => [:parent_id, :lft, :rgt, :level, :path]) }
+      node.instance_eval { @attributes.merge!(reloaded.instance_variable_get(:@attributes)) }
+      node.parent = nil if node.parent_id.nil?
+      node.children.reset
     end
 
     def attribute_names
@@ -93,6 +102,12 @@ module SimpleNestedSet
       Move::ByAttributes.new(node, attributes).perform
     end
 
+    def move_to_path(path)
+      node.path, parent_path = path, path.split('/')[0..-2].join('/')
+      parent = parent_path.empty? ? nil : node.nested_set.where(:path => parent_path).first
+      node.move_to_child_of(parent)
+    end
+
     def move_to(target, position)
       Move::ToTarget.new(node, target, position).perform
     end

data/lib/simple_nested_set/version.rb

@@ -1,3 +1,3 @@
 module SimpleNestedSet
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/lib/simple_nested_set.rb

@@ -1,5 +1,4 @@
 require 'active_record'
-require 'core_ext/hash/extract_nested_set_attributes'
 
 module SimpleNestedSet
   ATTRIBUTES = [:parent, :parent_id, :left_id, :right_id, :lft, :rgt, :level, :path]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_nested_set
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 0
-  - 9
-  version: 0.0.9
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -100,7 +100,6 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/core_ext/hash/extract_nested_set_attributes.rb
 - lib/simple_nested_set.rb
 - lib/simple_nested_set/act_macro.rb
 - lib/simple_nested_set/class_methods.rb

data/lib/core_ext/hash/extract_nested_set_attributes.rb

@@ -1,8 +0,0 @@
-class Hash
-  def extract_nested_set_attributes!
-    slice(*SimpleNestedSet::ATTRIBUTES).tap do
-      except!(*SimpleNestedSet::ATTRIBUTES)
-    end
-  end
-end
-