0
@@ -1,5 +1,7 @@
0
 * SVN *
0
 
0
+* Change child_section and descendent_section methods in the SiteDrop to search the preloaded sections array.
0
+
0
 * Added global mode var to all templates to check what mode you're in: section, single, page, archive, search, tag
0
 
0
 * Remove any notion of a template hierarchy, and the page template itself.  Paged sections now default to the 'single' template.

0
@@ -33,21 +33,18 @@ class SiteDrop < BaseDrop
0
   end
0
 
0
   def find_section(path)
0
-    @section_index ||= {}
0
-    return @section_index[path] if @section_index[path]
0
-    @section_index[path] ||= @current_section_liquid if @current_section && @current_section.path == path
0
-    @section_index[path] ||= @sections.detect { |s| s['path'] == path } if @sections
0
-    @section_index[path] ||= liquify(@source.sections.find_by_path(path)).first
0
+    @section_index ||= sections.inject({}) { |memo, section| memo.update section['path'] => section }
0
+    @section_index[path]
0
   end
0
-  
0
+
0
   def find_child_sections(path)
0
-    path_search = path + (path == '' ? '%' : '/%')
0
-    liquify(*@source.sections.find(:all, :conditions => ['path != ? AND path LIKE ? AND path NOT LIKE ?', path, path_search, "#{path_search}/%"], :order => 'path'))
0
+    path << '/' unless path.empty?
0
+    sections.select { |s| s['path'] != path && s['path'] =~ %r(^#{Regexp.escape path}[^/]+$) }
0
   end
0
   
0
   def find_descendant_sections(path)
0
-    path_search = path + (path == '' ? '%' : '/%')
0
-    liquify(*@source.sections.find(:all, :conditions => ['path != ? AND path LIKE ?', path, path_search], :order => 'path'))
0
+    path << '/' unless path.empty?
0
+    sections.select { |s| s['path'] != path && s['path'] =~ %r(^#{Regexp.escape path}) }
0
   end
0
   
0
   def blog_sections

0
@@ -44,12 +44,12 @@ context "Drop Filters" do
0
 
0
   specify "should find child sections" do
0
     assert_models_equal [sections(:about), sections(:earth), sections(:links)], child_sections('').collect(&:source)
0
-    assert_models_equal [sections(:africa), sections(:europe)], child_sections('earth').collect(&:source)
0
+    assert_models_equal [sections(:europe), sections(:africa)], child_sections('earth').collect(&:source)
0
   end
0
 
0
   specify "should find descendant sections" do
0
-    assert_models_equal sites(:first).sections.reject(&:home?).sort_by(&:path), descendant_sections('').collect(&:source)
0
-    assert_models_equal [sections(:africa), sections(:europe), sections(:bucharest)], descendant_sections('earth').collect(&:source)
0
+    assert_models_equal sites(:first).sections.reject(&:home?), descendant_sections('').collect(&:source)
0
+    assert_models_equal [sections(:europe), sections(:africa), sections(:bucharest)], descendant_sections('earth').collect(&:source)
0
   end
0
 
0
   specify "should find articles by month" do