Update rack-test and patch test issues

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 92bc493e12171cb78f4fd0c6ab6f67be0466e3ec..98bb332f23cb01bba04f2a149695b16e82bbeb67 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,186 +1,294 @@
-ActionController::Routing::Routes.draw do |map|
-
+OpenStreetMap::Application.routes.draw do

   # API
   # API

-  map.connect "api/capabilities", :controller => 'api', :action => 'capabilities'
-  map.connect "api/#{API_VERSION}/capabilities", :controller => 'api', :action => 'capabilities'
-
-  map.connect "api/#{API_VERSION}/changeset/create", :controller => 'changeset', :action => 'create'
-  map.connect "api/#{API_VERSION}/changeset/:id/upload", :controller => 'changeset', :action => 'upload', :id => /\d+/
-  map.connect "api/#{API_VERSION}/changeset/:id/download", :controller => 'changeset', :action => 'download', :id => /\d+/
-  map.connect "api/#{API_VERSION}/changeset/:id/expand_bbox", :controller => 'changeset', :action => 'expand_bbox', :id => /\d+/
-  map.connect "api/#{API_VERSION}/changeset/:id", :controller => 'changeset', :action => 'read', :id => /\d+/, :conditions => { :method => :get }
-  map.connect "api/#{API_VERSION}/changeset/:id", :controller => 'changeset', :action => 'update', :id => /\d+/, :conditions => { :method => :put }
-  map.connect "api/#{API_VERSION}/changeset/:id/close", :controller => 'changeset', :action => 'close', :id =>/\d+/
-  map.connect "api/#{API_VERSION}/changesets", :controller => 'changeset', :action => 'query'
-  
-  map.connect "api/#{API_VERSION}/node/create", :controller => 'node', :action => 'create'
-  map.connect "api/#{API_VERSION}/node/:id/ways", :controller => 'way', :action => 'ways_for_node', :id => /\d+/
-  map.connect "api/#{API_VERSION}/node/:id/relations", :controller => 'relation', :action => 'relations_for_node', :id => /\d+/
-  map.connect "api/#{API_VERSION}/node/:id/history", :controller => 'old_node', :action => 'history', :id => /\d+/
-  map.connect "api/#{API_VERSION}/node/:id/:version", :controller => 'old_node', :action => 'version', :id => /\d+/, :version => /\d+/
-  map.connect "api/#{API_VERSION}/node/:id", :controller => 'node', :action => 'read', :id => /\d+/, :conditions => { :method => :get }
-  map.connect "api/#{API_VERSION}/node/:id", :controller => 'node', :action => 'update', :id => /\d+/, :conditions => { :method => :put }
-  map.connect "api/#{API_VERSION}/node/:id", :controller => 'node', :action => 'delete', :id => /\d+/, :conditions => { :method => :delete }
-  map.connect "api/#{API_VERSION}/nodes", :controller => 'node', :action => 'nodes', :id => nil
-  
-  map.connect "api/#{API_VERSION}/way/create", :controller => 'way', :action => 'create'
-  map.connect "api/#{API_VERSION}/way/:id/history", :controller => 'old_way', :action => 'history', :id => /\d+/
-  map.connect "api/#{API_VERSION}/way/:id/full", :controller => 'way', :action => 'full', :id => /\d+/
-  map.connect "api/#{API_VERSION}/way/:id/relations", :controller => 'relation', :action => 'relations_for_way', :id => /\d+/
-  map.connect "api/#{API_VERSION}/way/:id/:version", :controller => 'old_way', :action => 'version', :id => /\d+/, :version => /\d+/
-  map.connect "api/#{API_VERSION}/way/:id", :controller => 'way', :action => 'read', :id => /\d+/, :conditions => { :method => :get }
-  map.connect "api/#{API_VERSION}/way/:id", :controller => 'way', :action => 'update', :id => /\d+/, :conditions => { :method => :put }
-  map.connect "api/#{API_VERSION}/way/:id", :controller => 'way', :action => 'delete', :id => /\d+/, :conditions => { :method => :delete }
-  map.connect "api/#{API_VERSION}/ways", :controller => 'way', :action => 'ways', :id => nil
-
-  map.connect "api/#{API_VERSION}/relation/create", :controller => 'relation', :action => 'create'
-  map.connect "api/#{API_VERSION}/relation/:id/relations", :controller => 'relation', :action => 'relations_for_relation', :id => /\d+/
-  map.connect "api/#{API_VERSION}/relation/:id/history", :controller => 'old_relation', :action => 'history', :id => /\d+/
-  map.connect "api/#{API_VERSION}/relation/:id/full", :controller => 'relation', :action => 'full', :id => /\d+/
-  map.connect "api/#{API_VERSION}/relation/:id/:version", :controller => 'old_relation', :action => 'version', :id => /\d+/, :version => /\d+/
-  map.connect "api/#{API_VERSION}/relation/:id", :controller => 'relation', :action => 'read', :id => /\d+/, :conditions => { :method => :get }
-  map.connect "api/#{API_VERSION}/relation/:id", :controller => 'relation', :action => 'update', :id => /\d+/, :conditions => { :method => :put }
-  map.connect "api/#{API_VERSION}/relation/:id", :controller => 'relation', :action => 'delete', :id => /\d+/, :conditions => { :method => :delete }
-  map.connect "api/#{API_VERSION}/relations", :controller => 'relation', :action => 'relations', :id => nil
-
-  map.connect "api/#{API_VERSION}/map", :controller => 'api', :action => 'map'
-  
-  map.connect "api/#{API_VERSION}/trackpoints", :controller => 'api', :action => 'trackpoints'
-
-  map.connect "api/#{API_VERSION}/changes", :controller => 'api', :action => 'changes'
-  
-  map.connect "api/#{API_VERSION}/search", :controller => 'search', :action => 'search_all'
-  map.connect "api/#{API_VERSION}/ways/search", :controller => 'search', :action => 'search_ways'
-  map.connect "api/#{API_VERSION}/relations/search", :controller => 'search', :action => 'search_relations'
-  map.connect "api/#{API_VERSION}/nodes/search", :controller => 'search', :action => 'search_nodes'
-  
-  map.connect "api/#{API_VERSION}/user/details", :controller => 'user', :action => 'api_details'
-  map.connect "api/#{API_VERSION}/user/preferences", :controller => 'user_preference', :action => 'read', :conditions => { :method => :get }
-  map.connect "api/#{API_VERSION}/user/preferences/:preference_key", :controller => 'user_preference', :action => 'read_one', :conditions => { :method => :get }
-  map.connect "api/#{API_VERSION}/user/preferences", :controller => 'user_preference', :action => 'update', :conditions => { :method => :put }
-  map.connect "api/#{API_VERSION}/user/preferences/:preference_key", :controller => 'user_preference', :action => 'update_one', :conditions => { :method => :put }
-  map.connect "api/#{API_VERSION}/user/preferences/:preference_key", :controller => 'user_preference', :action => 'delete_one', :conditions => { :method => :delete }
-  map.connect "api/#{API_VERSION}/user/gpx_files", :controller => 'user', :action => 'api_gpx_files'
- 
-  map.connect "api/#{API_VERSION}/gpx/create", :controller => 'trace', :action => 'api_create'
-  map.connect "api/#{API_VERSION}/gpx/:id/details", :controller => 'trace', :action => 'api_details'
-  map.connect "api/#{API_VERSION}/gpx/:id/data", :controller => 'trace', :action => 'api_data'
-  
+  match "api/capabilities" => "api#capabilities", :via => :get
+  match "api/0.6/capabilities" => "api#capabilities", :via => :get
+  match "api/0.6/permissions" => "api#permissions", :via => :get
+
+  match "api/0.6/changeset/create" => "changeset#create", :via => :put
+  match "api/0.6/changeset/:id/upload" => "changeset#upload", :via => :post, :id => /\d+/
+  match "api/0.6/changeset/:id/download" => "changeset#download", :via => :get, :as => :changeset_download, :id => /\d+/
+  match "api/0.6/changeset/:id/expand_bbox" => "changeset#expand_bbox", :via => :post, :id => /\d+/
+  match "api/0.6/changeset/:id" => "changeset#read", :via => :get, :as => :changeset_read, :id => /\d+/
+  match "api/0.6/changeset/:id/subscribe" => "changeset#subscribe", :via => :post, :as => :changeset_subscribe, :id => /\d+/
+  match "api/0.6/changeset/:id/unsubscribe" => "changeset#unsubscribe", :via => :post, :as => :changeset_unsubscribe, :id => /\d+/
+  match "api/0.6/changeset/:id" => "changeset#update", :via => :put, :id => /\d+/
+  match "api/0.6/changeset/:id/close" => "changeset#close", :via => :put, :id => /\d+/
+  match "api/0.6/changesets" => "changeset#query", :via => :get
+  post "api/0.6/changeset/:id/comment" => "changeset#comment", :as => :changeset_comment, :id => /\d+/
+  post "api/0.6/changeset/comment/:id/hide" => "changeset#hide_comment", :as => :changeset_comment_hide, :id => /\d+/
+  post "api/0.6/changeset/comment/:id/unhide" => "changeset#unhide_comment", :as => :changeset_comment_unhide, :id => /\d+/
+
+  match "api/0.6/node/create" => "node#create", :via => :put
+  match "api/0.6/node/:id/ways" => "way#ways_for_node", :via => :get, :id => /\d+/
+  match "api/0.6/node/:id/relations" => "relation#relations_for_node", :via => :get, :id => /\d+/
+  match "api/0.6/node/:id/history" => "old_node#history", :via => :get, :id => /\d+/
+  match "api/0.6/node/:id/:version/redact" => "old_node#redact", :via => :post, :version => /\d+/, :id => /\d+/
+  match "api/0.6/node/:id/:version" => "old_node#version", :via => :get, :id => /\d+/, :version => /\d+/
+  match "api/0.6/node/:id" => "node#read", :via => :get, :id => /\d+/
+  match "api/0.6/node/:id" => "node#update", :via => :put, :id => /\d+/
+  match "api/0.6/node/:id" => "node#delete", :via => :delete, :id => /\d+/
+  match "api/0.6/nodes" => "node#nodes", :via => :get
+
+  match "api/0.6/way/create" => "way#create", :via => :put
+  match "api/0.6/way/:id/history" => "old_way#history", :via => :get, :id => /\d+/
+  match "api/0.6/way/:id/full" => "way#full", :via => :get, :id => /\d+/
+  match "api/0.6/way/:id/relations" => "relation#relations_for_way", :via => :get, :id => /\d+/
+  match "api/0.6/way/:id/:version/redact" => "old_way#redact", :via => :post, :version => /\d+/, :id => /\d+/
+  match "api/0.6/way/:id/:version" => "old_way#version", :via => :get, :id => /\d+/, :version => /\d+/
+  match "api/0.6/way/:id" => "way#read", :via => :get, :id => /\d+/
+  match "api/0.6/way/:id" => "way#update", :via => :put, :id => /\d+/
+  match "api/0.6/way/:id" => "way#delete", :via => :delete, :id => /\d+/
+  match "api/0.6/ways" => "way#ways", :via => :get
+
+  match "api/0.6/relation/create" => "relation#create", :via => :put
+  match "api/0.6/relation/:id/relations" => "relation#relations_for_relation", :via => :get, :id => /\d+/
+  match "api/0.6/relation/:id/history" => "old_relation#history", :via => :get, :id => /\d+/
+  match "api/0.6/relation/:id/full" => "relation#full", :via => :get, :id => /\d+/
+  match "api/0.6/relation/:id/:version/redact" => "old_relation#redact", :via => :post, :version => /\d+/, :id => /\d+/
+  match "api/0.6/relation/:id/:version" => "old_relation#version", :via => :get, :id => /\d+/, :version => /\d+/
+  match "api/0.6/relation/:id" => "relation#read", :via => :get, :id => /\d+/
+  match "api/0.6/relation/:id" => "relation#update", :via => :put, :id => /\d+/
+  match "api/0.6/relation/:id" => "relation#delete", :via => :delete, :id => /\d+/
+  match "api/0.6/relations" => "relation#relations", :via => :get
+
+  match "api/0.6/map" => "api#map", :via => :get
+
+  match "api/0.6/trackpoints" => "api#trackpoints", :via => :get
+
+  match "api/0.6/changes" => "api#changes", :via => :get
+
+  match "api/0.6/search" => "search#search_all", :via => :get
+  match "api/0.6/ways/search" => "search#search_ways", :via => :get
+  match "api/0.6/relations/search" => "search#search_relations", :via => :get
+  match "api/0.6/nodes/search" => "search#search_nodes", :via => :get
+
+  match "api/0.6/user/:id" => "user#api_read", :via => :get, :id => /\d+/
+  match "api/0.6/user/details" => "user#api_details", :via => :get
+  match "api/0.6/user/gpx_files" => "user#api_gpx_files", :via => :get
+
+  match "api/0.6/user/preferences" => "user_preference#read", :via => :get
+  match "api/0.6/user/preferences/:preference_key" => "user_preference#read_one", :via => :get
+  match "api/0.6/user/preferences" => "user_preference#update", :via => :put
+  match "api/0.6/user/preferences/:preference_key" => "user_preference#update_one", :via => :put
+  match "api/0.6/user/preferences/:preference_key" => "user_preference#delete_one", :via => :delete
+
+  match "api/0.6/gpx/create" => "trace#api_create", :via => :post
+  match "api/0.6/gpx/:id" => "trace#api_read", :via => :get, :id => /\d+/
+  match "api/0.6/gpx/:id" => "trace#api_update", :via => :put, :id => /\d+/
+  match "api/0.6/gpx/:id" => "trace#api_delete", :via => :delete, :id => /\d+/
+  match "api/0.6/gpx/:id/details" => "trace#api_read", :via => :get, :id => /\d+/
+  match "api/0.6/gpx/:id/data" => "trace#api_data", :via => :get
+

   # AMF (ActionScript) API
   # AMF (ActionScript) API

