From e1e98d0229b8b79de2105515f0312903a23dc335 Mon Sep 17 00:00:00 2001 From: luca-marie Date: Wed, 24 Aug 2016 15:23:07 +0200 Subject: Update with Twitter --- app/helpers/twitter_helper.rb | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 app/helpers/twitter_helper.rb (limited to 'app/helpers/twitter_helper.rb') diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb new file mode 100644 index 0000000..bb3ed2d --- /dev/null +++ b/app/helpers/twitter_helper.rb @@ -0,0 +1,2 @@ +module TwitterHelper +end -- cgit v1.2.3 From fecc0e9e1985be2d3767664453d4776ac20897c0 Mon Sep 17 00:00:00 2001 From: luca-marie Date: Thu, 25 Aug 2016 20:50:12 +0200 Subject: Twitter controller now as helper, some more styling in CSS, bug fix --- app/helpers/twitter_helper.rb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'app/helpers/twitter_helper.rb') diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb index bb3ed2d..9fd4ffd 100644 --- a/app/helpers/twitter_helper.rb +++ b/app/helpers/twitter_helper.rb @@ -1,2 +1,24 @@ module TwitterHelper + + def twitter_client + Twitter::REST::Client.new do |config| + config.consumer_key = Rails.application.secrets.twitter['consumer_key'] + config.consumer_secret = Rails.application.secrets.twitter['consumer_secret'] + config.bearer_token = Rails.application.secrets.twitter['bearer_token'] + end + end + + def twitter_handle + Rails.application.secrets.twitter['twitter_handle'] + end + + def twitter_name + twitter_client.user(twitter_handle).name + end + + def tweets + twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false} + end end + +# unless Rails.application.secrets.twitter['enabled'] == false -- cgit v1.2.3 From e87d797cdbfe5ebe8dff789742adb6a82d92aae4 Mon Sep 17 00:00:00 2001 From: luca-marie Date: Fri, 26 Aug 2016 17:16:35 +0200 Subject: Small updates on method to check if twitter feed enabled --- app/helpers/twitter_helper.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'app/helpers/twitter_helper.rb') diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb index 9fd4ffd..b01293f 100644 --- a/app/helpers/twitter_helper.rb +++ b/app/helpers/twitter_helper.rb @@ -1,4 +1,7 @@ module TwitterHelper + def twitter_enabled + Rails.application.secrets.twitter['enabled'] == true + end def twitter_client Twitter::REST::Client.new do |config| @@ -20,5 +23,3 @@ module TwitterHelper twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false} end end - -# unless Rails.application.secrets.twitter['enabled'] == false -- cgit v1.2.3 From ea3fc6ffbb8f90aff28ce56fe4432a8d3ff18caa Mon Sep 17 00:00:00 2001 From: luca-marie Date: Mon, 29 Aug 2016 17:39:46 +0200 Subject: Changes mainly on CSS 'fine tuning' and shortening the Twitter API credentials, - only bearer token is needed to access Twitter API --- app/helpers/twitter_helper.rb | 2 -- 1 file changed, 2 deletions(-) (limited to 'app/helpers/twitter_helper.rb') diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb index b01293f..d20b7da 100644 --- a/app/helpers/twitter_helper.rb +++ b/app/helpers/twitter_helper.rb @@ -5,8 +5,6 @@ module TwitterHelper def twitter_client Twitter::REST::Client.new do |config| - config.consumer_key = Rails.application.secrets.twitter['consumer_key'] - config.consumer_secret = Rails.application.secrets.twitter['consumer_secret'] config.bearer_token = Rails.application.secrets.twitter['bearer_token'] end end -- cgit v1.2.3 From 92e7b90d619111fdaaf50ab0b8538c39605fe005 Mon Sep 17 00:00:00 2001 From: luca-marie Date: Thu, 1 Sep 2016 12:17:05 +0200 Subject: Updating the view and CSS, no pic and twitter handle in each tweet; Displaying only 3 most tweets --- app/helpers/twitter_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/helpers/twitter_helper.rb') diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb index d20b7da..834e5c6 100644 --- a/app/helpers/twitter_helper.rb +++ b/app/helpers/twitter_helper.rb @@ -18,6 +18,6 @@ module TwitterHelper end def tweets - twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false} + twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3) end end -- cgit v1.2.3 From 4a09c2df8df3db979049ee8d98b202ad9f2125a8 Mon Sep 17 00:00:00 2001 From: luca-marie Date: Thu, 8 Sep 2016 18:25:41 +0200 Subject: Helper has caching of name and tweets included now \o/ --- app/helpers/twitter_helper.rb | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) (limited to 'app/helpers/twitter_helper.rb') diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb index 834e5c6..fd3f82c 100644 --- a/app/helpers/twitter_helper.rb +++ b/app/helpers/twitter_helper.rb @@ -1,6 +1,8 @@ module TwitterHelper def twitter_enabled - Rails.application.secrets.twitter['enabled'] == true + if Rails.application.secrets.twitter + Rails.application.secrets.twitter['enabled'] == true + end end def twitter_client @@ -13,11 +15,32 @@ module TwitterHelper Rails.application.secrets.twitter['twitter_handle'] end + def twitter_user_info + $twitter_user_info ||= [] + end + + 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 + if Time.now > twitter_user_info[0] + 15.minutes + update_twitter_info + end + end + twitter_user_info + end + def twitter_name - twitter_client.user(twitter_handle).name + cached_info[1] end def tweets - twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3) + cached_info[2] end end -- cgit v1.2.3 From 2ef8707a7539622007b6d679a7708a5979594ff3 Mon Sep 17 00:00:00 2001 From: luca-marie Date: Tue, 13 Sep 2016 12:20:12 +0200 Subject: Cleaning CSS &view code, updating twitter helper with develop --- app/helpers/twitter_helper.rb | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) (limited to 'app/helpers/twitter_helper.rb') diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb index fd3f82c..0b8f79c 100644 --- a/app/helpers/twitter_helper.rb +++ b/app/helpers/twitter_helper.rb @@ -16,31 +16,42 @@ module TwitterHelper end def twitter_user_info - $twitter_user_info ||= [] + $twitter_user_info ||= [] end - 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 + def twitter_name if twitter_user_info[0] == nil update_twitter_info else - if Time.now > twitter_user_info[0] + 15.minutes + if Time.now > twitter_user_info[0] + 120.minutes update_twitter_info end end - twitter_user_info + twitter_user_info[1] end - def twitter_name - cached_info[1] + 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] end - def tweets - cached_info[2] + 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 -- cgit v1.2.3 From 782be39862394c05a069eab9b7dd8f6779354917 Mon Sep 17 00:00:00 2001 From: luca-marie Date: Tue, 13 Sep 2016 17:26:51 +0200 Subject: Change in code for caching --- app/helpers/twitter_helper.rb | 37 +++++++++++++------------------------ 1 file changed, 13 insertions(+), 24 deletions(-) (limited to 'app/helpers/twitter_helper.rb') diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb index 0b8f79c..f824a03 100644 --- a/app/helpers/twitter_helper.rb +++ b/app/helpers/twitter_helper.rb @@ -19,39 +19,28 @@ module TwitterHelper $twitter_user_info ||= [] end - def twitter_name - if twitter_user_info[0] == nil - update_twitter_info - else - if Time.now > twitter_user_info[0] + 120.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 + twitter_user_info[2] = twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3) end - def twitter_tweets - $twitter_tweets ||= [] - end - - def twitter_timeline - if twitter_tweets[0] == nil - update_twitter_timeline + def cached_info + if twitter_user_info[0] == nil + update_twitter_info else - if Time.now > twitter_tweets[0] + 15.minutes - update_twitter_timeline + if Time.now > twitter_user_info[0] + 15.minutes + update_twitter_info end end - twitter_tweets[1] + twitter_user_info + end + + 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 -- cgit v1.2.3