julik-make_like_a_tree 1.0.2 → 1.0.3

data/README.txt

@@ -59,7 +59,11 @@ Add a bare init file to your app and there:
   require 'make_like_tree'
   Julik::MakeLikeTree.bootstrap!
 
-That way you can keep the plugin in gems. Or just vendorize it, it has a built-in init.rb
+Or just vendorize it, it has a built-in init.rb. You can also use the
+plugin without unpacking it, to do so put the following in the config:
+
+  config.gem "make_like_a_tree"
+  config.after_initialize { Julik::MakeLikeTree.bootstrap! }
 
 == LICENSE:
 

data/lib/make_like_a_tree.rb

@@ -3,7 +3,7 @@ module Julik
     class ImpossibleReparent < RuntimeError
     end
     
-    VERSION = '1.0.2'
+    VERSION = '1.0.3'
     def self.included(base) #:nodoc:
       super
       base.extend(ClassMethods)
@@ -44,6 +44,7 @@ module Julik
         
         after_create :apply_parenting_after_create
         
+        
        # before_update :register_parent_id_before_update, :unless => :new_record?
       #  after_update :replant_after_update
         
@@ -300,21 +301,34 @@ module Julik
       end
       alias_method :children_count, :child_count
       
-      # Shortcut to determine if our left and right values allow for possible children
+      # Shortcut to determine if our left and right values allow for possible children.
+      # Note the difference in wording between might_have and has - if this method returns false,
+      # it means you should look no further. If it returns true, you should really examine
+      # the children to be sure
       def might_have_children?
         (self[right_col_name] - self[left_col_name]) > 1
       end
       
       # Returns a set of itself and all of its nested children
-      def full_set
+      def full_set(extras = {})
         [self] + all_children
       end
       alias_method :all_children_and_self, :full_set
 
       # Returns a set of all of its children and nested children
-      def all_children
+      def all_children(extras = {})
         return [] unless might_have_children? # optimization shortcut
-        self.class.find(:all, :conditions => conditions_for_all_children, :order => "#{left_col_name} ASC")
+        self.class.scoped(scope_hash_for_branch).find(:all, extras)
+      end
+      
+      # Returns scoping options suitable for fetching all children
+      def scope_hash_for_branch
+        {:conditions => conditions_for_all_children, :order => "#{left_col_name} ASC" }
+      end
+      
+      # Returns scopint options suitable for fetching direct children
+      def scope_hash_for_direct_children
+        {:conditions => "#{scope_condition} AND #{parent_column} = #{self.id}", :order => "#{left_col_name} ASC"}
       end
       
       # Get conditions for direct and indirect children of this record
@@ -340,12 +354,9 @@ module Julik
       end
       
       # Returns a set of only this entry's immediate children, also ordered by position
-      def direct_children
+      def direct_children(extras = {})
         return [] unless might_have_children? # optimize!
-        self.class.find(:all, 
-          :conditions => "#{scope_condition} AND #{parent_column} = #{self.id}",
-          :order => 'lft ASC'
-        )
+        self.class.scoped(scope_hash_for_direct_children).find(:all, extras)
       end
       
       # Make this item a root node

data/test/test_ordered_tree.rb

@@ -321,6 +321,30 @@ context "A Node used with OrderedTree should" do
     child.add_child(root).should.equal false
   end
   
+  specify "support additional find options via scoped finds on all_children" do
+    root = emit :name => "foo"
+    child = emit :name => "bar", :parent_id => root.id
+    another_child = emit :name => "another", :parent_id => root.id
+    
+    reload(root)
+
+    root.all_children.should.equal [child, another_child]
+    root.all_children(:conditions => {:name => "another"}).should.equal [another_child]
+  end
+  
+  specify "support additional find options via scoped finds on direct_children" do
+    root = emit :name => "foo"
+    anoter_root = emit :name => "another"
+    
+    child = emit :name => "bar", :parent_id => root.id
+    another_child = emit :name => "another", :parent_id => root.id
+    
+    reload(root)
+
+    root.direct_children.should.equal [child, another_child]
+    root.direct_children(:conditions => {:name => "another"}).should.equal [another_child]
+  end
+  
   specify "support promote_to_root" do
     a, b = emit_many(2)
     c = emit(:name => "Subtree", :parent_id => a.id)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: julik-make_like_a_tree
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Julik