simple_nested_set 0.0.4 → 0.0.5

data/lib/core_ext/hash/extract_nested_set_attributes.rb

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

data/lib/simple_nested_set/act_macro.rb

@@ -4,15 +4,16 @@ module SimpleNestedSet
       return if acts_as_nested_set?
 
       include SimpleNestedSet::InstanceMethods
-      extend SimpleNestedSet::ClassMethods
+      extend  SimpleNestedSet::ClassMethods
 
       define_callbacks :move, :terminator => "result == false"
 
-      before_validation lambda { |r| r.nested_set.init_as_node }
+      before_validation lambda { |r| r.nested_set.init_as_node }, :if => :new_record?
       before_destroy    lambda { |r| r.nested_set.prune_branch }
+      after_save        lambda { |r| r.nested_set.save! }
 
       belongs_to :parent, :class_name => self.name
-      has_many :children, :foreign_key => :parent_id, :class_name => class_of_active_record_descendant(self).name
+      has_many :children, :foreign_key => :parent_id, :class_name => self.name
 
       default_scope :order => :lft
 

data/lib/simple_nested_set/class_methods.rb

@@ -10,14 +10,6 @@ module SimpleNestedSet
       set_callback(:move, :after, *args, &block)
     end
 
-    def create(attributes)
-      nested_set_class.with_move_by_attributes(attributes) { super }
-    end
-
-    def create!(attributes)
-      nested_set_class.with_move_by_attributes(attributes) { super }
-    end
-
     # Returns the first root node (with the given scope if any)
     def root(scope = nil)
       roots(scope).first

data/lib/simple_nested_set/instance_methods.rb

@@ -3,16 +3,12 @@ require 'active_support/core_ext/hash/keys'
 module SimpleNestedSet
   module InstanceMethods
     def nested_set
-      @nested_set ||= nested_set_class.new(self)
+      @_nested_set ||= nested_set_class.new(self)
     end
 
-    # TODO refactor
-    def update_attributes(attributes)
-      nested_set.with_move_by_attributes(attributes) { super }
-    end
-
-    def update_attributes!(attributes)
-      nested_set.with_move_by_attributes(attributes) { super }
+    def attributes=(attributes)
+      @_nested_set_attributes = attributes.extract_nested_set_attributes!
+      super
     end
 
     # recursively populates the parent and children associations of self and
@@ -22,11 +18,6 @@ module SimpleNestedSet
       self
     end
 
-    # Returns the level of this object in the tree, root level is 0
-    def level
-      parent_id.nil? ? 0 : ancestors.count
-    end
-
     # Returns true if this is a root node.
     def root?
       parent_id.blank?

data/lib/simple_nested_set/move/by_attributes.rb

@@ -38,6 +38,10 @@ module SimpleNestedSet
           attributes.symbolize_keys!
           attributes.each { |key, value| attributes[key] = nil if value == 'null' }
 
+          [:parent, :left, :right].each do |key|
+            attributes[:"#{key}_id"] = attributes.delete(key).id if attributes.key?(key)
+          end
+
           # if left_id is given but blank, set right_id to leftmost sibling
           attributes[:right_id] = siblings.first.id if blank_given?(:left_id) && siblings.any?
 

data/lib/simple_nested_set/move/to_target.rb

@@ -15,17 +15,66 @@ module SimpleNestedSet
 
       def perform
         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)
+              # puts ActiveRecord::Base.send(:sanitize_sql_array, query)
+              update_structure!
+              update_denormalizations!
             end
           end
           reload
         end
       end
 
+      def update_structure!
+        sql = <<-sql
+          lft = CASE
+            WHEN lft BETWEEN :a AND :b THEN lft + :d - :b
+            WHEN lft BETWEEN :c AND :d THEN lft + :a - :c
+            ELSE lft END,
+
+          rgt = CASE
+            WHEN rgt BETWEEN :a AND :b THEN rgt + :d - :b
+            WHEN rgt BETWEEN :c AND :d THEN rgt + :a - :c
+            ELSE rgt END,
+
+          parent_id = CASE
+            WHEN id = :id THEN :parent_id
+            ELSE parent_id END
+        sql
+
+        a, b, c, d = boundaries
+        sql = [sql, { :a => a, :b => b, :c => c, :d => d, :id => id, :parent_id => parent_id }]
+        nested_set.update_all(sql)
+      end
+
+      def update_denormalizations!
+        sql = []
+        sql << denormalize_level_query if node.has_attribute?(:level)
+        sql << denormalize_path_query  if node.has_attribute?(:path)
+        nested_set.update_all(sql.join(',')) unless sql.blank?
+      end
+
+      def denormalize_level_query
+        <<-sql
+          level = (
+            SELECT count(id)
+            FROM #{table_name} as l
+            WHERE l.lft < #{table_name}.lft AND l.rgt > #{table_name}.rgt
+          )
+        sql
+      end
+
+      def denormalize_path_query
+        <<-sql
+          path = (
+            SELECT GROUP_CONCAT(slug, '/')
+            FROM #{table_name} as l
+            WHERE l.lft <= #{table_name}.lft AND l.rgt >= #{table_name}.rgt AND parent_id IS NOT NULL
+          )
+        sql
+      end
+
       def reload
         target.nested_set.reload if target
         node.nested_set.reload
