refactor (not tested, no compatibility)

1 files changed, 54 insertions, 58 deletions

diff --git a/config/routes.rb b/config/routes.rb
index 3a463dc..5ae1ddd 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -10,74 +10,70 @@ Aclog::Application.routes.draw do
     order: /(fav(orite[sd]?|(or)?ed|s)?|re?t(weet(s|ed)?|s)?)/,
   }
 
-  # static
+  # MainController
   root to: "main#index"
-  get "/about" => "main#about"
-  get "/about/api" => "main#api"
 
-  # internals
-  get "/i/callback" => "sessions#callback"
-  get "/i/logout" => "sessions#destroy"
-
-  # other
-  get "/i/best" => "i#best"
-  get "/i/recent" => "i#recent"
-  get "/i/timeline" => "i#timeline"
+  get "/about" => "main#about", as: "about"
+  get "/about/api" => "main#api", as: "about_api"
 
-  get "/i/favoriters" => "users#favoriters", format: :json
-  get "/i/:id" => "users#show", constraints: constraints, as: "tweet"
-  get "/i/show" => "users#show"
+  # Internals / SessionsController
+  get "/i/callback" => "sessions#callback"
+  get "/i/logout" => "sessions#destroy", as: "logout"
 
-  # report
+  # ReportController
   get "/i/report" => "report#index", as: "report"
   post "/i/report/tweet" => "report#tweet"
 
-  get "/search" => "search#search"
+  # public
+  get "/i/best" => "tweets#best", as: "best"
+  get "/i/recent" => "tweets#recent", as: "recent"
+  get "/i/timeline" => "tweets#timeline", as: "timeline"
+  get "/i/:id" => "tweets#show", constraints: constraints, as: "tweet"
+  get "(/users)/:screen_name/status(es)/:id" => redirect("/i/%{id}"), constraints: constraints
 
-  # i -- end
-  get "/i(/:none)" => redirect("/")
+  # JSON API
+  scope :api do
+    get "/:controller/:action"
+  end
 
-  # user
-  get "/users" => redirect("/")
-  get "/users/best" => "users#best"
-  get "/users/recent" => "users#recent"
-  get "/users/timeline" => "users#timeline"
-  get "/users/discovered" => "users#discovered"
-  get "/users/info" => "users#info"
-  get "/users/favorited_by" => "users#favorited_by"
-  get "/users/retweeted_by" => "users#retweeted_by"
-  get "/users/given_favorites_to" => "users#given_favorites_to"
-  get "/users/given_retweets_to" => "users#given_retweets_to"
+  # User pages.
+  scope ":screen_name", controller: "users", constraints: constraints do
+    get "/info",                         action: "info",            as: "user_info"
+    get "/discovered_by",                action: "discovered_by",   as: "user_discovered_by"
+    get "/discovered_of",                action: "discovered_of",   as: "user_discovered_of"
+  end
+  scope ":screen_name", controller: "tweets", constraints: constraints do
+    get "/(:page)",                      action: "best",          as: "user_best"
+    get "/favorited(/:page)",            action: "favorited",     as: "user_favorited"
+    get "/retweeted(/:page)",            action: "retweeted",     as: "user_retweeted"
+    get "/recent(/:page)",               action: "recent",        as: "user_recent"
+    get "/timeline",                     action: "timeline",      as: "user_timeline"
+    get "/discoveries",                  action: "discoveries",   as: "user_discoveries"
+    get "/discovered_by/:screen_name_b", action: "discovered_by", as: "user_discovered_by_user"
+  end
 
-  get "/:screen_name(/:page)" => "users#best", constraints: constraints, as: "user"
-  get "/:screen_name/:order(/:page)" => "users#best", constraints: constraints
-  get "/:screen_name/timeline" => "users#timeline", constraints: constraints, as: "timeline"
-  get "/:screen_name/discovered" => "users#discovered", constraints: constraints, as: "discovered"
-  get "/:screen_name/discovered/:tweets" => "users#discovered", constraints: constraints
-  get "/:screen_name/info" => "users#info", constraints: constraints, as: "info"
-  get "/:screen_name/favorited_by(/:screen_name_b)" => "users#favorited_by", constraints: constraints, as: "favorited_by"
-  get "/:screen_name/retweeted_by(/:screen_name_b)" => "users#retweeted_by", constraints: constraints, as: "retweeted_by"
-  get "/:screen_name/given_favorites_to(/:screen_name_b)" => "users#given_favorites_to", constraints: constraints, as: "given_favorites_to"
-  get "/:screen_name/given_retweets_to(/:screen_name_b)" => "users#given_retweets_to", constraints: constraints, as: "given_retweets_to"
 