-  
-  map.connect "api/#{API_VERSION}/amf/read", :controller =>'amf', :action =>'amf_read'
-  map.connect "api/#{API_VERSION}/amf/write", :controller =>'amf', :action =>'amf_write'
-  map.connect "api/#{API_VERSION}/swf/trackpoints", :controller =>'swf', :action =>'trackpoints'
-  
+  match "api/0.6/amf/read" => "amf#amf_read", :via => :post
+  match "api/0.6/amf/write" => "amf#amf_write", :via => :post
+  match "api/0.6/swf/trackpoints" => "swf#trackpoints", :via => :get
+
+  # Map notes API
+  scope "api/0.6" do
+    resources :notes, :except => [:new, :edit, :update], :constraints => { :id => /\d+/ }, :defaults => { :format => "xml" } do
+      collection do
+        get "search"
+        get "feed", :defaults => { :format => "rss" }
+      end
+
+      member do
+        post "comment"
+        post "close"
+        post "reopen"
+      end
+    end
+
+    match "notes/addPOIexec" => "notes#create", :via => :post
+    match "notes/closePOIexec" => "notes#close", :via => :post
+    match "notes/editPOIexec" => "notes#comment", :via => :post
+    match "notes/getGPX" => "notes#index", :via => :get, :format => "gpx"
+    match "notes/getRSSfeed" => "notes#feed", :via => :get, :format => "rss"
+  end
+

   # Data browsing
   # Data browsing

-  map.connect '/browse', :controller => 'changeset', :action => 'list'
-  map.connect '/browse/start', :controller => 'browse', :action => 'start'
-  map.connect '/browse/way/:id', :controller => 'browse', :action => 'way', :id => /\d+/
-  map.connect '/browse/way/:id/history', :controller => 'browse', :action => 'way_history', :id => /\d+/
-  map.connect '/browse/node/:id', :controller => 'browse', :action => 'node', :id => /\d+/
-  map.connect '/browse/node/:id/history', :controller => 'browse', :action => 'node_history', :id => /\d+/
-  map.connect '/browse/relation/:id', :controller => 'browse', :action => 'relation', :id => /\d+/
-  map.connect '/browse/relation/:id/history', :controller => 'browse', :action => 'relation_history', :id => /\d+/
-  map.connect '/browse/changeset/:id', :controller => 'browse', :action => 'changeset', :id => /\d+/
-  map.connect '/browse/changesets', :controller => 'changeset', :action => 'list'
-  
+  match "/way/:id" => "browse#way", :via => :get, :id => /\d+/, :as => :way
+  match "/way/:id/history" => "browse#way_history", :via => :get, :id => /\d+/
+  match "/node/:id" => "browse#node", :via => :get, :id => /\d+/, :as => :node
+  match "/node/:id/history" => "browse#node_history", :via => :get, :id => /\d+/
+  match "/relation/:id" => "browse#relation", :via => :get, :id => /\d+/, :as => :relation
+  match "/relation/:id/history" => "browse#relation_history", :via => :get, :id => /\d+/
+  match "/changeset/:id" => "browse#changeset", :via => :get, :as => :changeset, :id => /\d+/
+  match "/changeset/:id/comments/feed" => "changeset#comments_feed", :via => :get, :as => :changeset_comments_feed, :id => /\d*/, :defaults => { :format => "rss" }
+  match "/note/:id" => "browse#note", :via => :get, :id => /\d+/, :as => "browse_note"
+  match "/note/new" => "browse#new_note", :via => :get
+  match "/user/:display_name/history" => "changeset#list", :via => :get
+  match "/user/:display_name/history/feed" => "changeset#feed", :via => :get, :defaults => { :format => :atom }
+  match "/user/:display_name/notes" => "notes#mine", :via => :get
+  match "/history/friends" => "changeset#list", :via => :get, :friends => true, :as => "friend_changesets", :defaults => { :format => :html }
+  match "/history/nearby" => "changeset#list", :via => :get, :nearby => true, :as => "nearby_changesets", :defaults => { :format => :html }
+
+  get "/browse/way/:id",                :to => redirect(:path => "/way/%{id}")
+  get "/browse/way/:id/history",        :to => redirect(:path => "/way/%{id}/history")
+  get "/browse/node/:id",               :to => redirect(:path => "/node/%{id}")
+  get "/browse/node/:id/history",       :to => redirect(:path => "/node/%{id}/history")
+  get "/browse/relation/:id",           :to => redirect(:path => "/relation/%{id}")
+  get "/browse/relation/:id/history",   :to => redirect(:path => "/relation/%{id}/history")
+  get "/browse/changeset/:id",          :to => redirect(:path => "/changeset/%{id}")
+  get "/browse/note/:id",               :to => redirect(:path => "/note/%{id}")
+  get "/user/:display_name/edits",      :to => redirect(:path => "/user/%{display_name}/history")
+  get "/user/:display_name/edits/feed", :to => redirect(:path => "/user/%{display_name}/history/feed")
+  get "/browse/friends",                :to => redirect(:path => "/history/friends")
+  get "/browse/nearby",                 :to => redirect(:path => "/history/nearby")
+  get "/browse/changesets/feed",        :to => redirect(:path => "/history/feed")
+  get "/browse/changesets",             :to => redirect(:path => "/history")
+  get "/browse",                        :to => redirect(:path => "/history")
+

   # web site
   # web site