@@ -66,33 +115,6 @@ module SimpleNestedSet
         @roots ||= node.nested_set.roots
       end
 
-      def query
-        sql = <<-sql
-          lft = CASE
-            WHEN lft BETWEEN :a AND :b THEN lft + :d - :b
-            WHEN lft BETWEEN :c AND :d THEN lft + :a - :c
-            ELSE lft END,
-
-          rgt = CASE
-            WHEN rgt BETWEEN :a AND :b THEN rgt + :d - :b
-            WHEN rgt BETWEEN :c AND :d THEN rgt + :a - :c
-            ELSE rgt END,
-
-          parent_id = CASE
-            WHEN id = :id THEN :parent_id
-            ELSE parent_id END,
-
-          level = (
-            SELECT count(id)
-            FROM #{table_name} as t
-            WHERE t.lft < #{table_name}.lft AND rgt > #{table_name}.rgt
-          )
-        sql
-        # TODO name a, b, c, d in a more reasonable way
-        a, b, c, d = boundaries
-        [sql, { :a => a, :b => b, :c => c, :d => d, :id => id, :parent_id => parent_id }]
-      end
-
       def table_name
         node.class.quoted_table_name
       end

data/lib/simple_nested_set/nested_set.rb

@@ -1,7 +1,5 @@
 module SimpleNestedSet
   class NestedSet < ActiveRecord::Relation
-    NESTED_SET_ATTRIBUTES = [:parent_id, :left_id, :right_id]
-
     class_inheritable_accessor :node_class, :scope_names
 
     class << self
@@ -21,24 +19,6 @@ module SimpleNestedSet
           c.merge(name => scope.respond_to?(name) ? scope.send(name) : scope[name])
         end
       end
-
-      def with_move_by_attributes(attributes, node = nil)
-        node_class.transaction do
-          nested_set_attributes = extract_nested_set_attributes!(attributes)
-          yield.tap do |result|
-            unless nested_set_attributes.empty?
-              node ||= result
-              node.nested_set.move_by_attributes(nested_set_attributes)
-            end
-          end
-        end
-      end
-
-      def extract_nested_set_attributes!(attributes)
-        result = attributes.slice(*NESTED_SET_ATTRIBUTES)
-        attributes.except!(*NESTED_SET_ATTRIBUTES)
-        result
-      end
     end
 
     attr_reader :node
@@ -48,9 +28,11 @@ module SimpleNestedSet
       @node = args.first if args.size == 1
       @where_values = self.class.scope(node).instance_variable_get(:@where_values) if node
     end
-
-    def with_move_by_attributes(attributes, &block)
-      self.class.with_move_by_attributes(attributes, node, &block)
+    
+    def save!
+      attributes = node.instance_variable_get(:@_nested_set_attributes)
+      node.instance_variable_set(:@_nested_set_attributes, nil)
+      move_by_attributes(attributes) unless attributes.blank?
     end
 
     # Returns true if the node has the same scope as the given node
@@ -60,7 +42,7 @@ module SimpleNestedSet
 
     # reload left, right, and parent
     def reload
-      node.reload(:select => 'lft, rgt, parent_id')
+      node.reload(:select => 'lft, rgt, parent_id') unless node.new_record?
     end
 
     def populate_associations(nodes)
@@ -74,11 +56,8 @@ module SimpleNestedSet
 
     # before validation set lft and rgt to the end of the tree
     def init_as_node
-      unless node.rgt && node.lft
-        max_right = maximum(:rgt) || 0
-        node.lft, node.rgt = max_right + 1, max_right + 2
-      end
-      true
+      max_right = maximum(:rgt) || 0
+      node.lft, node.rgt = max_right + 1, max_right + 2
     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.4"
+  VERSION = "0.0.5"
 end

data/lib/simple_nested_set.rb

@@ -1,6 +1,9 @@
 require 'active_record'
+require 'core_ext/hash/extract_nested_set_attributes'
 
 module SimpleNestedSet
+  ATTRIBUTES = [:parent, :parent_id, :left_id, :right_id]
+
   autoload :ActMacro,        'simple_nested_set/act_macro'
   autoload :ClassMethods,    'simple_nested_set/class_methods'
   autoload :InstanceMethods, 'simple_nested_set/instance_methods'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_nested_set
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -100,6 +100,7 @@ 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