-  # will be removed..?
-  get "/:screen_name/recent(/:page)" => "users#recent", constraints: constraints, as: "recent"
-  get "/:screen_name/recent/:order(/:page)" => "users#recent", constraints: constraints
+  # Favstar redirects
+  scope "users/:screen_name", constraints: constraints do
+    get "/" => redirect("/%{screen_name}")
+    get "/most_favorited" => redirect("/%{screen_name}/favorite")
+    get "/most_retweeted" => redirect("/%{screen_name}/retweet")
+    get "/discovered" => redirect("/%{screen_name}/discovered")
+    get "/favorited" => redirect("/%{screen_name}/discovered/favorite")
+    get "/given" => redirect("/%{screen_name}/discovered/favorite")
+    get "/retweeted" => redirect("/%{screen_name}/discovered/retweet")
+    get "/recent" => redirect("/%{screen_name}/timeline")
+    get "/favs_from" => redirect("/%{screen_name}/favorited_by")
+    get "/favs_from/:screen_name_b" => redirect("/%{screen_name}/favorited_by/%{screen_name_b}")
+    get "/retweeted_by" => redirect("/%{screen_name}/retweeted_by")
+    get "/retweeted_by/:screen_name_b" => redirect("/%{screen_name}/retweeted_by/%{screen_name_b}")
+    get "/given_to" => redirect("/%{screen_name}/given_favorites_to")
+    get "/given_to/:screen_name_b" => redirect("/%{screen_name}/given_favorites_to/%{screen_name_b}")
+  end
 
-  # redirects
-  get "(/users)/:screen_name/status(es)/:id" => redirect("/i/%{id}"), constraints: constraints
-  get "/users/:screen_name" => redirect("/%{screen_name}"), constraints: constraints
-  get "/users/:screen_name/most_favorited" => redirect("/%{screen_name}/favorite"), constraints: constraints
-  get "/users/:screen_name/most_retweeted" => redirect("/%{screen_name}/retweet"), constraints: constraints
-  get "/users/:screen_name/discovered" => redirect("/%{screen_name}/discovered"), constraints: constraints
-  get "/users/:screen_name/favorited" => redirect("/%{screen_name}/discovered/favorite"), constraints: constraints
-  get "/users/:screen_name/given" => redirect("/%{screen_name}/discovered/favorite"), constraints: constraints
-  get "/users/:screen_name/retweeted" => redirect("/%{screen_name}/discovered/retweet"), constraints: constraints
-  get "/users/:screen_name/recent" => redirect("/%{screen_name}/timeline"), constraints: constraints
-  get "/users/:screen_name/favs_from" => redirect("/%{screen_name}/favorited_by"), constraints: constraints
-  get "/users/:screen_name/favs_from/:screen_name_b" => redirect("/%{screen_name}/favorited_by/%{screen_name_b}"), constraints: constraints
-  get "/users/:screen_name/retweeted_by" => redirect("/%{screen_name}/retweeted_by"), constraints: constraints
-  get "/users/:screen_name/retweeted_by/:screen_name_b" => redirect("/%{screen_name}/retweeted_by/%{screen_name_b}"), constraints: constraints
-  get "/users/:screen_name/given_to" => redirect("/%{screen_name}/given_favorites_to"), constraints: constraints
-  get "/users/:screen_name/given_to/:screen_name_b" => redirect("/%{screen_name}/given_favorites_to/%{screen_name_b}"), constraints: constraints
+  # deprecated API
+  get "/users/best" => "tweets#best"
+  get "/users/recent" => "tweets#recent"
+  get "/users/timeline" => "tweets#timeline"
+  get "/users/discovered" => "tweets#discoveries"
 end