-  map.root :controller => 'site', :action => 'index'
-  map.connect '/', :controller => 'site', :action => 'index'
-  map.connect '/edit', :controller => 'site', :action => 'edit'
-  map.connect '/history', :controller => 'changeset', :action => 'list_bbox'
-  map.connect '/export', :controller => 'site', :action => 'export'
-  map.connect '/login', :controller => 'user', :action => 'login'
-  map.connect '/logout', :controller => 'user', :action => 'logout'
-  map.connect '/offline', :controller => 'site', :action => 'offline'
-  map.connect '/user/new', :controller => 'user', :action => 'new'
-  map.connect '/user/save', :controller => 'user', :action => 'save'
-  map.connect '/user/confirm', :controller => 'user', :action => 'confirm'
-  map.connect '/user/confirm-email', :controller => 'user', :action => 'confirm_email'
-  map.connect '/user/go_public', :controller => 'user', :action => 'go_public'
-  map.connect '/user/reset-password', :controller => 'user', :action => 'reset_password'
-  map.connect '/user/upload-image', :controller => 'user', :action => 'upload_image'
-  map.connect '/user/delete-image', :controller => 'user', :action => 'delete_image'
-  map.connect '/user/forgot-password', :controller => 'user', :action => 'lost_password'
-
-  map.connect '/index.html', :controller => 'site', :action => 'index'
-  map.connect '/edit.html', :controller => 'site', :action => 'edit'
-  map.connect '/history.html', :controller => 'changeset', :action => 'list_bbox'
-  map.connect '/export.html', :controller => 'site', :action => 'export'
-  map.connect '/search.html', :controller => 'way_tag', :action => 'search'
-  map.connect '/login.html', :controller => 'user', :action => 'login'
-  map.connect '/logout.html', :controller => 'user', :action => 'logout'
-  map.connect '/create-account.html', :controller => 'user', :action => 'new'
-  map.connect '/forgot-password.html', :controller => 'user', :action => 'lost_password'
-
-  # traces  
-  map.connect '/traces', :controller => 'trace', :action => 'list'
-  map.connect '/traces/page/:page', :controller => 'trace', :action => 'list'
-  map.connect '/traces/rss', :controller => 'trace', :action => 'georss'
-  map.connect '/traces/tag/:tag', :controller => 'trace', :action => 'list'
-  map.connect '/traces/tag/:tag/page/:page', :controller => 'trace', :action => 'list'
-  map.connect '/traces/tag/:tag/rss', :controller => 'trace', :action => 'georss'
-  map.connect '/traces/mine', :controller => 'trace', :action => 'mine'
-  map.connect '/traces/mine/page/:page', :controller => 'trace', :action => 'mine'
-  map.connect '/traces/mine/tag/:tag', :controller => 'trace', :action => 'mine'
-  map.connect '/traces/mine/tag/:tag/page/:page', :controller => 'trace', :action => 'mine'
-  map.connect '/trace/create', :controller => 'trace', :action => 'create'
-  map.connect '/trace/:id/data', :controller => 'trace', :action => 'data'
-  map.connect '/trace/:id/data.:format', :controller => 'trace', :action => 'data'
-  map.connect '/trace/:id/edit', :controller => 'trace', :action => 'edit'
-  map.connect '/trace/:id/delete', :controller => 'trace', :action => 'delete'
-  map.connect '/trace/:id/make_public', :controller => 'trace', :action => 'make_public'
-  map.connect '/user/:display_name/traces', :controller => 'trace', :action => 'list'
-  map.connect '/user/:display_name/traces/page/:page', :controller => 'trace', :action => 'list'
-  map.connect '/user/:display_name/traces/rss', :controller => 'trace', :action => 'georss'
-  map.connect '/user/:display_name/traces/tag/:tag', :controller => 'trace', :action => 'list'
-  map.connect '/user/:display_name/traces/tag/:tag/page/:page', :controller => 'trace', :action => 'list'
-  map.connect '/user/:display_name/traces/tag/:tag/rss', :controller => 'trace', :action => 'georss'
-  map.connect '/user/:display_name/traces/:id', :controller => 'trace', :action => 'view'
-  map.connect '/user/:display_name/traces/:id/picture', :controller => 'trace', :action => 'picture'
-  map.connect '/user/:display_name/traces/:id/icon', :controller => 'trace', :action => 'icon'
+  root :to => "site#index", :via => [:get, :post]
+  match "/edit" => "site#edit", :via => :get, :as => :edit
+  match "/copyright/:copyright_locale" => "site#copyright", :via => :get
+  match "/copyright" => "site#copyright", :via => :get
+  match "/welcome" => "site#welcome", :via => :get, :as => :welcome
+  match "/fixthemap" => "site#fixthemap", :via => :get, :as => :fixthemap
+  match "/help" => "site#help", :via => :get, :as => :help
+  match "/about" => "site#about", :via => :get, :as => :about
+  match "/history" => "changeset#list", :via => :get
+  match "/history/feed" => "changeset#feed", :via => :get, :defaults => { :format => :atom }
+  match "/history/comments/feed" => "changeset#comments_feed", :via => :get, :as => :changesets_comments_feed, :defaults => { :format => "rss" }
+  match "/export" => "site#export", :via => :get
+  match "/login" => "user#login", :via => [:get, :post]
+  match "/logout" => "user#logout", :via => [:get, :post]
+  match "/offline" => "site#offline", :via => :get
+  match "/key" => "site#key", :via => :get
+  match "/id" => "site#id", :via => :get
+  match "/query" => "browse#query", :via => :get
+  match "/user/new" => "user#new", :via => :get
+  match "/user/new" => "user#create", :via => :post
+  match "/user/terms" => "user#terms", :via => :get
+  match "/user/save" => "user#save", :via => :post
+  match "/user/:display_name/confirm/resend" => "user#confirm_resend", :via => :get
+  match "/user/:display_name/confirm" => "user#confirm", :via => [:get, :post]
+  match "/user/confirm" => "user#confirm", :via => [:get, :post]
+  match "/user/confirm-email" => "user#confirm_email", :via => [:get, :post]
+  match "/user/go_public" => "user#go_public", :via => :post
+  match "/user/reset-password" => "user#reset_password", :via => [:get, :post]
+  match "/user/forgot-password" => "user#lost_password", :via => [:get, :post]
+  match "/user/suspended" => "user#suspended", :via => :get
+
+  get "/index.html", :to => redirect(:path => "/")
+  get "/create-account.html", :to => redirect(:path => "/user/new")
+  get "/forgot-password.html", :to => redirect(:path => "/user/forgot-password")
+
+  # omniauth
+  match "/auth/failure" => "user#auth_failure", :via => :get
+  match "/auth/:provider/callback" => "user#auth_success", :via => [:get, :post], :as => :auth_success
+  match "/auth/:provider" => "user#auth", :via => [:get, :post], :as => :auth
+
+  # permalink
+  match "/go/:code" => "site#permalink", :via => :get, :code => /[a-zA-Z0-9_@~]+[=-]*/
+
+  # rich text preview
+  match "/preview/:type" => "site#preview", :via => :post, :as => :preview
+
+  # traces
+  match "/user/:display_name/traces/tag/:tag/page/:page" => "trace#list", :via => :get, :page => /[1-9][0-9]*/
+  match "/user/:display_name/traces/tag/:tag" => "trace#list", :via => :get
+  match "/user/:display_name/traces/page/:page" => "trace#list", :via => :get, :page => /[1-9][0-9]*/
+  match "/user/:display_name/traces" => "trace#list", :via => :get
+  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, :defaults => { :format => :rss }
+  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/icon" => "trace#icon", :via => :get
+  match "/traces/tag/:tag/page/:page" => "trace#list", :via => :get, :page => /[1-9][0-9]*/
+  match "/traces/tag/:tag" => "trace#list", :via => :get
+  match "/traces/page/:page" => "trace#list", :via => :get, :page => /[1-9][0-9]*/
+  match "/traces" => "trace#list", :via => :get
+  match "/traces/tag/:tag/rss" => "trace#georss", :via => :get, :defaults => { :format => :rss }
+  match "/traces/rss" => "trace#georss", :via => :get, :defaults => { :format => :rss }
+  match "/traces/mine/tag/:tag/page/:page" => "trace#mine", :via => :get, :page => /[1-9][0-9]*/
+  match "/traces/mine/tag/:tag" => "trace#mine", :via => :get
+  match "/traces/mine/page/:page" => "trace#mine", :via => :get
+  match "/traces/mine" => "trace#mine", :via => :get
+  match "/trace/create" => "trace#create", :via => [:get, :post]
+  match "/trace/:id/data" => "trace#data", :via => :get, :id => /\d+/, :as => "trace_data"
+  match "/trace/:id/edit" => "trace#edit", :via => [:get, :post], :id => /\d+/, :as => "trace_edit"
+  match "/trace/:id/delete" => "trace#delete", :via => :post, :id => /\d+/
+
+  # diary pages
+  match "/diary/new" => "diary_entry#new", :via => [:get, :post]
+  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 "/user/:display_name/diary/rss" => "diary_entry#rss", :via => :get, :defaults => { :format => :rss }
+  match "/diary/:language/rss" => "diary_entry#rss", :via => :get, :defaults => { :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 => /[1-9][0-9]*/
+  match "/user/:display_name/diary/comments/" => "diary_entry#comments", :via => :get
+  match "/user/:display_name/diary" => "diary_entry#list", :via => :get
+  match "/diary/:language" => "diary_entry#list", :via => :get
+  match "/diary" => "diary_entry#list", :via => :get
+  match "/user/:display_name/diary/:id" => "diary_entry#view", :via => :get, :id => /\d+/
+  match "/user/:display_name/diary/:id/newcomment" => "diary_entry#comment", :via => :post, :id => /\d+/
+  match "/user/:display_name/diary/:id/edit" => "diary_entry#edit", :via => [:get, :post], :id => /\d+/
+  match "/user/:display_name/diary/:id/hide" => "diary_entry#hide", :via => :post, :id => /\d+/, :as => :hide_diary_entry
+  match "/user/:display_name/diary/:id/hidecomment/:comment" => "diary_entry#hidecomment", :via => :post, :id => /\d+/, :comment => /\d+/, :as => :hide_diary_comment
+  match "/user/:display_name/diary/:id/subscribe" => "diary_entry#subscribe", :via => :post, :as => :diary_entry_subscribe, :id => /\d+/
+  match "/user/:display_name/diary/:id/unsubscribe" => "diary_entry#unsubscribe", :via => :post, :as => :diary_entry_unsubscribe, :id => /\d+/

 
   # user pages
 
   # user pages

-  map.connect '/user/:display_name', :controller => 'user', :action => 'view'
-  map.connect '/user/:display_name/edits', :controller => 'changeset', :action => 'list_user'
-  map.connect '/user/:display_name/make_friend', :controller => 'user', :action => 'make_friend'
-  map.connect '/user/:display_name/remove_friend', :controller => 'user', :action => 'remove_friend'
-  map.connect '/user/:display_name/diary', :controller => 'diary_entry', :action => 'list'
-  map.connect '/user/:display_name/diary/:id', :controller => 'diary_entry', :action => 'view', :id => /\d+/
-  map.connect '/user/:display_name/diary/:id/newcomment', :controller => 'diary_entry', :action => 'comment', :id => /\d+/
-  map.connect '/user/:display_name/diary/rss', :controller => 'diary_entry', :action => 'rss'
-  map.connect '/user/:display_name/diary/new', :controller => 'diary_entry', :action => 'new'
-  map.connect '/user/:display_name/diary/:id/edit', :controller => 'diary_entry', :action => 'edit', :id => /\d+/
-  map.connect '/user/:display_name/account', :controller => 'user', :action => 'account'
-  map.connect '/user/:display_name/set_home', :controller => 'user', :action => 'set_home'
-  map.connect '/diary', :controller => 'diary_entry', :action => 'list'
-  map.connect '/diary/rss', :controller => 'diary_entry', :action => 'rss'
-  map.connect '/diary/:language', :controller => 'diary_entry', :action => 'list'
-  map.connect '/diary/:language/rss', :controller => 'diary_entry', :action => 'rss'
-  
-  
-  # test pages
-  map.connect '/test/populate/:table/:from/:count', :controller => 'test', :action => 'populate'
-  map.connect '/test/populate/:table/:count', :controller => 'test', :action => 'populate', :from => 1
+  match "/user/:display_name" => "user#view", :via => :get, :as => "user"
+  match "/user/:display_name/make_friend" => "user#make_friend", :via => [:get, :post], :as => "make_friend"
+  match "/user/:display_name/remove_friend" => "user#remove_friend", :via => [:get, :post], :as => "remove_friend"
+  match "/user/:display_name/account" => "user#account", :via => [:get, :post]
+  match "/user/:display_name/set_status" => "user#set_status", :via => :get, :as => :set_status_user
+  match "/user/:display_name/delete" => "user#delete", :via => :get, :as => :delete_user
+
+  # user lists
+  match "/users" => "user#list", :via => [:get, :post]
+  match "/users/:status" => "user#list", :via => [:get, :post]

 
   # geocoder
 
   # geocoder

-  map.connect '/geocoder/search', :controller => 'geocoder', :action => 'search'
-  map.connect '/geocoder/description', :controller => 'geocoder', :action => 'description'
+  match "/search" => "geocoder#search", :via => :get, :as => :search
+  match "/geocoder/search_latlon" => "geocoder#search_latlon", :via => :get
+  match "/geocoder/search_uk_postcode" => "geocoder#search_uk_postcode", :via => :get
+  match "/geocoder/search_ca_postcode" => "geocoder#search_ca_postcode", :via => :get
+  match "/geocoder/search_osm_nominatim" => "geocoder#search_osm_nominatim", :via => :get
+  match "/geocoder/search_geonames" => "geocoder#search_geonames", :via => :get
+  match "/geocoder/search_osm_nominatim_reverse" => "geocoder#search_osm_nominatim_reverse", :via => :get
+  match "/geocoder/search_geonames_reverse" => "geocoder#search_geonames_reverse", :via => :get
+
+  # directions
+  match "/directions" => "directions#search", :via => :get, :as => :directions

 
   # export
 
   # export

-  map.connect '/export/start', :controller => 'export', :action => 'start'
-  map.connect '/export/finish', :controller => 'export', :action => 'finish'
+  match "/export/finish" => "export#finish", :via => :post
+  match "/export/embed" => "export#embed", :via => :get

 
   # messages
 
   # messages

+  match "/user/:display_name/inbox" => "message#inbox", :via => :get, :as => "inbox"
+  match "/user/:display_name/outbox" => "message#outbox", :via => :get, :as => "outbox"
+  match "/message/new/:display_name" => "message#new", :via => [:get, :post], :as => "new_message"
+  match "/message/read/:message_id" => "message#read", :via => :get, :as => "read_message"
+  match "/message/mark/:message_id" => "message#mark", :via => :post, :as => "mark_message"
+  match "/message/reply/:message_id" => "message#reply", :via => [:get, :post], :as => "reply_message"
+  match "/message/delete/:message_id" => "message#delete", :via => :post, :as => "delete_message"
+
+  # oauth admin pages (i.e: for setting up new clients, etc...)
+  scope "/user/:display_name" do
+    resources :oauth_clients
+  end
+  match "/oauth/revoke" => "oauth#revoke", :via => [:get, :post]
+  match "/oauth/authorize" => "oauth#authorize", :via => [:get, :post], :as => :authorize
+  match "/oauth/token" => "oauth#token", :via => :get, :as => :token
+  match "/oauth/request_token" => "oauth#request_token", :via => [:get, :post], :as => :request_token
+  match "/oauth/access_token" => "oauth#access_token", :via => [:get, :post], :as => :access_token
+  match "/oauth/test_request" => "oauth#test_request", :via => :get, :as => :test_request

 
 

-  map.connect '/user/:display_name/inbox', :controller => 'message', :action => 'inbox'
-  map.connect '/user/:display_name/outbox', :controller => 'message', :action => 'outbox'
-  map.connect '/message/new/:display_name', :controller => 'message', :action => 'new'
-  map.connect '/message/read/:message_id', :controller => 'message', :action => 'read'
-  map.connect '/message/mark/:message_id', :controller => 'message', :action => 'mark'
-  map.connect '/message/reply/:message_id', :controller => 'message', :action => 'reply'
+  # roles and banning pages
+  match "/user/:display_name/role/:role/grant" => "user_roles#grant", :via => :post, :as => "grant_role"
+  match "/user/:display_name/role/:role/revoke" => "user_roles#revoke", :via => :post, :as => "revoke_role"
+  match "/user/:display_name/blocks" => "user_blocks#blocks_on", :via => :get
+  match "/user/:display_name/blocks_by" => "user_blocks#blocks_by", :via => :get
+  match "/blocks/new/:display_name" => "user_blocks#new", :via => :get, :as => "new_user_block"
+  resources :user_blocks
+  match "/blocks/:id/revoke" => "user_blocks#revoke", :via => [:get, :post], :as => "revoke_user_block"

 
 

-  # fall through
-  map.connect ':controller/:id/:action'
-  map.connect ':controller/:action'
+  # redactions
+  resources :redactions

 end
 end