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

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 3fe62dcb33eaca088e94c440cac705d28fa314d4..89e6364091b88e2af02560be9fd7531615a7a99e 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -77,21 +77,22 @@ OpenStreetMap::Application.routes.draw do
         put "" => "user_preferences#update_all", :as => ""
       end
     end
+  end
 
-    resources :messages, :path => "user/messages", :constraints => { :id => /\d+/ }, :only => [:create, :show, :destroy], :controller => "messages", :as => :api_messages do
+  namespace :api, :path => "api/0.6" 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
-
-    get "gpx/:id/data" => "traces#data", :as => :api_trace_data
-  end
-
-  namespace :api, :path => "api/0.6" do
-    resources :traces, :path => "gpx", :only => [:create, :show, :update, :destroy], :id => /\d+/
+    resources :traces, :path => "gpx", :only => [:create, :show, :update, :destroy], :id => /\d+/ do
+      scope :module => :traces do
+        resource :data, :only => :show
+      end
+    end
     post "gpx/create" => "traces#create", :id => /\d+/, :as => :trace_create
     get "gpx/:id/details" => "traces#show", :id => /\d+/, :as => :trace_details
 
@@ -287,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"