nested_set 1.7.0 → 1.7.1

data/lib/nested_set/base.rb

@@ -103,6 +103,10 @@ module CollectiveIdea #:nodoc:
                 where("#{quoted_right_column_name} - #{quoted_left_column_name} = 1").
                 order(quoted_left_column_name)
               }
+              scope :nodes, lambda {
+                where("(#{quoted_right_column_name} - #{quoted_left_column_name} - 1) / 2 != 0").
+                order(quoted_left_column_name)
+              }
               scope :with_depth, proc {|level| where(:"#{depth_column_name}" => level).order(quoted_left_column_name) }
 
               define_callbacks :move, :terminator => "result == false"
@@ -282,7 +286,7 @@ module CollectiveIdea #:nodoc:
             end
 
             def nodes_for_rebuild(node, node_scope)
-              where(parent_column_name => node).
+              where(parent_column_name => node.id).
                 where(node_scope).
                 order(order_for_rebuild).
                 all

data/lib/nested_set/depth.rb

@@ -22,7 +22,9 @@ module CollectiveIdea #:nodoc:
         # Update cached_level attribute
         def update_depth
           send :"#{depth_column_name}=", level
-          if depth_changed?
+          depth_changed = send :"#{depth_column_name}_changed?"
+          if depth_changed
+            depth_change = send :"#{depth_column_name}_change"
             self.self_and_descendants.
               update_all(["#{self.class.quoted_depth_column_name} = COALESCE(#{self.class.quoted_depth_column_name}, 0) + ?",
                 depth_change[1] - depth_change[0].to_i])
@@ -32,7 +34,7 @@ module CollectiveIdea #:nodoc:
         # Update cached_level attribute for all record tree
         def update_all_depth
           if has_depth_column?
-            self.class.connection.execute("UPDATE #{self.class.quoted_table_name} a SET a.depth = \
+            self.class.connection.execute("UPDATE #{self.class.quoted_table_name} a SET a.#{self.class.quoted_depth_column_name} = \
                 (SELECT count(*) - 1 FROM (SELECT * FROM #{self.class.quoted_table_name} WHERE #{scope_condition}) AS b \
               	WHERE #{scope_condition('a')} AND \
               	(a.#{quoted_left_column_name} BETWEEN b.#{quoted_left_column_name} AND b.#{quoted_right_column_name}))

data/lib/nested_set/helper.rb

@@ -23,7 +23,7 @@ module CollectiveIdea #:nodoc:
         #
         #   <%= f.select :parent_id, nested_set_options(Category, @category) {|i, level|
         #       "#{'–' * level} #{i.name}"
-        #     }) %>
+        #     } %>
         #
         def nested_set_options(class_or_items, mover = nil, options = {})
           items = case

data/lib/nested_set/version.rb

@@ -1,3 +1,3 @@
 module NestedSet
-  VERSION = "1.7.0"
+  VERSION = "1.7.1"
 end

data/test/nested_set_test.rb

@@ -138,6 +138,13 @@ class NestedSetTest < ActiveSupport::TestCase
     assert Category.leaves.include?(categories(:top_level_2))
   end
 
+  def test_nodes_class_method
+    assert_equal Category.find(:all, :conditions => "(#{Category.right_column_name} - #{Category.left_column_name} - 1) / 2 != 0"), Category.nodes
+    assert_equal Category.nodes.count, 2
+    assert Category.nodes.include?(categories(:top_level))
+    assert Category.nodes.include?(categories(:child_2))
+  end
+
   def test_leaf
     assert categories(:child_1).leaf?
     assert categories(:child_2_1).leaf?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nested_set
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-21 00:00:00.000000000 Z
+date: 2012-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &7512700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *7512700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &7510820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *7510820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &7508320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +54,15 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *7508320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &7504440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +70,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7504440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bench_press
-  requirement: &7502500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +86,12 @@ dependencies:
         version: 0.3.1
   type: :development
   prerelease: false
-  version_requirements: *7502500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.1
 description: An awesome nested set implementation for Active Record
 email:
 - info@collectiveidea.com
@@ -115,7 +140,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1989674500396068183
+      hash: 2463211120196063113
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -124,10 +149,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1989674500396068183
+      hash: 2463211120196063113
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: An awesome nested set implementation for Active Record