cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix routing of RSS feeds

Browse source
This commit is contained in:
Tom Hughes 2013-09-23 11:05:35 +01:00
parent 5208b7e3af
commit 57219d516a
3 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
config/routes.rb
View file

@ -162,8 +162,8 @@ OpenStreetMap::Application.routes.draw do
match '/user/:display_name/traces/tag/:tag' => 'trace#list', :via => :get match '/user/:display_name/traces/tag/:tag' => 'trace#list', :via => :get
match '/user/:display_name/traces/page/:page' => 'trace#list', :via => :get match '/user/:display_name/traces/page/:page' => 'trace#list', :via => :get
match '/user/:display_name/traces' => 'trace#list', :via => :get match '/user/:display_name/traces' => 'trace#list', :via => :get
match '/user/:display_name/traces/tag/:tag/rss' => 'trace#georss', :via => :get, :format => :rss match '/user/:display_name/traces/tag/:tag/rss' => 'trace#georss', :via => :get, :defaults => { :format => :rss }
match '/user/:display_name/traces/rss' => 'trace#georss', :via => :get, :format => :rss match '/user/:display_name/traces/rss' => 'trace#georss', :via => :get, :defaults => { :format => :rss }
match '/user/:display_name/traces/:id' => 'trace#view', :via => :get match '/user/:display_name/traces/:id' => 'trace#view', :via => :get
match '/user/:display_name/traces/:id/picture' => 'trace#picture', :via => :get match '/user/:display_name/traces/:id/picture' => 'trace#picture', :via => :get
match '/user/:display_name/traces/:id/icon' => 'trace#icon', :via => :get match '/user/:display_name/traces/:id/icon' => 'trace#icon', :via => :get
@ -171,8 +171,8 @@ OpenStreetMap::Application.routes.draw do
match '/traces/tag/:tag' => 'trace#list', :via => :get match '/traces/tag/:tag' => 'trace#list', :via => :get
match '/traces/page/:page' => 'trace#list', :via => :get match '/traces/page/:page' => 'trace#list', :via => :get
match '/traces' => 'trace#list', :via => :get match '/traces' => 'trace#list', :via => :get
match '/traces/tag/:tag/rss' => 'trace#georss', :via => :get, :format => :rss match '/traces/tag/:tag/rss' => 'trace#georss', :via => :get, :defaults => { :format => :rss }
match '/traces/rss' => 'trace#georss', :via => :get, :format => :rss match '/traces/rss' => 'trace#georss', :via => :get, :defaults => { :format => :rss }
match '/traces/mine/tag/:tag/page/:page' => 'trace#mine', :via => :get match '/traces/mine/tag/:tag/page/:page' => 'trace#mine', :via => :get
match '/traces/mine/tag/:tag' => 'trace#mine', :via => :get match '/traces/mine/tag/:tag' => 'trace#mine', :via => :get
match '/traces/mine/page/:page' => 'trace#mine', :via => :get match '/traces/mine/page/:page' => 'trace#mine', :via => :get
@ -186,9 +186,9 @@ OpenStreetMap::Application.routes.draw do
match '/diary/new' => 'diary_entry#new', :via => [:get, :post] match '/diary/new' => 'diary_entry#new', :via => [:get, :post]
match '/diary/friends' => 'diary_entry#list', :friends => true, :via => :get, :as => "friend_diaries" match '/diary/friends' => 'diary_entry#list', :friends => true, :via => :get, :as => "friend_diaries"
match '/diary/nearby' => 'diary_entry#list', :nearby => true, :via => :get, :as => "nearby_diaries" match '/diary/nearby' => 'diary_entry#list', :nearby => true, :via => :get, :as => "nearby_diaries"
match '/user/:display_name/diary/rss' => 'diary_entry#rss', :via => :get, :format => :rss match '/user/:display_name/diary/rss' => 'diary_entry#rss', :via => :get, :defaults => { :format => :rss }
match '/diary/:language/rss' => 'diary_entry#rss', :via => :get, :format => :rss match '/diary/:language/rss' => 'diary_entry#rss', :via => :get, :defaults => { :format => :rss }
match '/diary/rss' => 'diary_entry#rss', :via => :get, :format => :rss match '/diary/rss' => 'diary_entry#rss', :via => :get, :defaults => { :format => :rss }
match '/user/:display_name/diary/comments/:page' => 'diary_entry#comments', :via => :get, :page => /\d+/ match '/user/:display_name/diary/comments/:page' => 'diary_entry#comments', :via => :get, :page => /\d+/
match '/user/:display_name/diary/comments/' => 'diary_entry#comments', :via => :get match '/user/:display_name/diary/comments/' => 'diary_entry#comments', :via => :get
match '/user/:display_name/diary' => 'diary_entry#list', :via => :get match '/user/:display_name/diary' => 'diary_entry#list', :via => :get

6
test/functional/diary_entry_controller_test.rb
View file

@ -31,15 +31,15 @@ class DiaryEntryControllerTest < ActionController::TestCase
assert_routing( assert_routing(
{ :path => "/diary/rss", :method => :get }, { :path => "/diary/rss", :method => :get },
{ :controller => "diary_entry", :action => "rss" } { :controller => "diary_entry", :action => "rss", :format => :rss }
) )
assert_routing( assert_routing(
{ :path => "/diary/language/rss", :method => :get }, { :path => "/diary/language/rss", :method => :get },
{ :controller => "diary_entry", :action => "rss", :language => "language" } { :controller => "diary_entry", :action => "rss", :language => "language", :format => :rss }
) )
assert_routing( assert_routing(
{ :path => "/user/username/diary/rss", :method => :get }, { :path => "/user/username/diary/rss", :method => :get },
{ :controller => "diary_entry", :action => "rss", :display_name => "username" } { :controller => "diary_entry", :action => "rss", :display_name => "username", :format => :rss }
) )
assert_routing( assert_routing(

8
test/functional/trace_controller_test.rb
View file

@ -88,19 +88,19 @@ class TraceControllerTest < ActionController::TestCase
assert_routing( assert_routing(
{ :path => "/traces/rss", :method => :get }, { :path => "/traces/rss", :method => :get },
{ :controller => "trace", :action => "georss" } { :controller => "trace", :action => "georss", :format => :rss }
) )
assert_routing( assert_routing(
{ :path => "/traces/tag/tagname/rss", :method => :get }, { :path => "/traces/tag/tagname/rss", :method => :get },
{ :controller => "trace", :action => "georss", :tag => "tagname" } { :controller => "trace", :action => "georss", :tag => "tagname", :format => :rss }
) )
assert_routing( assert_routing(
{ :path => "/user/username/traces/rss", :method => :get }, { :path => "/user/username/traces/rss", :method => :get },
{ :controller => "trace", :action => "georss", :display_name => "username" } { :controller => "trace", :action => "georss", :display_name => "username", :format => :rss }
) )
assert_routing( assert_routing(
{ :path => "/user/username/traces/tag/tagname/rss", :method => :get }, { :path => "/user/username/traces/tag/tagname/rss", :method => :get },
{ :controller => "trace", :action => "georss", :display_name => "username", :tag => "tagname" } { :controller => "trace", :action => "georss", :display_name => "username", :tag => "tagname", :format => :rss }
) )
assert_routing( assert_routing(