routes.rb in community_engine-3.0.0

- old
+ new

@@ -1,13 +1,17 @@
 Rails.application.routes.draw do
+  concern :paginatable do
+    get '(page/:page)', :action => :index, :on => :collection
+  end
+
   get '/base/:action' => 'base'
 
   get '/forums/recent' => 'sb_posts#index', :as => :recent_forum_posts
   get '/photos/recent' => 'photos#recent', :as => :recent_photos
 
   resources :authorizations
-  match '/auth/:provider/callback' => 'authorizations#create', :as => :callback
+  get '/auth/:provider/callback' => 'authorizations#create', :as => :callback
   get '/auth/failure' => 'authorizations#failure'
 
   resources :sb_posts, :as => 'all_sb_posts' do
     collection do
       get :search
@@ -40,14 +44,14 @@
 
   get '/' => 'base#site_index', :as => :home
 
   scope "/admin" do
     get 'dashboard' => 'homepage_features#index', :as => :admin_dashboard
-    get 'users' => 'admin#users', :as => :admin_users
+    match 'users' => 'admin#users', :as => :admin_users, :via => [:post, :get]
     get 'messages' => 'admin#messages', :as => :admin_messages
-    get 'comments' => 'admin#comments', :as => :admin_comments
-    get 'tags' => 'tags#manage', :as => :admin_tags
+    match 'comments' => 'admin#comments', :as => :admin_comments, :via => [:post, :get]
+    match 'tags' => 'tags#manage', :as => :admin_tags, :via => [:post, :get]
     get 'events' => 'admin#events', :as => :admin_events
     get 'clear_cache' => 'admin#clear_cache', :as => :admin_clear_cache
     get 'subscribers(.:format)' => "admin#subscribers", :as => :admin_subscribers
     get 'activate_user' => "admin#activate_user", :as => :admin_activate_user
     get 'deactivate_user' => 'admin#deactivate_user', :as => :admin_deactivate_user
@@ -67,12 +71,13 @@
   get '/logout' => 'sessions#destroy', :as => :logout
 
   get '/signup/:inviter_id/:inviter_code' => 'users#new', :as => :signup_by_id
   get '/forgot_password' => 'password_resets#new', :as => :forgot_password
   resources :password_resets
-  get '/forgot_username' => 'users#forgot_username', :as => :forgot_username
-  post '/forgot_username' => 'users#forgot_username'
+
+  match '/forgot_username' => 'users#forgot_username', :as => :forgot_username, :via => [:get, :post]
+
   post '/resend_activation' => 'users#resend_activation', :as => :resend_activation
 
   get '/new_clipping' => 'clippings#new_clipping'
   post '/load_images_from_uri' => 'clippings#load_images_from_uri', :format => 'js'
   get '/clippings(/page/:page)' => 'clippings#site_index', :as => :site_clippings
@@ -85,13 +90,10 @@
   get '/recent(/page/:page)' => 'posts#recent', :as => :recent
   get '/recent.rss' => 'posts#recent', :as => :recent_rss, :format => 'rss'
   get '/rss' => 'base#rss_site_index', :as => :rss_redirect
   get '/site_index.rss' => 'base#site_index', :as => :rss, :format => 'rss'
   get '/advertise' => 'base#advertise', :as => :advertise
-  get '/css_help' => 'base#css_help', :as => :css_help
-  get '/about' => 'base#about', :as => :about
-  get '/faq' => 'base#faq', :as => :faq
   get '/footer_content' => 'base#footer_content', :as => :footer_content
 
   get '/account/edit' => 'users#edit_account', :as => :edit_account_from_email
 
   get '/friendships.xml' => 'friendships#index', :as => :friendships_xml, :format => 'xml'
@@ -115,46 +117,43 @@
   get '/search/tags' => 'tags#show', :as => :search_tags
 
   resources :categories
   post '/categories/show_tips' => 'categories#show_tips', :as => :categories_show_tips
 
-  resources :events do
-    get 'page/:page', :action => :index, :on => :collection
+  resources :events, :concerns => :paginatable do
     collection do
       get :past
       get :ical
     end
     member do
       get :clone
     end
     resources :rsvps
   end
-
-  scope '/:favoritable_type/:favoritable_id' do
-    resources :favorites
-  end
   scope "/:commentable_type/:commentable_id" do
     resources :comments, :as => :commentable_comments do
       member do
         get :unsubscribe
         put :approve
       end
     end
   end
+  resources :comments do
+    collection do
+      delete :delete_selected
+    end
+  end
   resources :comments
-  delete '/comments/delete_selected' => 'comments#delete_selected', :as => :delete_selected_comments
 
   resources :homepage_features
   resources :metro_areas
   resources :ads
 
   resources :activities
 
-  resources :users do
+  resources :users, :concerns => :paginatable do
 
-    get 'page/:page', :action => :index, :on => :collection
-
     collection do
       post 'return_admin'
       delete 'delete_selected'
     end
     member do
@@ -162,81 +161,73 @@
       get 'edit_account'
       get 'invite'
       get 'signup_completed'
       get 'activate'
 
-      put 'toggle_moderator'
-      put 'toggle_featured'
+      patch 'toggle_moderator'
+      patch 'toggle_featured'
 
-      put 'change_profile_photo'
-      put 'update_account'
-      put 'deactivate'
+      patch 'change_profile_photo'
+      patch 'update_account'
+      patch 'deactivate'
 
       get 'welcome_photo'
       get 'welcome_about'
       get 'welcome_invite'
       get 'welcome_complete'
 
       post 'assume'
 
       get 'statistics'
-      get 'crop_profile_photo'
-      put 'crop_profile_photo'
-      get 'upload_profile_photo'
-      put 'upload_profile_photo'
+      match 'crop_profile_photo', :via => [:get, :put, :patch]
+      match 'upload_profile_photo', :via => [:get, :put, :patch]
     end
 
     resources :friendships do
       collection do
         get :accepted
         get :pending
         get :denied
       end
       member do
-        put :accept
-        put :deny
+        patch :accept
+        patch :deny
       end
     end
 
-    resources :photos do
-      get 'page/:page', :action => :index, :on => :collection
-    end
+    resources :photos, :concerns => :paginatable
 
-    resources :posts do
-      get 'page/:page', :action => :index, :on => :collection
-
+    resources :posts, :concerns => :paginatable do
       collection do
         # get 'manage(/page/:page)', :action => :manage
-        get :manage
+        match :manage, :via => [:get, :post]
       end
 
       member do
         post :send_to_friend
-        put :update_views
+        patch :update_views
         get :category_tips_update
         get :preview
       end
     end
 
     resources :clippings
 
-    resources :activities do
-      get 'page/:page', :action => :index, :on => :collection
+    resources :activities, :concerns => :paginatable do
       collection do
         get :network
       end
     end
 
     resources :invitations
 
     resources :favorites
     resources :messages do
-      post :auto_complete_for_username, :on => :collection
+      get :auto_complete_for_username, :on => :collection
       collection do
         post :delete_message_threads
         post :delete_selected
-
       end
     end
 
     resources :comments
     resources :photo_manager
@@ -248,9 +239,13 @@
           get :slideshow
         end
       end
     end
 
+  end
+
+  scope '/:favoritable_type/:favoritable_id' do
+    resources :favorites
   end
 
   resources :votes
   resources :invitations
   get '/users/:user_id/posts/category/:category_name' => 'posts#index', :as => :users_posts_in_category