chrislloyd-awesome_nested_set 1.1.2 → 1.1.3

data/lib/awesome_nested_set.rb

@@ -79,6 +79,8 @@ module CollectiveIdea #:nodoc:
                           
           before_create :set_default_left_and_right
           before_destroy :prune_from_tree
+          
+          belongs_to :parent, :class_name => name
                           
           # no assignment to structure fields
           [left_column_name, right_column_name, parent_column_name].each do |column|
@@ -290,8 +292,9 @@ module CollectiveIdea #:nodoc:
         # Returns the array of all parents and self
         def self_and_ancestors
           nested_set_scope.scoped :conditions => [
-            "#{self.class.table_name}.#{quoted_left_column_name} <= ? AND #{self.class.table_name}.#{quoted_right_column_name} >= ?", left, right
-          ]
+              "#{self.class.table_name}.#{quoted_left_column_name} <= ? AND #{self.class.table_name}.#{quoted_right_column_name} >= ?", left, right
+            ],
+            :order => "#{self.class.table_name}.#{quoted_left_column_name} DESC"
         end
         alias_method :lineage, :self_and_ancestors
 
@@ -304,6 +307,7 @@ module CollectiveIdea #:nodoc:
         def self_and_siblings
           nested_set_scope.scoped :conditions => {parent_column_name => parent_id}
         end
+        alias_method :generation, :self_and_siblings
 
         # Returns the array of all children of the parent, except self
         def siblings

data/lib/awesome_nested_set/helper.rb

@@ -49,7 +49,7 @@ module CollectiveIdea #:nodoc:
           return content if item_or_items.empty?
           
           item_or_items.each do |i|
-            minor_content = yield(i) + format_nested_set(i.children, options, &block)
+            minor_content = capture(i, &block) + format_nested_set(i.children, options, &block)
             content << if options[:minor][:tag]
               content_tag(options[:minor][:tag], minor_content, :class => options[:minor][:class])
             else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chrislloyd-awesome_nested_set
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors: 
 - Collective Idea
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-27 00:00:00 -08:00
+date: 2009-03-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency