refactor

31 files changed, 138 insertions, 51 deletions

diff --git a/app/views/errors/error_404.json.jbuilder b/app/views/errors/error_404.json.jbuilder
new file mode 100644
index 0000000..a58331f
--- /dev/null
+++ b/app/views/errors/error_404.json.jbuilder
@@ -0,0 +1,4 @@
+json.error do |json|
+  json.status 404
+  json.message "Not found"
+end
diff --git a/app/views/errors/error_500.json.jbuilder b/app/views/errors/error_500.json.jbuilder
new file mode 100644
index 0000000..1cb2a1b
--- /dev/null
+++ b/app/views/errors/error_500.json.jbuilder
@@ -0,0 +1,4 @@
+json.error do |json|
+  json.status 500
+  json.message "Internal error"
+end
diff --git a/app/views/i/_list.html.haml b/app/views/i/_list.html.haml
new file mode 100644
index 0000000..91a14b4
--- /dev/null
+++ b/app/views/i/_list.html.haml
@@ -0,0 +1,2 @@
+.items
+  = render :partial => "shared/tweet", :collection => @items, :as => :item
diff --git a/app/views/i/best.html.haml b/app/views/i/best.html.haml
new file mode 100644
index 0000000..1410df9
--- /dev/null
+++ b/app/views/i/best.html.haml
@@ -0,0 +1 @@
+= render :partial => "list"
diff --git a/app/views/i/recent.html.haml b/app/views/i/recent.html.haml
new file mode 100644
index 0000000..1410df9
--- /dev/null
+++ b/app/views/i/recent.html.haml
@@ -0,0 +1 @@
+= render :partial => "list"
diff --git a/app/views/i/show.haml b/app/views/i/show.haml
deleted file mode 100644
index 2672287..0000000
--- a/app/views/i/show.haml
+++ /dev/null
@@ -1 +0,0 @@
-= render :partial => "shared/tweets", :locals => {:items => @items}
diff --git a/app/views/layouts/application.haml b/app/views/layouts/application.html.haml
index b36d91a..5627ac7 100644
--- a/app/views/layouts/application.haml
+++ b/app/views/layouts/application.html.haml
@@ -7,7 +7,7 @@
     .container
       .left
         %h1><
-          Aclog
+          = link_to "Aclog", :controller => "main", :action => "index"
         %div
           - if session[:screen_name]
             %span= link_to "@#{session[:screen_name]}", :controller => "users", :action => "best", :screen_name => session[:screen_name]
diff --git a/app/views/main/index.haml b/app/views/main/index.haml
deleted file mode 100644
index bf7e2eb..0000000
--- a/app/views/main/index.haml
+++ /dev/null
@@ -1,29 +0,0 @@
-%p
-  %strong (´へεへ`*) ＜ トップページだよ〜〜
-%p
-  Favstar クローンです。UserStreams つかってます。
-  = link_to "@KOBA789", "https://twitter.com/KOBA789"
-  さんにサーバーを貸していただけることになりました…！！ありがとうございます！ありがとうございます！！！
-%strong まだ開発途中段階のものです。うごかなかったらごめんね
-%strong 動作のテスト中ですので、途中で登録をうちきったりあまりにふぁぼられ・ふぁぼりが多いユーザーの登録を削除する可能性もあります。
-%div
-  URLとかについて
-  %div
-    best:
-    = link_to "/cat", "/cat"
-  %div
-    recent:
-    = link_to "/cat/recent", "/cat/recent"
-  %div
-    timeline(exclude RTs):
-    = link_to "/cat/timeline", "/cat/timeline"
-  %div
-    discovery:
-    = link_to "/cat/my", "/cat/my"
-  %div
-    こんどほかのところもFavstar互換にする
-  %div
-    API つくりたいですねﾊｲ
-%div
-  = link_to "@cat", "https://twitter.com/cat"
-
diff --git a/app/views/main/index.html.haml b/app/views/main/index.html.haml
new file mode 100644
index 0000000..dfebde1
--- /dev/null
+++ b/app/views/main/index.html.haml
@@ -0,0 +1,42 @@
+%p
+  %strong (´へεへ`*) ＜ トップページだよ〜〜
+%p
+  Favstar クローンです。UserStreams つかってます。
+  = link_to "@KOBA789", "https://twitter.com/KOBA789"
+  さんにサーバーを貸していただけることになりました…！！ありがとうございます！ありがとうございます！！！
+%p
+  %strong まだ開発途中段階のものです。うごかなかったらごめんね
+%p
+  Read/Write 要求するけど今のところ UserStreams しか使ってないです。こんど Favstar みたいにページ内から Fav/RT できるようにしたいなあと…
+%p
+  %strong 動作のテスト中ですので、途中で登録をうちきったりあまりにふぁぼられ・ふぁぼりが多いユーザーの登録を削除する可能性もあります。
+%p
+  登録ユーザーだったら一番下に統計（？）が表示されてるんじゃないですかね
+%div
+  URLとかについて
+  %div
+    best:
+    = link_to "/cat", "/cat"
+  %div
+    recent(最新3日のbest):
+    = link_to "/cat/recent", "/cat/recent"
+  %div
+    timeline(Favstar の Recent、ただ0Fav0RTも含む):
+    = link_to "/cat/timeline", "/cat/timeline"
+  %div
+    discovery:
+    = link_to "/cat/my", "/cat/my"
+  %div
+  %div
+    全体のbest:
+    = link_to "/i/best", "/i/best"
+  %div
+    全体の最新3日のbest
+    = link_to "/i/recent", "/i/recent"
+  %div
+    URL 変えちゃうかもしれないです
+  %div
+    API つくりたいですねﾊｲ
+%div
+  = link_to "@cat", "https://twitter.com/cat"
+
diff --git a/app/views/shared/_tweet.haml b/app/views/shared/_tweet.html.haml
index 2f7adb2..e706079 100644
--- a/app/views/shared/_tweet.haml
+++ b/app/views/shared/_tweet.html.haml
@@ -15,7 +15,7 @@
         %span.twitter_bird
           = link_to image_tag("bird_gray_16.png", :alt => "Twitter"), twitter_status_url(item), :target => "_blank"
         %span.created_at
-          = link_to format_tweet_created_at(item.tweeted_at), :controller => "i", :action => "show", :id => item.id
+          = link_to format_tweet_created_at(item.tweeted_at), :controller => "users", :action => "show", :id => item.id
         %span.source
           = raw format_source_text(item.source)
   .stats
@@ -26,7 +26,7 @@
           %span.type= type
         .height_fix
         %ul.favoriters.clearfix
-          - actions.take(params[:controller] == "i" && params[:action] == "show" ? actions.size : 20).each do |a| |
+          - actions.take(params[:controller] == "users" && params[:action] == "show" ? actions.size : 20).each do |a| |
           -   m = a.user || User.new
             %li
               - if m.screen_name
diff --git a/app/views/shared/_tweet.json.jbuilder b/app/views/shared/_tweet.json.jbuilder
new file mode 100644
index 0000000..a6c22ae
--- /dev/null
+++ b/app/views/shared/_tweet.json.jbuilder
@@ -0,0 +1,19 @@
+json.(item, :id, :text, :source, :tweeted_at, :favorites_count, :retweets_count)
+
+json.user do |json|
+  json.partial! "shared/user", :user => item.user
+end
+
+unless @trim_user
+  json.favorites item.favorites.order("id") do |json, favorite|
+    json.user do |json|
+      json.partial! "shared/user", :user => favorite.user || User.new
+    end
+  end
+  json.retweets item.retweets.order("id") do |json, retweet|
+    json.id retweet.id
+    json.user do |json|
+      json.partial! "shared/user", :user => retweet.user || User.new
+    end
+  end
+end
diff --git a/app/views/shared/_tweets.haml b/app/views/shared/_tweets.haml
deleted file mode 100644
index 681b9cc..0000000
--- a/app/views/shared/_tweets.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-.items
-  = render :partial => "shared/tweet", :collection => items, :as => :item, :local => {:showallusers => @showallusers}
-- if items.size > 0
-  = paginate items
diff --git a/app/views/shared/_user.json.jbuilder b/app/views/shared/_user.json.jbuilder
new file mode 100644
index 0000000..a0447c0
--- /dev/null
+++ b/app/views/shared/_user.json.jbuilder
@@ -0,0 +1,2 @@
+json.(user, :id, :screen_name, :name, :profile_image_url)
+
diff --git a/app/views/shared/_user_info.html.haml b/app/views/shared/_user_info.html.haml
new file mode 100644
index 0000000..6188bdc
--- /dev/null
+++ b/app/views/shared/_user_info.html.haml
@@ -0,0 +1,17 @@
+- if user.registered?
+  %ul
+    %li
+      Tweets: 
+      = user.tweets.length
+    %li
+      Favorites:
+      = user.favorites.length
+    %li
+      Retweets:
+      = user.retweets.length
+    %li
+      Favorited:
+      = user.tweets.inject(0){|s, m| s + m.favorites_count}
+    %li
+      Retweeted:
+      = user.tweets.inject(0){|s, m| s + m.retweets_count}
diff --git a/app/views/shared/_user_nav.html.haml b/app/views/shared/_user_nav.html.haml
new file mode 100644
index 0000000..93c7d35
--- /dev/null
+++ b/app/views/shared/_user_nav.html.haml
@@ -0,0 +1,11 @@
+- if user
+  .links
+    %ul
+      %li
+        = link_to "Best", :controller => "users", :action => "best", :screen_name => user.screen_name
+      %li
+        = link_to "Recent", :controller => "users", :action => "recent", :screen_name => user.screen_name
+      %li
+        = link_to "Timeline", :controller => "users", :action => "timeline", :screen_name => user.screen_name
+      %li
+        = link_to "Discovered", :controller => "users", :action => "my", :screen_name => user.screen_name
diff --git a/app/views/users/_list.html.haml b/app/views/users/_list.html.haml
new file mode 100644
index 0000000..3147f1b
--- /dev/null
+++ b/app/views/users/_list.html.haml
@@ -0,0 +1,6 @@
+= render :partial => "shared/user_nav", :locals => {:user => @user}
+.items
+  = render :partial => "shared/tweet", :collection => @items, :as => :item
+- if @items
+  = paginate @items
+= render :partial => "shared/user_info", :locals => {:user => @user}
diff --git a/app/views/users/best.haml b/app/views/users/best.haml
deleted file mode 100644
index 2672287..0000000
--- a/app/views/users/best.haml
+++ /dev/null
@@ -1 +0,0 @@
-= render :partial => "shared/tweets", :locals => {:items => @items}
diff --git a/app/views/users/best.html.haml b/app/views/users/best.html.haml
new file mode 100644
index 0000000..1410df9
--- /dev/null
+++ b/app/views/users/best.html.haml
@@ -0,0 +1 @@
+= render :partial => "list"
diff --git a/app/views/users/best.json.jbuilder b/app/views/users/best.json.jbuilder
new file mode 100644
index 0000000..d2637d3
--- /dev/null
+++ b/app/views/users/best.json.jbuilder
@@ -0,0 +1,4 @@
+json.array! @items do |json, item|
+  json.partial! "shared/tweet", :item => item
+end
+
diff --git a/app/views/users/info.haml b/app/views/users/info.haml
deleted file mode 100644
index e326422..0000000
--- a/app/views/users/info.haml
+++ /dev/null
@@ -1,10 +0,0 @@
-Tweets: 
-  = @tweets_count
-Favorite:
-  = @favorites_count
-Retweets:
-  = @retweets_count
-Favorited:
-  = @favorited_count
-Retweetted:
-  = @retweeted_count
diff --git a/app/views/users/my.haml b/app/views/users/my.haml
deleted file mode 100644
index 2672287..0000000
--- a/app/views/users/my.haml
+++ /dev/null
@@ -1 +0,0 @@
-= render :partial => "shared/tweets", :locals => {:items => @items}
diff --git a/app/views/users/my.html.haml b/app/views/users/my.html.haml
new file mode 100644
index 0000000..1410df9
--- /dev/null
+++ b/app/views/users/my.html.haml
@@ -0,0 +1 @@
+= render :partial => "list"
diff --git a/app/views/users/my.json.jbuilder b/app/views/users/my.json.jbuilder
new file mode 100644
index 0000000..d2637d3
--- /dev/null
+++ b/app/views/users/my.json.jbuilder
@@ -0,0 +1,4 @@
+json.array! @items do |json, item|
+  json.partial! "shared/tweet", :item => item
+end
+
diff --git a/app/views/users/recent.haml b/app/views/users/recent.haml
deleted file mode 100644
index 2672287..0000000
--- a/app/views/users/recent.haml
+++ /dev/null
@@ -1 +0,0 @@
-= render :partial => "shared/tweets", :locals => {:items => @items}
diff --git a/app/views/users/recent.html.haml b/app/views/users/recent.html.haml
new file mode 100644
index 0000000..1410df9
--- /dev/null
+++ b/app/views/users/recent.html.haml
@@ -0,0 +1 @@
+= render :partial => "list"
diff --git a/app/views/users/recent.json.jbuilder b/app/views/users/recent.json.jbuilder
new file mode 100644
index 0000000..d2637d3
--- /dev/null
+++ b/app/views/users/recent.json.jbuilder
@@ -0,0 +1,4 @@
+json.array! @items do |json, item|
+  json.partial! "shared/tweet", :item => item
+end
+
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
new file mode 100644
index 0000000..f56e0c0
--- /dev/null
+++ b/app/views/users/show.html.haml
@@ -0,0 +1,4 @@
+= render :partial => "shared/user_nav", :locals => {:user => @user}
+.items
+  = render :partial => "shared/tweet", :locals => {:item => @item}
+= render :partial => "shared/user_info", :locals => {:user => @user}
diff --git a/app/views/users/show.json.jbuilder b/app/views/users/show.json.jbuilder
new file mode 100644
index 0000000..049306e
--- /dev/null
+++ b/app/views/users/show.json.jbuilder
@@ -0,0 +1,2 @@
+json.partial! "shared/tweet", :item => @items.first
+
diff --git a/app/views/users/timeline.haml b/app/views/users/timeline.haml
deleted file mode 100644
index 2672287..0000000
--- a/app/views/users/timeline.haml
+++ /dev/null
@@ -1 +0,0 @@
-= render :partial => "shared/tweets", :locals => {:items => @items}
diff --git a/app/views/users/timeline.html.haml b/app/views/users/timeline.html.haml
new file mode 100644
index 0000000..1410df9
--- /dev/null
+++ b/app/views/users/timeline.html.haml
@@ -0,0 +1 @@
+= render :partial => "list"
diff --git a/app/views/users/timeline.json.jbuilder b/app/views/users/timeline.json.jbuilder
new file mode 100644
index 0000000..d2637d3
--- /dev/null
+++ b/app/views/users/timeline.json.jbuilder
@@ -0,0 +1,4 @@
+json.array! @items do |json, item|
+  json.partial! "shared/tweet", :item => item
+end
+