Merge remote-tracking branch 'upstream/pull/5427'

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 871fef1bf27f667279d32c4a22be320abd2d3a4a..0467c59c8e0be006c1c11be2cd9f0219c36e5c62 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -71,24 +71,23 @@ OpenStreetMap::Application.routes.draw do
     get "user/details" => "users#details"
     get "user/gpx_files" => "users#gpx_files"
     get "users" => "users#index", :as => :api_users
+  end
 
-    resources :user_preferences, :except => [:new, :create, :edit], :param => :preference_key, :path => "user/preferences", :controller => "user_preferences" do
+  namespace :api, :path => "api/0.6" do
+    resources :user_preferences, :except => [:new, :create, :edit], :param => :preference_key, :path => "user/preferences" do
       collection do
         put "" => "user_preferences#update_all", :as => ""
       end
     end
 
-    resources :messages, :path => "user/messages", :constraints => { :id => /\d+/ }, :only => [:create, :show, :destroy], :controller => "messages", :as => :api_messages do
+    resources :messages, :path => "user/messages", :constraints => { :id => /\d+/ }, :only => [:create, :show, :update, :destroy] do
       collection do
         get "inbox"
         get "outbox"
       end
     end
+    post "/user/messages/:id" => "messages#update"
 
-    post "/user/messages/:id" => "messages#update", :as => :api_message_update
-  end
-
-  namespace :api, :path => "api/0.6" do
     resources :traces, :path => "gpx", :only => [:create, :show, :update, :destroy], :id => /\d+/ do
       scope :module => :traces do
         resource :data, :only => :show
@@ -289,8 +288,9 @@ OpenStreetMap::Application.routes.draw do
   match "/user/:display_name/remove_friend" => "friendships#remove_friend", :via => [:get, :post], :as => "remove_friend"
 
   # user lists
-  match "/users" => "users#index", :via => [:get, :post]
-  match "/users/:status" => "users#index", :via => [:get, :post]
+  namespace :users do
+    resource :list, :path => "(:status)", :only => [:show, :update]
+  end
 
   # geocoder
   get "/search" => "geocoder#search"