diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/images/Twitter_Logo_White_On_Blue.png | bin | 4861 -> 0 bytes | |||
| -rw-r--r-- | app/assets/images/rails.png | bin | 0 -> 6646 bytes | |||
| -rw-r--r-- | app/assets/stylesheets/twitter.scss | 8 | ||||
| -rw-r--r-- | app/helpers/twitter_helper.rb | 35 | ||||
| -rw-r--r-- | app/views/home/index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/twitter/_index.html.erb | 19 |
6 files changed, 19 insertions, 45 deletions
diff --git a/app/assets/images/Twitter_Logo_White_On_Blue.png b/app/assets/images/Twitter_Logo_White_On_Blue.png Binary files differdeleted file mode 100644 index 25ba09f..0000000 --- a/app/assets/images/Twitter_Logo_White_On_Blue.png +++ /dev/null diff --git a/app/assets/images/rails.png b/app/assets/images/rails.png Binary files differnew file mode 100644 index 0000000..d5edc04 --- /dev/null +++ b/app/assets/images/rails.png diff --git a/app/assets/stylesheets/twitter.scss b/app/assets/stylesheets/twitter.scss index b2481db..b2233d0 100644 --- a/app/assets/stylesheets/twitter.scss +++ b/app/assets/stylesheets/twitter.scss @@ -13,7 +13,7 @@ position: absolute; } -.twitter_pic { +.twitter_image_frame { display: block; width: 40px; height: 40px; @@ -23,12 +23,6 @@ top: 0; } -.twitter_image_frame { - width: 40px; - height: 40px; - overflow: hidden - } - .twitter_image_frame > img { display: block; position: absolute; diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb index a5e7ae4..f824a03 100644 --- a/app/helpers/twitter_helper.rb +++ b/app/helpers/twitter_helper.rb @@ -19,7 +19,13 @@ module TwitterHelper $twitter_user_info ||= [] end - def twitter_name + def update_twitter_info + twitter_user_info[0] = Time.now + twitter_user_info[1] = twitter_client.user(twitter_handle).name + twitter_user_info[2] = twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3) + end + + def cached_info if twitter_user_info[0] == nil update_twitter_info else @@ -27,31 +33,14 @@ module TwitterHelper update_twitter_info end end - twitter_user_info[1] + twitter_user_info end - def update_twitter_info - twitter_user_info[0] = Time.now - twitter_user_info[1] = twitter_client.user(twitter_handle).name - end - - def twitter_tweets - $twitter_tweets ||= [] - end - - def twitter_timeline - if twitter_tweets[0] == nil - update_twitter_timeline - else - if Time.now > twitter_tweets[0] + 15.minutes - update_twitter_timeline - end - end - twitter_tweets[1] + def twitter_name + cached_info[1] end - def update_twitter_timeline - twitter_tweets[0] = Time.now - twitter_tweets[1] = twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3) + def tweets + cached_info[2] end end diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 5e33e62..147cacd 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -6,4 +6,4 @@ #push -# #push is used for sticky footer in bootstrap 2. remove when upgrading to bootstrap 3 #footer - = render 'layouts/footer' + = render 'layouts/footer'
\ No newline at end of file diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb index ba618b3..a7ebd1b 100644 --- a/app/views/twitter/_index.html.erb +++ b/app/views/twitter/_index.html.erb @@ -1,24 +1,15 @@ <% if twitter_enabled == true %> <div class="twitter"> - <div class="twitter_header"> - <div class="twitter_id"> - <div class="twitter_pic twitter_image_frame"><%= image_tag("Twitter_Logo_White_On_Blue.png") %></div> - <div class="twitter_name"><%= twitter_name%><br><a href="https://twitter.com/loadtocode">@<%= twitter_handle %></a></div> - </div> - </div> - - <!-- <div class="twitter_header"> - <p>These are the most recent tweets by <%= twitter_name%></p> - + <div class="twitter_header"> <div class="twitter_id"> - <div class="twitter_pic twitter_image_frame"><%= image_tag("Twitter_Logo_White_On_Blue.png") %></div> - <div class="twitter_name"><a href="https://twitter.com/loadtocode">@<%= twitter_handle %></a></div> + <div class="twitter_image_frame"><%= image_tag("Twitter_Logo_Blue.png") %></div> + <div class="twitter_name"><%= twitter_name%><br><a href="https://twitter.com/loadtocode">@<%= twitter_handle %></a></div> </div> - </div> --> + </div> <div class="twitter_list"> - <% twitter_timeline.each do |e| %> + <% tweets.each do |e| %> <div class="tweet"> <div class="tweet_text"><%= " #{e.text}" %> </div> |
