0
@@ -2,6 +2,7 @@ ActionController::Routing::Routes.draw do |map|
0
   map.feed    'feed/*sections', :controller => 'feed', :action => 'feed'
0
 
0
   map.with_options :controller => 'assets', :action => 'show' do |m|
0
+    m.connect ':dir/*path',       :dir => /stylesheets|javascripts|images/
0
     m.css    'stylesheets/*path', :dir => 'stylesheets'
0
     m.js     'javascripts/*path', :dir => 'javascripts'
0
     m.images 'images/*path',      :dir => 'images'
0
@@ -11,8 +12,7 @@ ActionController::Routing::Routes.draw do |map|
0
   
0
   map.admin   'admin', :controller => 'admin/overview', :action => 'index'
0
   
0
-  map.connect ':controller/:action/:id/:version', :version => nil, 
0
-      :controller => /account|(admin\/\w+)/
0
+  map.connect ':controller/:action/:id/:version', :version => nil, :controller => /routing_navigator|account|(admin\/\w+)/
0
   
0
   map.comment ':year/:month/:day/:permalink/comment', :controller => 'comments', :action => 'create',
0
       :year => /\d{4}/, :month => /\d{1,2}/, :day => /\d{1,2}/

0
@@ -14,13 +14,9 @@ class AssetsControllerTest < Test::Unit::TestCase
0
   end
0
 
0
   def test_routing
0
-    with_options :controller => 'assets', :action => 'show' do |test|
0
-      test.assert_routing 'stylesheets/foo/bar', :dir => 'stylesheets', :path => ['foo', 'bar']
0
-      test.assert_routing 'stylesheets/foo.css', :dir => 'stylesheets', :path => ['foo.css']
0
-      test.assert_routing 'images/foo/bar',      :dir => 'images',      :path => ['foo', 'bar']
0
-      test.assert_routing 'images/foo.png' ,     :dir => 'images',      :path => ['foo.png']
0
-      test.assert_routing 'javascripts/foo/bar', :dir => 'javascripts', :path => ['foo', 'bar']
0
-      test.assert_routing 'javascripts/foo.js' , :dir => 'javascripts', :path => ['foo.js']
0
+    {:stylesheets => :css, :images => :png, :javascripts => :js}.each do |dir, ext|
0
+      assert_routing "#{dir}/foo/bar",    :controller => 'assets', :action => 'show', :dir => dir.to_s, :path => %w(foo bar)
0
+      assert_routing "#{dir}/foo.#{ext}", :controller => 'assets', :action => 'show', :dir => dir.to_s, :path => ["foo.#{ext}"]
0
     end
0
   end
0