nested_set 1.5.2 → 1.5.3

data/README.rdoc

@@ -1,8 +1,8 @@
 = NestedSet
 
-Nested Set is an implementation of the nested set pattern for ActiveRecord models. It is replacement for acts_as_nested_set and BetterNestedSet, but awesomer. It supports Rails 3.0.rc and later.
+Nested Set is an implementation of the nested set pattern for ActiveRecord models. It is replacement for acts_as_nested_set and BetterNestedSet, but awesomer. It supports Rails 3.0 and later.
 
-See, it's Rails 3 only.
+=== See, it's Rails 3 only.
 
 == Installation
 
@@ -41,7 +41,7 @@ Enable the nested set functionality by declaring acts_as_nested_set on your mode
   class Category < ActiveRecord::Base
     acts_as_nested_set
   end
-  
+
 Run `rake rdoc` to generate the API docs and see CollectiveIdea::Acts::NestedSet::Base::SingletonMethods for more info.
 
 == Conversion from other trees
@@ -78,13 +78,13 @@ You can learn more about nested sets at:
 If you find what you might think is a bug:
 
 1. Check the GitHub issue tracker to see if anyone else has had the same issue.
-   http://github.com/collectiveidea/awesome_nested_set/issues/
+   http://github.com/skyeagle/nested_set/issues/
 2. If you don't see anything, create an issue with information on how to reproduce it.
 
 If you want to contribute an enhancement or a fix:
 
 1. Fork the project on github.
-   http://github.com/collectiveidea/awesome_nested_set/
+   http://github.com/skyeagle/nested_set/
 2. Make your changes with tests.
 3. Commit the changes without making changes to the Rakefile, VERSION, or any other files that aren't related to your enhancement or fix
 4. Send a pull request.

data/VERSION

@@ -1 +1 @@
-1.5.2
+1.5.3

data/lib/nested_set/helper.rb

@@ -26,9 +26,16 @@ module CollectiveIdea #:nodoc:
           items = Array(class_or_item)
           result = []
           items.each do |root|
+            levels = []
             result += root.self_and_descendants.map do |i|
+              if level = levels.index(i.parent_id)
+                levels.slice!((level + 1)..-1)
+              else
+                levels << i.parent_id
+                level = levels.size - 1
+              end
               if mover.nil? || mover.new_record? || mover.move_possible?(i)
-                [yield(i), i.id]
+                [yield(i, level), i.id]
               end
             end.compact
           end

data/nested_set.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{nested_set}
-  s.version = "1.5.2"
+  s.version = "1.5.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brandon Keepers", "Daniel Morrison"]
-  s.date = %q{2010-10-01}
+  s.date = %q{2010-11-10}
   s.description = %q{An awesome nested set implementation for Active Record}
   s.email = %q{info@collectiveidea.com}
   s.extra_rdoc_files = [
@@ -49,11 +49,11 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{An awesome nested set implementation for Active Record}
   s.test_files = [
-    "test/nested_set/helper_test.rb",
-     "test/nested_set_test.rb",
-     "test/db/schema.rb",
+    "test/nested_set_test.rb",
+     "test/nested_set/helper_test.rb",
+     "test/test_helper.rb",
      "test/fixtures/category.rb",
-     "test/test_helper.rb"
+     "test/db/schema.rb"
   ]
 
   if s.respond_to? :specification_version then

data/test/nested_set/helper_test.rb

@@ -16,8 +16,8 @@ module CollectiveIdea
             ['- Child 3', 5],
             [" Top Level 2", 6]
           ]
-          actual = nested_set_options(Category) do |c|
-            "#{'-' * c.level} #{c.name}"
+          actual = nested_set_options(Category) do |c, level|
+            "#{'-' * level} #{c.name}"
           end
           assert_equal expected, actual
         end
@@ -29,8 +29,8 @@ module CollectiveIdea
             ['- Child 3', 5],
             [" Top Level 2", 6]
           ]
-          actual = nested_set_options(Category, categories(:child_2)) do |c|
-            "#{'-' * c.level} #{c.name}"
+          actual = nested_set_options(Category, categories(:child_2)) do |c, level|
+            "#{'-' * level} #{c.name}"
           end
           assert_equal expected, actual
         end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 2
-  version: 1.5.2
+  - 3
+  version: 1.5.3
 platform: ruby
 authors: 
 - Brandon Keepers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-01 00:00:00 +04:00
+date: 2010-11-10 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -172,8 +172,8 @@ signing_key:
 specification_version: 3
 summary: An awesome nested set implementation for Active Record
 test_files: 
-- test/nested_set/helper_test.rb
 - test/nested_set_test.rb
-- test/db/schema.rb
-- test/fixtures/category.rb
+- test/nested_set/helper_test.rb
 - test/test_helper.rb
+- test/fixtures/category.rb
+- test/db/schema.rb