From b4972590475eb595bc88f6ee47125fe8ca6e1fb2 Mon Sep 17 00:00:00 2001
From: re4k <re4k@re4k.info>
Date: Thu, 28 Mar 2013 00:48:32 +0900
Subject: Fix errors Add some JSON APIs

---
 config/routes.rb | 45 ++++++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

(limited to 'config/routes.rb')

diff --git a/config/routes.rb b/config/routes.rb
index c175f0e..73abb83 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -17,7 +17,6 @@ Aclog::Application.routes.draw do
   get "/about/api" => "main#api"
 
   # internals
-  get "/i" => redirect("/")
   get "/i/callback" => "sessions#callback"
   get "/i/logout" => "sessions#destroy"
 
@@ -26,28 +25,32 @@ Aclog::Application.routes.draw do
   get "/i/recent" => "i#recent"
   get "/i/timeline" => "i#timeline"
 
-  # user
-  get "/i/show" => "users#show", :constraints => constraints
+  get "/i/show" => "users#show"
+  get "/i/:id" => "users#show", :constraints => constraints
 
-  get "/users/best" => "users#best", :constraints => constraints
-  get "/users/recent" => "users#recent", :constraints => constraints
-  get "/users/timeline" => "users#timeline", :constraints => constraints
-  get "/users/discovered" => "users#discovered", :constraints => constraints
+  # i -- end
+  get "/i(/:none)" => redirect("/")
 
-  get "/i/:id" => "users#show", :constraints => constraints
+  # 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"
 
   get "/:screen_name(/:page)" => "users#best", :constraints => constraints
   get "/:screen_name/:order(/:page)" => "users#best", :constraints => constraints
-
   get "/:screen_name/recent(/:page)" => "users#recent", :constraints => constraints
   get "/:screen_name/recent/:order(/:page)" => "users#recent", :constraints => constraints
-
   get "/:screen_name/timeline(/:page)" => "users#timeline", :constraints => constraints
   get "/:screen_name/timeline/all(/:page)" => "users#timeline", :constraints => constraints, :defaults => {:all => "true"}
-
   get "/:screen_name/discovered(/:page)" => "users#discovered", :constraints => constraints
   get "/:screen_name/discovered/:tweets(/:page)" => "users#discovered", :constraints => constraints
-
   get "/:screen_name/info" => "users#info", :constraints => constraints
   get "/:screen_name/favorited_by(/:screen_name_b)" => "users#favorited_by", :constraints => constraints
   get "/:screen_name/retweeted_by(/:screen_name_b)" => "users#retweeted_by", :constraints => constraints
@@ -55,13 +58,13 @@ Aclog::Application.routes.draw do
   get "/:screen_name/given_retweets_to(/:screen_name_b)" => "users#given_retweets_to", :constraints => constraints
 
   # redirects
-  get "/(users)/:screen_name/status(es)/:id" => redirect("/i/%{id}")
-  get "/users/:screen_name" => redirect("/%{screen_name}")
-  get "/users/:screen_name/most_favorited" => redirect("/%{screen_name}/favorite")
-  get "/users/:screen_name/most_retweeted" => redirect("/%{screen_name}/retweet")
-  get "/users/:screen_name/discovered" => redirect("/%{screen_name}/discovered")
-  get "/users/:screen_name/recent" => redirect("/%{screen_name}/timeline")
-  get "/users/:screen_name/favs_from(/:screen_name_b)" => redirect("/%{screen_name}/favorited_by/%{screen_name_b}")
-  get "/users/:screen_name/retweeted_by(/:screen_name_b)" => redirect("/%{screen_name}/retweeted_by/%{screen_name_b}")
-  get "/users/:screen_name/given_to(/:screen_name_b)" => redirect("/%{screen_name}/given_favorites_to/%{screen_name_b}")
+  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/recent" => redirect("/%{screen_name}/timeline"), :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(/:screen_name_b)" => redirect("/%{screen_name}/retweeted_by/%{screen_name_b}"), :constraints => constraints
+  get "/users/:screen_name/given_to(/:screen_name_b)" => redirect("/%{screen_name}/given_favorites_to/%{screen_name_b}"), :constraints => constraints
 end
-- 
cgit v1.2.3