From 667d88c12805d2a1f5b62b9ff4e04d6e9ba595fe Mon Sep 17 00:00:00 2001 From: re4k Date: Mon, 22 Apr 2013 00:10:18 +0900 Subject: Unify format of hash, refactor some controller/helper methods --- config/routes.rb | 78 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) (limited to 'config/routes.rb') diff --git a/config/routes.rb b/config/routes.rb index 62c89a1..4d15ffa 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,17 +1,17 @@ Aclog::Application.routes.draw do constraints = { - :id => /[0-9]+/, - :user_id => /[0-9]+/, - :screen_name => /[a-zA-Z0-9_]{1,20}/, - :screen_name_b => /[a-zA-Z0-9_]{1,20}/, - :page => /[0-9]+/, - :count => /[0-9]+/, - :tweets => /(all|fav(orite[sd]?|(or)?ed|s)?|re?t(weet(s|ed)?|s)?)/, - :order => /(fav(orite[sd]?|(or)?ed|s)?|re?t(weet(s|ed)?|s)?)/, + id: /[0-9]+/, + user_id: /[0-9]+/, + screen_name: /[a-zA-Z0-9_]{1,20}/, + screen_name_b: /[a-zA-Z0-9_]{1,20}/, + page: /[0-9]+/, + count: /[0-9]+/, + tweets: /(all|fav(orite[sd]?|(or)?ed|s)?|re?t(weet(s|ed)?|s)?)/, + order: /(fav(orite[sd]?|(or)?ed|s)?|re?t(weet(s|ed)?|s)?)/, } # static - root :to => "main#index" + root to: "main#index" get "/about" => "main#about" get "/about/api" => "main#api" @@ -24,12 +24,12 @@ Aclog::Application.routes.draw do get "/i/recent" => "i#recent" get "/i/timeline" => "i#timeline" + get "/i/favoriters" => "users#favoriters", format: :json + get "/i/:id" => "users#show", constraints: constraints, as: "tweet" get "/i/show" => "users#show" - get "/i/favoriters" => "users#favoriters", :format => :json - get "/i/:id" => "users#show", :constraints => constraints # report - get "/i/report" => "report#index" + get "/i/report" => "report#index", as: "report" post "/i/report/tweet" => "report#tweet" get "/search" => "search#search" @@ -49,33 +49,33 @@ Aclog::Application.routes.draw do 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/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 - get "/:screen_name/given_favorites_to(/:screen_name_b)" => "users#given_favorites_to", :constraints => constraints - get "/:screen_name/given_retweets_to(/:screen_name_b)" => "users#given_retweets_to", :constraints => constraints + get "/:screen_name(/:page)" => "users#best", constraints: constraints, as: "user" + get "/:screen_name/:order(/:page)" => "users#best", constraints: constraints + get "/:screen_name/recent(/:page)" => "users#recent", constraints: constraints, as: "recent" + get "/:screen_name/recent/:order(/:page)" => "users#recent", constraints: constraints + get "/:screen_name/timeline(/:page)" => "users#timeline", constraints: constraints, as: "timeline" + get "/:screen_name/discovered(/:page)" => "users#discovered", constraints: constraints, as: "discovered" + get "/:screen_name/discovered/:tweets(/:page)" => "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" # 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 + 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 end -- cgit v1.2.3