simple_nested_set 0.0.6 → 0.0.7

data/lib/simple_nested_set/act_macro.rb

@@ -8,9 +8,9 @@ module SimpleNestedSet
 
       define_callbacks :move, :terminator => "result == false"
 
-      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! }
+      before_create  lambda { |r| r.nested_set.init_as_node }
+      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 => self.name

data/lib/simple_nested_set/move/to_target.rb

@@ -15,13 +15,11 @@ module SimpleNestedSet
 
       def perform
         node.run_callbacks(:move) do
-          unless bound == node.rgt || bound == node.lft # there would be no change
+          # unless bound == node.rgt || bound == node.lft # there would be no change
             nested_set.transaction do
-              # puts ActiveRecord::Base.send(:sanitize_sql_array, query)
               update_structure!
-              update_denormalizations!
             end
-          end
+          # end
           reload
         end
       end
@@ -45,34 +43,9 @@ module SimpleNestedSet
 
         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
-          )
-        sql
+        # puts ActiveRecord::Base.send(:sanitize_sql_array, sql)
+        nested_set.update_all(sql)
       end
 
       def reload

data/lib/simple_nested_set/nested_set.rb

@@ -33,6 +33,16 @@ module SimpleNestedSet
       attributes = node.instance_variable_get(:@_nested_set_attributes)
       node.instance_variable_set(:@_nested_set_attributes, nil)
       move_by_attributes(attributes) unless attributes.blank?
+      denormalize!
+    end
+
+    # FIXME we don't always want to call this on after_save, do we? it's only relevant when 
+    # either the structure or the slug has changed
+    def denormalize!
+      sql = []
+      sql << denormalize_level_query if node.has_attribute?(:level)
+      sql << denormalize_path_query  if node.has_attribute?(:path)
+      update_all(sql.join(',')) unless sql.blank?
     end
 
     # Returns true if the node has the same scope as the given node
@@ -84,5 +94,23 @@ module SimpleNestedSet
     def move_to(target, position)
       Move::ToTarget.new(node, target, position).perform
     end
+
+    def denormalize_level_query
+      query = arel_table.as(:l)
+      query = query.project('count(id)').
+              where(query[:lft].lt(arel_table[:lft])).
+              where(query[:rgt].gt(arel_table[:rgt])).
+              where(where_clauses.map { |clause| clause.gsub(table_name, 'l') })
+      "level = (#{query.to_sql})"
+    end
+
+    def denormalize_path_query
+      query = arel_table.as(:l)
+      query = query.project("GROUP_CONCAT(slug, '/')").
+              where(query[:lft].lteq(arel_table[:lft])).
+              where(query[:rgt].gteq(arel_table[:rgt])).
+              where(where_clauses.map { |clause| clause.gsub(table_name, 'l') })
+      "path = (#{query.to_sql})"
+    end
   end
 end

data/lib/simple_nested_set/version.rb

@@ -1,3 +1,3 @@
 module SimpleNestedSet
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_nested_set
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-18 00:00:00 +02:00
+date: 2010-08-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency