nested_set 1.5.3 → 1.5.4

data/README.rdoc

@@ -62,6 +62,13 @@ Example usage:
 
   <%= select_tag 'parent_id', options_for_select(nested_set_options(Category) {|i| "#{'-' * i.level} #{i.name}" } ) %>
 
+or sorted select:
+
+  <%= f.select :parent_id, sorted_nested_set_options(Category, lambda(&:name)) {|i| "#{'-' * i.level} #{i.name}" } %>
+
+  <% sort_method = lambda{|x, y| x.name.downcase <=> y.name.downcase} %>
+  <%= select_tag 'parent_id', options_for_select(sorted_nested_set_options(Category, sort_method){|i| "#{'-' * i.level} #{i.name}" } ) %>
+
 See CollectiveIdea::Acts::NestedSet::Helper for more information about the helpers.
 
 == References

data/VERSION

@@ -1 +1 @@
-1.5.3
+1.5.4

data/lib/nested_set/helper.rb

@@ -17,8 +17,8 @@ module CollectiveIdea #:nodoc:
         #
         # == Usage
         #
-        #   <%= f.select :parent_id, nested_set_options(Category, @category) {|i|
-        #       "#{'–' * i.level} #{i.name}"
+        #   <%= f.select :parent_id, nested_set_options(Category, @category) {|i, level|
+        #       "#{'–' * level} #{i.name}"
         #     }) %>
         #
         def nested_set_options(class_or_item, mover = nil)
@@ -41,6 +41,55 @@ module CollectiveIdea #:nodoc:
           end
           result
         end
+
+        # Returns options for select.
+        # You can sort node's child by any method
+        # You can exclude some items from the tree.
+        # You can pass a block receiving an item and returning the string displayed in the select.
+        #
+        # == Params
+        #  * +class_or_item+ - Class name or top level times
+        #  * +sort_proc+ sorting proc for node's child, ex. lambda{|x| x.name}
+        #  * +mover+ - The item that is being move, used to exlude impossible moves
+        #  * +level+ - start level, :default => 0
+        #  * +&block+ - a block that will be used to display: { |itemi, level| "#{'–' * level} #{i.name}" }
+        # == Usage
+        #
+        #   <%= f.select :parent_id, sorted_nested_set_options(Category, lambda(&:name)) {|i, level|
+        #       "#{'–' * level} #{i.name}"
+        #     }) %>
+        #
+        #   OR
+        #
+        #   sort_method = lambda{|x,y| x.name.downcase <=> y.name.downcase}
+        #
+        #   <%= f.select :parent_id, nested_set_options(Category, sort_method) {|i, level|
+        #       "#{'–' * level} #{i.name}"
+        #     }) %>
+        #
+        def sorted_nested_set_options(class_or_item, sort_proc, mover = nil, level = 0)
+          class_or_item = class_or_item.roots if class_or_item.is_a?(Class)
+          items = Array(class_or_item)
+          result = []
+          items.sort_by(&sort_proc).each do |root|
+            set = root.self_and_descendants
+            result += build_node(set[0], set, sort_proc, mover, level){|x, level| yield(x, level)}
+          end
+          result
+        end
+
+        def build_node(node, set, sort_proc, mover = nil, level = nil)
+          result ||= []
+          if mover.nil? || mover.new_record? || mover.move_possible?(i)
+            result << [yield(node, level), node.id]
+            unless node.leaf?
+              set.select{|i| i.parent_id == node.id}.sort_by(&sort_proc).map{ |i|
+                result.push(*build_node(i, set, sort_proc, mover, level.to_i + 1){|x, level| yield(x, level)})
+              }
+            end
+          end
+          result
+        end
       end
     end
   end

data/nested_set.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{nested_set}
-  s.version = "1.5.3"
+  s.version = "1.5.4"
 
   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-11-10}
+  s.date = %q{2010-11-12}
   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/helper_test.rb

@@ -35,6 +35,42 @@ module CollectiveIdea
           assert_equal expected, actual
         end
 
+        def test_build_node
+          set = categories(:top_level).self_and_descendants
+          expected = set.map{|i| [i.name, i.id]}
+          actual = build_node(set[0], set, lambda(&:lft)){|i, level| i.name }
+          assert_equal expected, actual
+        end
+
+        def test_build_node_with_back_id_order
+          set = categories(:top_level).self_and_descendants
+          expected = [
+            ["Top Level", 1],
+            ["Child 3", 5],
+            ["Child 2", 3],
+            ["Child 2.1", 4],
+            ["Child 1", 2]
+          ]
+          actual = build_node(set[0], set, lambda{|x| -x.id}){|i, level| i.name }
+          assert_equal expected, actual
+        end
+
+        def test_sorted_nested_set
+          expected = [
+            [" Top Level 2", 6],
+            [" Top Level", 1],
+            ['- Child 3', 5],
+            ['- Child 2', 3],
+            ['-- Child 2.1', 4],
+            ["- Child 1", 2]
+          ]
+
+          actual = sorted_nested_set_options(Category, lambda{|x| -x.id}) do |c, level|
+            "#{'-' * level} #{c.name}"
+          end
+          assert_equal expected, actual
+        end
+
       end
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 3
-  version: 1.5.3
+  - 4
+  version: 1.5.4
 platform: ruby
 authors: 
 - Brandon Keepers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-10 00:00:00 +03:00
+date: 2010-11-12 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency