nested_set 1.6.5 → 1.6.6

data/VERSION

@@ -1 +1 @@
-1.6.5
+1.6.6

data/lib/nested_set/base.rb

@@ -59,6 +59,12 @@ module CollectiveIdea #:nodoc:
             class_attribute :acts_as_nested_set_options
             self.acts_as_nested_set_options = options
 
+            class_attribute :use_depth
+            self.use_depth = self.base_class.column_names.include?(self.base_class.acts_as_nested_set_options[:depth_column])
+
+            #backward compatibility
+            alias_method :depth?, :use_depth
+
             unless self.is_a?(ClassMethods)
               include Comparable
               include Columns

data/lib/nested_set/depth.rb

@@ -14,9 +14,8 @@ module CollectiveIdea #:nodoc:
           scope_string.blank? ? "1 = 1" : scope_string
         end
 
-        # Check is model has depth column
-        def depth?
-          self.respond_to?(:depth)
+        def depth
+          super.to_i if depth?
         end
 
         # Update cached_level attribute
@@ -24,7 +23,7 @@ module CollectiveIdea #:nodoc:
           self.depth = level
           if depth_changed?
             self.self_and_descendants.
-              update_all(["#{self.class.quoted_depth_column_name} = #{self.class.quoted_depth_column_name} + ?",
+              update_all(["#{self.class.quoted_depth_column_name} = COALESCE(#{self.class.quoted_depth_column_name}, 0) + ?",
                 depth_change[1] - depth_change[0].to_i])
           end
         end

data/nested_set.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{nested_set}
-  s.version = "1.6.5"
+  s.version = "1.6.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brandon Keepers", "Daniel Morrison"]
-  s.date = %q{2011-05-24}
+  s.date = %q{2011-05-30}
   s.description = %q{An awesome nested set implementation for Active Record}
   s.email = %q{info@collectiveidea.com}
   s.extra_rdoc_files = [

data/test/fixtures/categories.yml

@@ -14,7 +14,7 @@ top_level:
   name: Top Level
   lft: 1
   rgt: 10
-  depth: 0
+  #depth: NULL
 child_1:
   id: 2
   name: Child 1

data/test/nested_set_test.rb

@@ -5,13 +5,13 @@ class Note < ActiveRecord::Base
 end
 
 class Default < ActiveRecord::Base
-  acts_as_nested_set
   set_table_name 'categories'
+  acts_as_nested_set
 end
 
 class ScopedCategory < ActiveRecord::Base
-  acts_as_nested_set :scope => :organization
   set_table_name 'categories'
+  acts_as_nested_set :scope => :organization
 end
 
 class RenamedColumns < ActiveRecord::Base
@@ -203,15 +203,13 @@ class NestedSetTest < ActiveSupport::TestCase
   end
 
   def test_depth_after_move
-    categories(:child_2).move_to_root
-
-    assert_equal 0, categories(:child_2).depth
-    assert_equal 1, categories(:child_2_1).depth
+    assert_equal 0, categories(:top_level).depth
+    assert_equal 1, categories(:child_2).depth
 
-    categories(:child_2).move_to_child_of(categories(:top_level_2))
+    categories(:top_level).move_to_child_of(categories(:top_level_2))
 
-    assert_equal 1, categories(:child_2).depth
-    assert_equal 2, categories(:child_2_1).reload.depth
+    assert_equal 1, categories(:top_level).reload.depth
+    assert_equal 2, categories(:child_2).reload.depth
   end
 
   def test_has_children?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nested_set
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.6.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-24 00:00:00.000000000 +04:00
+date: 2011-05-30 00:00:00.000000000 +04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &11153540 !ruby/object:Gem::Requirement
+  requirement: &9314280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *11153540
+  version_requirements: *9314280
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &11152400 !ruby/object:Gem::Requirement
+  requirement: &9313680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *11152400
+  version_requirements: *9313680
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &11151640 !ruby/object:Gem::Requirement
+  requirement: &9313140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11151640
+  version_requirements: *9313140
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &11148600 !ruby/object:Gem::Requirement
+  requirement: &9312540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *11148600
+  version_requirements: *9312540
 - !ruby/object:Gem::Dependency
   name: bench_press
-  requirement: &11147700 !ruby/object:Gem::Requirement
+  requirement: &9312020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: 0.3.1
   type: :development
   prerelease: false
-  version_requirements: *11147700
+  version_requirements: *9312020
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &11146880 !ruby/object:Gem::Requirement
+  requirement: &9311440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,7 +78,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11146880
+  version_requirements: *9311440
 description: An awesome nested set implementation for Active Record
 email: info@collectiveidea.com
 executables: []
@@ -127,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1622325140072455651
+      hash: 814659255794792951
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: