0
@@ -213,7 +213,7 @@
0
     # ==== Returns
0
     # String:: The request URI.
0
     def uri
0
-      @env['REQUEST_URI'] || @env['REQUEST_PATH']
0
+      @env['REQUEST_PATH'] || @env['REQUEST_URI']
0
     end
0
 
0
     # ==== Returns

0
@@ -1 +1,5 @@
0
+Dir["#{File.dirname(__FILE__)}/*.rake"].each { |ext| load ext }
0
+
0
+# Load any app level custom rakefile extensions
0
+Dir["#{Merb.root}/lib/tasks/**/*.rake"].sort.each { |ext| load ext }

0
@@ -1 +1,17 @@
0
+desc "Print out the named and anonymous routes"
0
+task :routes => :merb_env do
0
+  seen = []
0
+  unless Merb::Router.named_routes.empty?
0
+    puts "Named Routes"
0
+    Merb::Router.named_routes.each do |name,route|
0
+      puts "  #{name}: #{route}"
0
+      seen << route
0
+    end
0
+  end
0
+  puts "Anonymous Routes"
0
+  (Merb::Router.routes - seen).each do |route|
0
+    puts "  #{route}"
0
+  end
0
+  nil
0
+end