From 6f255766d993672d8de17081fae4140564edb989 Mon Sep 17 00:00:00 2001
From: thea <ta.kupler@gmail.com>
Date: Tue, 6 Sep 2016 15:32:51 +0200
Subject: included extra methods to have the twitter call for twitter name only
 have happening at one place

---
 app/helpers/twitter_helper.rb | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb
index 1081c05..035d75c 100644
--- a/app/helpers/twitter_helper.rb
+++ b/app/helpers/twitter_helper.rb
@@ -15,8 +15,24 @@ module TwitterHelper
     Rails.application.secrets.twitter['twitter_handle']
   end
 
+  def twitter_user_info
+      $twitter_user_info ||= []
+  end
+
   def twitter_name
-    twitter_client.user(twitter_handle).name
+    if twitter_user_info[0] == nil
+      update_twitter_info
+    else
+      if Time.now > twitter_user_info[0] + 15.minutes
+        update_twitter_info
+      end
+    end
+    twitter_user_info[1]
+  end
+
+  def update_twitter_info
+    twitter_user_info[0] = Time.now
+    twitter_user_info[1] = twitter_client.user(twitter_handle).name
   end
 
   def tweets
-- 
cgit v1.2.3


From b62bc48bc3bfbd2781cef16d210749ded8d96c37 Mon Sep 17 00:00:00 2001
From: thea <ta.kupler@gmail.com>
Date: Wed, 7 Sep 2016 16:22:20 +0200
Subject: changed naming for tweets-method in _index and included time-checking
 and a twitter call will only be made every 15 minutes

---
 app/helpers/twitter_helper.rb     | 20 ++++++++++++++++++--
 app/views/twitter/_index.html.erb |  2 +-
 2 files changed, 19 insertions(+), 3 deletions(-)

(limited to 'app')

diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb
index 035d75c..a5e7ae4 100644
--- a/app/helpers/twitter_helper.rb
+++ b/app/helpers/twitter_helper.rb
@@ -35,7 +35,23 @@ module TwitterHelper
     twitter_user_info[1] = twitter_client.user(twitter_handle).name
   end
 
-  def tweets
-    twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3)
+  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]
+  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)
   end
 end
diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index 2d17aad..ac10aa4 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -11,7 +11,7 @@
       </div>
 
       <div class="twitter_list">
-        <% tweets.each do |e| %>
+        <% twitter_timeline.each do |e| %>
           <div class="tweet">
             <div class="tweet_text"><%= " #{e.text}" %>
             </div>
-- 
cgit v1.2.3