0
@@ -98,9 +98,17 @@ class PagesDB
0
     opts = Hash === args.last ? args.pop : {}
0
     find_all = args.include? :all
0
 
0
-    dir = opts.has_key?(:in_directory) ? opts.delete(:in_directory) : nil
0
-    if dir && !@db.has_key?(dir)
0
-      raise RuntimeError, "unknown directory '#{dir}'"
0
+    search = if (dir = opts.delete(:in_directory))
0
+      strategy = if opts.delete(:recursive)
0
+        lambda { |key| key =~ /^#{Regexp.escape(dir)}(?:\/|$)/ }
0
+      else
0
+        lambda { |key| key == dir }
0
+      end
0
+      matching_keys = @db.keys.select(&strategy)
0
+      raise RuntimeError, "unknown directory '#{dir}'" if matching_keys.empty?
0
+      matching_keys.map { |key| @db[key] }.flatten
0
+    else
0
+      self
0
     end
0
 
0
     block ||= lambda do |page|
0
@@ -111,18 +119,17 @@ class PagesDB
0
       end
0
       found
0
     end
0
-
0
+    
0
     ary = []
0
-    search = dir ? @db[dir] : self
0
     search.each do |page|
0
       if block.call(page)
0
         ary << page
0
         break unless find_all
0
       end
0
     end
0
-
0
+    
0
     return ary if find_all
0
-    return ary.first 
0
+    return ary.first
0
   end
0
 
0
   # call-seq: