nested_set 1.6.6 → 1.6.7

data/VERSION

@@ -1 +1 @@
-1.6.6
+1.6.7

data/lib/nested_set/base.rb

@@ -59,12 +59,6 @@ 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
@@ -109,7 +103,7 @@ module CollectiveIdea #:nodoc:
                 where("#{quoted_right_column_name} - #{quoted_left_column_name} = 1").
                 order(quoted_left_column_name)
               }
-              scope :with_depth, proc {|level| where(:depth => level).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"
             end

data/lib/nested_set/depth.rb

@@ -14,13 +14,14 @@ module CollectiveIdea #:nodoc:
           scope_string.blank? ? "1 = 1" : scope_string
         end
 
-        def depth
-          super.to_i if depth?
+
+        def depth?
+          respond_to?(depth_column_name)
         end
 
         # Update cached_level attribute
         def update_depth
-          self.depth = level
+          send :"#{depth_column_name}=", level
           if depth_changed?
             self.self_and_descendants.
               update_all(["#{self.class.quoted_depth_column_name} = COALESCE(#{self.class.quoted_depth_column_name}, 0) + ?",

data/nested_set.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{nested_set}
-  s.version = "1.6.6"
+  s.version = "1.6.7"
 
   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-30}
+  s.date = %q{2011-06-20}
   s.description = %q{An awesome nested set implementation for Active Record}
   s.email = %q{info@collectiveidea.com}
   s.extra_rdoc_files = [

data/test/nested_set_test.rb

@@ -197,13 +197,13 @@ class NestedSetTest < ActiveSupport::TestCase
   end
 
   def test_depth
-    assert_equal 0, categories(:top_level).depth
+    assert_equal nil, categories(:top_level).depth
     assert_equal 1, categories(:child_1).depth
     assert_equal 2, categories(:child_2_1).depth
   end
 
   def test_depth_after_move
-    assert_equal 0, categories(:top_level).depth
+    assert_equal nil, categories(:top_level).depth
     assert_equal 1, categories(:child_2).depth
 
     categories(:top_level).move_to_child_of(categories(:top_level_2))

metadata

@@ -1,91 +1,94 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: nested_set
-version: !ruby/object:Gem::Version
-  version: 1.6.6
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 1.6.7
 platform: ruby
-authors:
+authors: 
 - Brandon Keepers
 - Daniel Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-30 00:00:00.000000000 +04:00
+
+date: 2011-06-20 00:00:00 +04:00
 default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: railties
-  requirement: &9314280 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *9314280
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: activerecord
-  requirement: &9313680 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *9313680
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
-  requirement: &9313140 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *9313140
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: actionpack
-  requirement: &9312540 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *9312540
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: bench_press
-  requirement: &9312020 !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 0.3.1
   type: :development
   prerelease: false
-  version_requirements: *9312020
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &9311440 !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *9311440
+  version_requirements: *id006
 description: An awesome nested set implementation for Active Record
 email: info@collectiveidea.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.md
-files:
+files: 
 - .autotest
 - Gemfile
 - Gemfile.lock
@@ -115,32 +118,35 @@ files:
 has_rdoc: true
 homepage: http://github.com/skyeagle/nested_set
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 2412843186330894320
+      segments: 
       - 0
-      hash: 814659255794792951
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: An awesome nested set implementation for Active Record
-test_files:
+test_files: 
 - test/benchmarks.rb
 - test/db/schema.rb
 - test/fixtures/category.rb