Routing work for #87.

config/routes.rb

@@ -60,23 +60,21 @@
     resources :fields
   end
 
+  match 'content/' => 'feeds#index'
   resources :feeds do
     resources :submissions, :only => [:index, :show, :update]
   end
 
-  #map.resources :feeds do |feeds|
-  #  feeds.resources :submissions
-  #end
-
-  resources :contents, :path => "content" do
+  resources :contents, :except => [:index], :path => "content" do
     get :display, :on => :member
   end
 
-  resources :graphics, :controller => :contents, :path => "content" do
+  # TODO(bamnet): Figure out if these routes mean anything.
+  resources :graphics, :controller => :contents, :except => [:index], :path => "content" do
     get :display, :on => :member
   end
 
-  resources :tickers, :controller => :contents, :path => "content"
+  resources :tickers, :controller => :contents, :except => [:index], :path => "content"
 
   #Set a non-restul route to the dashboard
   match 'dashboard/' => 'dashboard#index'

test/integration/routes_test.rb

@@ -4,7 +4,7 @@ class RoutesTest < ActionController::IntegrationTest
   fixtures :all
 
   test "non plural content route" do
-    assert_recognizes({:controller => 'contents', :action => 'index'}, "content")
+    assert_recognizes({:controller => 'feeds', :action => 'index'}, "content")
 
     # A backup way to test this
     #assert_equal "/content", contents_path