X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e3aaa6dd4b90320f7cad0efe66646692710a849b..a0de9b780db50a1a92616fe03358248412864025:/config/routes.rb?ds=inline diff --git a/config/routes.rb b/config/routes.rb index cf0bfd324..67deae7ed 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,264 +1,293 @@ OpenStreetMap::Application.routes.draw do # API - 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, :via => :get, :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 - - 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 - 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 + get "api/capabilities" => "api#capabilities" + scope "api/0.6" do - resources :notes, :except => [ :new, :edit, :update ], :constraints => { :id => /\d+/ }, :defaults => { :format => "xml" } do + get "capabilities" => "api#capabilities" + get "permissions" => "api#permissions" + + put "changeset/create" => "changeset#create" + post "changeset/:id/upload" => "changeset#upload", :id => /\d+/ + get "changeset/:id/download" => "changeset#download", :as => :changeset_download, :id => /\d+/ + post "changeset/:id/expand_bbox" => "changeset#expand_bbox", :id => /\d+/ + get "changeset/:id" => "changeset#read", :as => :changeset_read, :id => /\d+/ + post "changeset/:id/subscribe" => "changeset#subscribe", :as => :changeset_subscribe, :id => /\d+/ + post "changeset/:id/unsubscribe" => "changeset#unsubscribe", :as => :changeset_unsubscribe, :id => /\d+/ + put "changeset/:id" => "changeset#update", :id => /\d+/ + put "changeset/:id/close" => "changeset#close", :id => /\d+/ + get "changesets" => "changeset#query" + post "changeset/:id/comment" => "changeset#comment", :as => :changeset_comment, :id => /\d+/ + post "changeset/comment/:id/hide" => "changeset#hide_comment", :as => :changeset_comment_hide, :id => /\d+/ + post "changeset/comment/:id/unhide" => "changeset#unhide_comment", :as => :changeset_comment_unhide, :id => /\d+/ + + put "node/create" => "node#create" + get "node/:id/ways" => "way#ways_for_node", :id => /\d+/ + get "node/:id/relations" => "relation#relations_for_node", :id => /\d+/ + get "node/:id/history" => "old_node#history", :id => /\d+/ + post "node/:id/:version/redact" => "old_node#redact", :version => /\d+/, :id => /\d+/ + get "node/:id/:version" => "old_node#version", :id => /\d+/, :version => /\d+/ + get "node/:id" => "node#read", :id => /\d+/ + put "node/:id" => "node#update", :id => /\d+/ + delete "node/:id" => "node#delete", :id => /\d+/ + get "nodes" => "node#nodes" + + put "way/create" => "way#create" + get "way/:id/history" => "old_way#history", :id => /\d+/ + get "way/:id/full" => "way#full", :id => /\d+/ + get "way/:id/relations" => "relation#relations_for_way", :id => /\d+/ + post "way/:id/:version/redact" => "old_way#redact", :version => /\d+/, :id => /\d+/ + get "way/:id/:version" => "old_way#version", :id => /\d+/, :version => /\d+/ + get "way/:id" => "way#read", :id => /\d+/ + put "way/:id" => "way#update", :id => /\d+/ + delete "way/:id" => "way#delete", :id => /\d+/ + get "ways" => "way#ways" + + put "relation/create" => "relation#create" + get "relation/:id/relations" => "relation#relations_for_relation", :id => /\d+/ + get "relation/:id/history" => "old_relation#history", :id => /\d+/ + get "relation/:id/full" => "relation#full", :id => /\d+/ + post "relation/:id/:version/redact" => "old_relation#redact", :version => /\d+/, :id => /\d+/ + get "relation/:id/:version" => "old_relation#version", :id => /\d+/, :version => /\d+/ + get "relation/:id" => "relation#read", :id => /\d+/ + put "relation/:id" => "relation#update", :id => /\d+/ + delete "relation/:id" => "relation#delete", :id => /\d+/ + get "relations" => "relation#relations" + + get "map" => "api#map" + + get "trackpoints" => "api#trackpoints" + + get "changes" => "api#changes" + + get "search" => "search#search_all", :as => "api_search" + get "ways/search" => "search#search_ways" + get "relations/search" => "search#search_relations" + get "nodes/search" => "search#search_nodes" + + get "user/:id" => "user#api_read", :id => /\d+/ + get "user/details" => "user#api_details" + get "user/gpx_files" => "user#api_gpx_files" + + get "user/preferences" => "user_preferences#read" + get "user/preferences/:preference_key" => "user_preferences#read_one" + put "user/preferences" => "user_preferences#update" + put "user/preferences/:preference_key" => "user_preferences#update_one" + delete "user/preferences/:preference_key" => "user_preferences#delete_one" + + post "gpx/create" => "trace#api_create" + get "gpx/:id" => "trace#api_read", :id => /\d+/ + put "gpx/:id" => "trace#api_update", :id => /\d+/ + delete "gpx/:id" => "trace#api_delete", :id => /\d+/ + get "gpx/:id/details" => "trace#api_read", :id => /\d+/ + get "gpx/:id/data" => "trace#api_data" + + # AMF (ActionScript) API + post "amf/read" => "amf#amf_read" + post "amf/write" => "amf#amf_write" + get "swf/trackpoints" => "swf#trackpoints" + + # Map notes API + resources :notes, :except => [:new, :edit, :update], :constraints => { :id => /\d+/ }, :defaults => { :format => "xml" } do collection do - get 'search' - get 'feed', :defaults => { :format => "rss" } + get "search" + get "feed", :defaults => { :format => "rss" } end member do - post 'comment' - post 'close' - post 'reopen' + 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" + post "notes/addPOIexec" => "notes#create" + post "notes/closePOIexec" => "notes#close" + post "notes/editPOIexec" => "notes#comment" + get "notes/getGPX" => "notes#index", :format => "gpx" + get "notes/getRSSfeed" => "notes#feed", :format => "rss" end # Data browsing - match '/browse/start' => 'browse#start', :via => :get - match '/browse/way/:id' => 'browse#way', :via => :get, :id => /\d+/ - match '/browse/way/:id/history' => 'browse#way_history', :via => :get, :id => /\d+/ - match '/browse/node/:id' => 'browse#node', :via => :get, :id => /\d+/ - match '/browse/node/:id/history' => 'browse#node_history', :via => :get, :id => /\d+/ - match '/browse/relation/:id' => 'browse#relation', :via => :get, :id => /\d+/ - match '/browse/relation/:id/history' => 'browse#relation_history', :via => :get, :id => /\d+/ - match '/browse/changeset/:id' => 'browse#changeset', :via => :get, :as => :changeset, :id => /\d+/ - match '/browse/note/:id' => 'browse#note', :via => :get, :id => /\d+/, :as => "browse_note" - match '/user/:display_name/edits' => 'changeset#list', :via => :get - match '/user/:display_name/edits/feed' => 'changeset#feed', :via => :get, :format => :atom - match '/user/:display_name/notes' => 'notes#mine', :via => :get - match '/browse/friends' => 'changeset#list', :via => :get, :friends => true, :as => "friend_changesets" - match '/browse/nearby' => 'changeset#list', :via => :get, :nearby => true, :as => "nearby_changesets" - match '/browse/changesets' => 'changeset#list', :via => :get - match '/browse/changesets/feed' => 'changeset#feed', :via => :get, :format => :atom - match '/browse' => 'changeset#list', :via => :get + get "/way/:id" => "browse#way", :id => /\d+/, :as => :way + get "/way/:id/history" => "browse#way_history", :id => /\d+/ + get "/node/:id" => "browse#node", :id => /\d+/, :as => :node + get "/node/:id/history" => "browse#node_history", :id => /\d+/ + get "/relation/:id" => "browse#relation", :id => /\d+/, :as => :relation + get "/relation/:id/history" => "browse#relation_history", :id => /\d+/ + get "/changeset/:id" => "browse#changeset", :as => :changeset, :id => /\d+/ + get "/changeset/:id/comments/feed" => "changeset#comments_feed", :as => :changeset_comments_feed, :id => /\d*/, :defaults => { :format => "rss" } + get "/note/:id" => "browse#note", :id => /\d+/, :as => "browse_note" + get "/note/new" => "browse#new_note" + get "/user/:display_name/history" => "changeset#list" + get "/user/:display_name/history/feed" => "changeset#feed", :defaults => { :format => :atom } + get "/user/:display_name/notes" => "notes#mine" + get "/history/friends" => "changeset#list", :friends => true, :as => "friend_changesets", :defaults => { :format => :html } + get "/history/nearby" => "changeset#list", :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 - root :to => 'site#index', :via => [:get, :post] - match '/edit' => 'site#edit', :via => :get - match '/copyright/:copyright_locale' => 'site#copyright', :via => :get - match '/copyright' => 'site#copyright', :via => :get - match '/welcome' => 'site#welcome', :via => :get - match '/history' => 'changeset#list', :via => :get - match '/history/feed' => 'changeset#feed', :via => :get, :format => :atom - match '/export' => 'site#index', :export => true, :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 '/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 - - match '/index.html' => 'site#index', :via => :get - match '/create-account.html' => 'user#new', :via => :get - match '/forgot-password.html' => 'user#lost_password', :via => :get + root :to => "site#index", :via => [:get, :post] + get "/edit" => "site#edit" + get "/copyright/:copyright_locale" => "site#copyright" + get "/copyright" => "site#copyright" + get "/welcome" => "site#welcome" + get "/fixthemap" => "site#fixthemap" + get "/help" => "site#help" + get "/about" => "site#about" + get "/history" => "changeset#list" + get "/history/feed" => "changeset#feed", :defaults => { :format => :atom } + get "/history/comments/feed" => "changeset#comments_feed", :as => :changesets_comments_feed, :defaults => { :format => "rss" } + get "/export" => "site#export" + match "/login" => "user#login", :via => [:get, :post] + match "/logout" => "user#logout", :via => [:get, :post] + get "/offline" => "site#offline" + get "/key" => "site#key" + get "/id" => "site#id" + get "/query" => "browse#query" + get "/user/new" => "user#new" + post "/user/new" => "user#create" + get "/user/terms" => "user#terms" + post "/user/save" => "user#save" + get "/user/:display_name/confirm/resend" => "user#confirm_resend" + 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] + post "/user/go_public" => "user#go_public" + match "/user/reset-password" => "user#reset_password", :via => [:get, :post] + match "/user/forgot-password" => "user#lost_password", :via => [:get, :post] + get "/user/suspended" => "user#suspended" + + 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 + get "/auth/failure" => "user#auth_failure" + 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_@~]+[=-]*/ + get "/go/:code" => "site#permalink", :code => /[a-zA-Z0-9_@~]+[=-]*/ # rich text preview - match '/preview/:format' => 'site#preview', :as => :preview + post "/preview/:type" => "site#preview", :as => :preview # traces - match '/user/:display_name/traces/tag/:tag/page/:page' => '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' => 'trace#list', :via => :get - match '/user/:display_name/traces/tag/:tag/rss' => 'trace#georss', :via => :get - match '/user/:display_name/traces/rss' => 'trace#georss', :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/icon' => 'trace#icon', :via => :get - match '/traces/tag/:tag/page/:page' => 'trace#list', :via => :get - match '/traces/tag/:tag' => 'trace#list', :via => :get - match '/traces/page/:page' => 'trace#list', :via => :get - match '/traces' => 'trace#list', :via => :get - match '/traces/tag/:tag/rss' => 'trace#georss', :via => :get - match '/traces/rss' => 'trace#georss', :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/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 - match '/trace/:id/edit' => 'trace#edit', :via => [:get, :post, :put] - match '/trace/:id/delete' => 'trace#delete', :via => :post + get "/user/:display_name/traces/tag/:tag/page/:page" => "trace#list", :page => /[1-9][0-9]*/ + get "/user/:display_name/traces/tag/:tag" => "trace#list" + get "/user/:display_name/traces/page/:page" => "trace#list", :page => /[1-9][0-9]*/ + get "/user/:display_name/traces" => "trace#list" + get "/user/:display_name/traces/tag/:tag/rss" => "trace#georss", :defaults => { :format => :rss } + get "/user/:display_name/traces/rss" => "trace#georss", :defaults => { :format => :rss } + get "/user/:display_name/traces/:id" => "trace#view" + get "/user/:display_name/traces/:id/picture" => "trace#picture" + get "/user/:display_name/traces/:id/icon" => "trace#icon" + get "/traces/tag/:tag/page/:page" => "trace#list", :page => /[1-9][0-9]*/ + get "/traces/tag/:tag" => "trace#list" + get "/traces/page/:page" => "trace#list", :page => /[1-9][0-9]*/ + get "/traces" => "trace#list" + get "/traces/tag/:tag/rss" => "trace#georss", :defaults => { :format => :rss } + get "/traces/rss" => "trace#georss", :defaults => { :format => :rss } + get "/traces/mine/tag/:tag/page/:page" => "trace#mine", :page => /[1-9][0-9]*/ + get "/traces/mine/tag/:tag" => "trace#mine" + get "/traces/mine/page/:page" => "trace#mine" + get "/traces/mine" => "trace#mine" + match "/trace/create" => "trace#create", :via => [:get, :post] + get "/trace/:id/data" => "trace#data", :id => /\d+/, :as => "trace_data" + match "/trace/:id/edit" => "trace#edit", :via => [:get, :post], :id => /\d+/, :as => "trace_edit" + post "/trace/:id/delete" => "trace#delete", :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, :format => :rss - match '/diary/:language/rss' => 'diary_entry#rss', :via => :get, :format => :rss - match '/diary/rss' => 'diary_entry#rss', :via => :get, :format => :rss - 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' => '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 "/diary/new" => "diary_entry#new", :via => [:get, :post] + get "/diary/friends" => "diary_entry#list", :friends => true, :as => "friend_diaries" + get "/diary/nearby" => "diary_entry#list", :nearby => true, :as => "nearby_diaries" + get "/user/:display_name/diary/rss" => "diary_entry#rss", :defaults => { :format => :rss } + get "/diary/:language/rss" => "diary_entry#rss", :defaults => { :format => :rss } + get "/diary/rss" => "diary_entry#rss", :defaults => { :format => :rss } + get "/user/:display_name/diary/comments/:page" => "diary_entry#comments", :page => /[1-9][0-9]*/ + get "/user/:display_name/diary/comments/" => "diary_entry#comments" + get "/user/:display_name/diary" => "diary_entry#list" + get "/diary/:language" => "diary_entry#list" + get "/diary" => "diary_entry#list" + get "/user/:display_name/diary/:id" => "diary_entry#view", :id => /\d+/, :as => :diary_entry + post "/user/:display_name/diary/:id/newcomment" => "diary_entry#comment", :id => /\d+/ + match "/user/:display_name/diary/:id/edit" => "diary_entry#edit", :via => [:get, :post], :id => /\d+/ + post "/user/:display_name/diary/:id/hide" => "diary_entry#hide", :id => /\d+/, :as => :hide_diary_entry + post "/user/:display_name/diary/:id/hidecomment/:comment" => "diary_entry#hidecomment", :id => /\d+/, :comment => /\d+/, :as => :hide_diary_comment + post "/user/:display_name/diary/:id/subscribe" => "diary_entry#subscribe", :as => :diary_entry_subscribe, :id => /\d+/ + post "/user/:display_name/diary/:id/unsubscribe" => "diary_entry#unsubscribe", :as => :diary_entry_unsubscribe, :id => /\d+/ # user pages - 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 + get "/user/:display_name" => "user#view", :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] + get "/user/:display_name/set_status" => "user#set_status", :as => :set_status_user + get "/user/:display_name/delete" => "user#delete", :as => :delete_user # user lists - match '/users' => 'user#list', :via => [:get, :post] - match '/users/:status' => 'user#list', :via => [:get, :post] + match "/users" => "user#list", :via => [:get, :post] + match "/users/:status" => "user#list", :via => [:get, :post] # geocoder - match '/geocoder/search' => 'geocoder#search', :via => :post - match '/geocoder/search_latlon' => 'geocoder#search_latlon', :via => :get - match '/geocoder/search_us_postcode' => 'geocoder#search_us_postcode', :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_namefinder' => 'geocoder#search_osm_namefinder', :via => :get - match '/geocoder/search_osm_nominatim' => 'geocoder#search_osm_nominatim', :via => :get - match '/geocoder/search_geonames' => 'geocoder#search_geonames', :via => :get - match '/geocoder/description' => 'geocoder#description', :via => :post - match '/geocoder/description_osm_namefinder' => 'geocoder#description_osm_namefinder', :via => :get - match '/geocoder/description_osm_nominatim' => 'geocoder#description_osm_nominatim', :via => :get - match '/geocoder/description_geonames' => 'geocoder#description_geonames', :via => :get + get "/search" => "geocoder#search" + get "/geocoder/search_latlon" => "geocoder#search_latlon" + get "/geocoder/search_ca_postcode" => "geocoder#search_ca_postcode" + get "/geocoder/search_osm_nominatim" => "geocoder#search_osm_nominatim" + get "/geocoder/search_geonames" => "geocoder#search_geonames" + get "/geocoder/search_osm_nominatim_reverse" => "geocoder#search_osm_nominatim_reverse" + get "/geocoder/search_geonames_reverse" => "geocoder#search_geonames_reverse" + + # directions + get "/directions" => "directions#search" # export - match '/export/start' => 'export#start', :via => :get - match '/export/finish' => 'export#finish', :via => :post - match '/export/embed' => 'export#embed', :via => :get + post "/export/finish" => "export#finish" + get "/export/embed" => "export#embed" # 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" + get "/user/:display_name/inbox" => "message#inbox", :as => "inbox" + get "/user/:display_name/outbox" => "message#outbox", :as => "outbox" + match "/message/new/:display_name" => "message#new", :via => [:get, :post], :as => "new_message" + get "/message/read/:message_id" => "message#read", :as => "read_message" + post "/message/mark/:message_id" => "message#mark", :as => "mark_message" + match "/message/reply/:message_id" => "message#reply", :via => [:get, :post], :as => "reply_message" + post "/message/delete/:message_id" => "message#delete", :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' - match '/oauth/authorize' => 'oauth#authorize', :as => :authorize - match '/oauth/token' => 'oauth#token', :as => :token - match '/oauth/request_token' => 'oauth#request_token', :as => :request_token - match '/oauth/access_token' => 'oauth#access_token', :as => :access_token - match '/oauth/test_request' => 'oauth#test_request', :as => :test_request + match "/oauth/revoke" => "oauth#revoke", :via => [:get, :post] + match "/oauth/authorize" => "oauth#authorize", :via => [:get, :post], :as => :authorize + get "/oauth/token" => "oauth#token", :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 + get "/oauth/test_request" => "oauth#test_request", :as => :test_request # 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" + post "/user/:display_name/role/:role/grant" => "user_roles#grant", :as => "grant_role" + post "/user/:display_name/role/:role/revoke" => "user_roles#revoke", :as => "revoke_role" + get "/user/:display_name/blocks" => "user_blocks#blocks_on" + get "/user/:display_name/blocks_by" => "user_blocks#blocks_by" + get "/blocks/new/:display_name" => "user_blocks#new", :as => "new_user_block" resources :user_blocks - match '/blocks/:id/revoke' => 'user_blocks#revoke', :via => [:get, :post], :as => "revoke_user_block" + match "/blocks/:id/revoke" => "user_blocks#revoke", :via => [:get, :post], :as => "revoke_user_block" # redactions resources :redactions