From 4a09c2df8df3db979049ee8d98b202ad9f2125a8 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
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(-)

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 3408ac694a60df0380a3bf444077165a1f30e87e Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Fri, 9 Sep 2016 13:19:51 +0200
Subject: Added changes in css, view and main view file, as well as default
 avatar is now set as twitter official logo (added 2 official twitter logo
 images; changed footer text.

---
 app/assets/images/Twitter_Logo_Blue.png            | Bin 0 -> 4298 bytes
 app/assets/images/Twitter_Logo_White_On_Blue.png   | Bin 0 -> 4861 bytes
 app/assets/images/rails.png                        | Bin 6646 -> 0 bytes
 app/assets/images/team-loadtocode-Loading_icon.gif | Bin 17490 -> 0 bytes
 app/assets/stylesheets/twitter.scss                |  32 +++++++++-------
 app/views/home/_content.html.haml                  |   4 +-
 app/views/twitter/_index.html.erb                  |  41 ++++++++++++---------
 7 files changed, 45 insertions(+), 32 deletions(-)
 create mode 100644 app/assets/images/Twitter_Logo_Blue.png
 create mode 100644 app/assets/images/Twitter_Logo_White_On_Blue.png
 delete mode 100644 app/assets/images/rails.png
 delete mode 100644 app/assets/images/team-loadtocode-Loading_icon.gif

diff --git a/app/assets/images/Twitter_Logo_Blue.png b/app/assets/images/Twitter_Logo_Blue.png
new file mode 100644
index 0000000..b5eebc8
Binary files /dev/null and b/app/assets/images/Twitter_Logo_Blue.png differ
diff --git a/app/assets/images/Twitter_Logo_White_On_Blue.png b/app/assets/images/Twitter_Logo_White_On_Blue.png
new file mode 100644
index 0000000..25ba09f
Binary files /dev/null and b/app/assets/images/Twitter_Logo_White_On_Blue.png differ
diff --git a/app/assets/images/rails.png b/app/assets/images/rails.png
deleted file mode 100644
index d5edc04..0000000
Binary files a/app/assets/images/rails.png and /dev/null differ
diff --git a/app/assets/images/team-loadtocode-Loading_icon.gif b/app/assets/images/team-loadtocode-Loading_icon.gif
deleted file mode 100644
index a718bd8..0000000
Binary files a/app/assets/images/team-loadtocode-Loading_icon.gif and /dev/null differ
diff --git a/app/assets/stylesheets/twitter.scss b/app/assets/stylesheets/twitter.scss
index 89cdecf..b2481db 100644
--- a/app/assets/stylesheets/twitter.scss
+++ b/app/assets/stylesheets/twitter.scss
@@ -3,9 +3,10 @@
 }
 
 .twitter_header {
-  font-size: 20px;
+  font-size: 16px;
   text-align: left;
-  margin-bottom: 80px;
+  margin-bottom: 55px;
+  padding: 10px 8px;
 }
 
 .twitter_id {
@@ -25,28 +26,29 @@
 .twitter_image_frame {
   width: 40px;
   height: 40px;
-  overflow: hidden;
+  overflow: hidden
   }
 
-.twitter_name {
-  padding-left: 65px;
-  line-height: 40px;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  font-size: 20px;
-}
-
 .twitter_image_frame > img {
   display: block;
   position: absolute;
   top: 0;
   bottom: 0;
-  left: 0;
+  left: 30;
   width: 100%;
   margin: auto;
   }
 
+.twitter_name {
+  padding-left: 55px;
+  line-height: 20px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  font-size: 16px;
+}
+
+// Body = displays tweets
 .twitter_list {
   box-sizing: border-box;
 }
@@ -70,5 +72,7 @@ box-sizing: border-box;
 .twitter_footer {
   border-top-style: solid;
   border-color: lightgrey;
-  padding-top: 8px;
+  padding: 10px 8px;
+  font-style: italic;
+  font-size: 12px;
 }
diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml
index ecd8524..5341189 100644
--- a/app/views/home/_content.html.haml
+++ b/app/views/home/_content.html.haml
@@ -1,4 +1,4 @@
-.col-md-9
+.col-md-8
   .row
     %h1= t(:welcome, :provider => APP_CONFIG[:domain])
     .p=t(:welcome_message_html)
@@ -6,6 +6,8 @@
   .row
     = home_page_buttons
 
+.col-md-1
+
 .col-md-3
   .row
     = render 'twitter/index'
diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index 2d17aad..2cba033 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -1,30 +1,37 @@
 <% if twitter_enabled == true %>
   <div class="twitter">
 
-      <div class="twitter_header">
-        <p>These are the most recent tweets by </br><%= 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"><%= 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_id">
-          <div class="twitter_pic twitter_image_frame"><%= image_tag("rails.png") %></div>
+          <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>
-      </div>
+      </div> -->
 
-      <div class="twitter_list">
-        <% tweets.each do |e| %>
-          <div class="tweet">
-            <div class="tweet_text"><%= " #{e.text}" %>
-            </div>
-
-            <div class="tweet_text_date">tweeted on <% t = e.created_at%> <%= t.strftime("%m/%d/%y").to_s %>
-            </div>
+    <div class="twitter_list">
+      <% tweets.each do |e| %>
+        <div class="tweet">
+          <div class="tweet_text"><%= " #{e.text}" %>
+          </div>
 
+          <div class="tweet_text_date">tweeted on <% t = e.created_at%> <%= t.strftime("%m/%d/%y").to_s %>
           </div>
-        <% end %>
-      </div>
 
-      <div class="twitter_footer">
-        To prevent leakage no links are displayed. For more information visit @<%= twitter_name %> on twitter.com.</p>
-      </div>
+        </div>
+      <% end %>
+    </div>
+
+    <div class="twitter_footer">
+      <p>This feed uses a Ruby interface to access the Twitter API. Within LEAP Twitter does not track you.</p>
+    </div>
 </div>
 <% end %>
-- 
cgit v1.2.3


From a074684e2556841c75b8db48b10f01d8279c9873 Mon Sep 17 00:00:00 2001
From: thea <ta.kupler@gmail.com>
Date: Fri, 9 Sep 2016 14:53:18 +0200
Subject: changed times for twitter caching

---
 app/helpers/twitter_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb
index a5e7ae4..0b8f79c 100644
--- a/app/helpers/twitter_helper.rb
+++ b/app/helpers/twitter_helper.rb
@@ -23,7 +23,7 @@ module TwitterHelper
     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
-- 
cgit v1.2.3


From dcd20f9b532bc7490e45ddda68e228f4c9bf2b93 Mon Sep 17 00:00:00 2001
From: thea <ta.kupler@gmail.com>
Date: Fri, 9 Sep 2016 14:54:01 +0200
Subject: included script to invalidate token

---
 script/invalidate_bearer_token | 47 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100755 script/invalidate_bearer_token

diff --git a/script/invalidate_bearer_token b/script/invalidate_bearer_token
new file mode 100755
index 0000000..eda1c7d
--- /dev/null
+++ b/script/invalidate_bearer_token
@@ -0,0 +1,47 @@
+#!/usr/bin/env ruby
+
+require "net/http"
+require "uri"
+require "json"
+require "base64"
+require "optparse"
+
+options = {}
+
+option_parser = OptionParser.new do |opts|
+  opts.banner = "Invalidate your bearer_token for twitter by including the following [options]. The bearer token can't be used afterwards anymore. Please create a new bearer-token if you want to activate the twitter feature again."
+
+  opts.on("--key KEY", "consumer_key of your twitter application") do |key|
+    options[:conkey] = key
+  end
+
+  opts.on("--secret SECRET", "consumer_secret of your twitter application") do |secret|
+    options[:consec] = secret
+  end
+
+  opts.on("--token TOKEN", "bearer token for twitter") do |token|
+    options[:token] = token
+  end
+
+end
+
+option_parser.parse!
+
+if options[:conkey].nil? || options[:consec].nil? || options[:token].nil? then
+  puts option_parser
+  exit
+else
+  consumer_key = options[:conkey]
+  consumer_secret = options[:consec]
+  bearer_token = options[:token]
+end
+
+uri = URI("https://api.twitter.com/oauth2/invalidate_token")
+data = "access_token=#{bearer_token}"
+cre   = Base64.strict_encode64("#{consumer_key}:#{consumer_secret}")
+authorization_headers = { "Authorization" => "Basic #{cre}"}
+
+Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
+  response = http.request_post(uri, data, authorization_headers)
+  puts JSON.parse(response.body)
+end
-- 
cgit v1.2.3


From 2ef8707a7539622007b6d679a7708a5979594ff3 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Tue, 13 Sep 2016 12:20:12 +0200
Subject: Cleaning CSS &view code, updating twitter helper with develop

---
 app/assets/stylesheets/twitter.scss |  8 +-------
 app/helpers/twitter_helper.rb       | 39 ++++++++++++++++++++++-------------
 app/views/twitter/_index.html.erb   | 41 +++++++++++++++----------------------
 3 files changed, 42 insertions(+), 46 deletions(-)

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 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
diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index 2cba033..41fbf26 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -1,37 +1,28 @@
 <% 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_header">
+        <div class="twitter_id">
+          <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_header">
-        <p>These are the most recent tweets by <%= twitter_name%></p>
 
-        <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>
-      </div> -->
+      <div class="twitter_list">
+        <% twitter_timeline.each do |e| %>
+          <div class="tweet">
+            <div class="tweet_text"><%= " #{e.text}" %>
+            </div>
 
-    <div class="twitter_list">
-      <% tweets.each do |e| %>
-        <div class="tweet">
-          <div class="tweet_text"><%= " #{e.text}" %>
-          </div>
+            <div class="tweet_text_date">tweeted on <% t = e.created_at%> <%= t.strftime("%m/%d/%y").to_s %>
+            </div>
 
-          <div class="tweet_text_date">tweeted on <% t = e.created_at%> <%= t.strftime("%m/%d/%y").to_s %>
           </div>
+        <% end %>
+      </div>
 
-        </div>
-      <% end %>
-    </div>
-
-    <div class="twitter_footer">
-      <p>This feed uses a Ruby interface to access the Twitter API. Within LEAP Twitter does not track you.</p>
-    </div>
+      <div class="twitter_footer">
+        <p>This feed uses a Ruby interface to access the Twitter API. Within LEAP Twitter does not track you.</p>
+      </div>
 </div>
 <% end %>
-- 
cgit v1.2.3


From 0e46ed05ff0ab7b860e5bb8a4be99ae16474410d Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Tue, 13 Sep 2016 12:34:00 +0200
Subject: No need of 2nd Twitter img

---
 app/assets/images/Twitter_Logo_White_On_Blue.png | Bin 4861 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 app/assets/images/Twitter_Logo_White_On_Blue.png

diff --git a/app/assets/images/Twitter_Logo_White_On_Blue.png b/app/assets/images/Twitter_Logo_White_On_Blue.png
deleted file mode 100644
index 25ba09f..0000000
Binary files a/app/assets/images/Twitter_Logo_White_On_Blue.png and /dev/null differ
-- 
cgit v1.2.3


From 76fd906336e48751f6e4ce623ffdec801b4e2c92 Mon Sep 17 00:00:00 2001
From: thea <ta.kupler@gmail.com>
Date: Tue, 13 Sep 2016 12:42:40 +0200
Subject: included info about invalidate_bearer_token script

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 4d9ca39..4c2921a 100644
--- a/README.md
+++ b/README.md
@@ -213,3 +213,7 @@ LEAP web app (as part of the main view).
   * The full command looks like this: `script/generate_bearer_token --key your_consumerkey --secret your_consumersecret --projectroot your_projectroot --twitterhandle your_twitterhandle`
   * If you didn't give all your information to the script, had a typo or want to change anything else, please do so by finding the secrets-file at `/config/secrets.yml`
   * Make sure that the correct twitterhandle and bearer-token is included
+
+* Deactivate your bearer token
+  * To deactivate your generated bearer token you can run `script/invalidate_bearer_token`
+  * The full command looks like this: `script/invalidate_bearer_token --key your_consumerkey --secret your_consumersecret --token your_bearer_token`
-- 
cgit v1.2.3


From b26c4a45e3f4a82b30972c4b283a98a874bea216 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Tue, 13 Sep 2016 13:20:17 +0200
Subject: Deleting one twitter img, only one is needed

---
 app/assets/images/Twitter_Logo_White_On_Blue.png | Bin 4861 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 app/assets/images/Twitter_Logo_White_On_Blue.png

diff --git a/app/assets/images/Twitter_Logo_White_On_Blue.png b/app/assets/images/Twitter_Logo_White_On_Blue.png
deleted file mode 100644
index 25ba09f..0000000
Binary files a/app/assets/images/Twitter_Logo_White_On_Blue.png and /dev/null differ
-- 
cgit v1.2.3


From 4626157572bf20884cfad2b1fc0e24cd60bad918 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Tue, 13 Sep 2016 14:47:29 +0200
Subject: Added what was once deleted by mistake

---
 app/assets/images/rails.png | Bin 0 -> 6646 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 app/assets/images/rails.png

diff --git a/app/assets/images/rails.png b/app/assets/images/rails.png
new file mode 100644
index 0000000..d5edc04
Binary files /dev/null and b/app/assets/images/rails.png differ
-- 
cgit v1.2.3


From 45abd9751e3e7d5428bad81a433b85feae328a04 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Tue, 13 Sep 2016 15:16:20 +0200
Subject: Restructuring README and documentation in doc file

---
 README.md           | 29 ++---------------------------
 doc/TWITTER_FEED.md | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 27 deletions(-)
 create mode 100644 doc/TWITTER_FEED.md

diff --git a/README.md b/README.md
index 4d9ca39..923b239 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,7 @@ The LEAP Web App provides the following functions:
 * Webfinger access to user’s public keys
 * Email aliases and forwarding
 * Localized and Customizable documentation
+* Display of status updates from Twitter (access to tweets via Twitter API)
 
 Written in: Ruby, Rails.
 
@@ -36,6 +37,7 @@ For more information, see these files in the ``doc`` directory:
 * DEPLOY -- for notes on deployment.
 * DEVELOP -- for developer notes.
 * CUSTOM -- how to customize.
+* TWITTER_FEED -- how to use it.
 
 External docs:
 
@@ -186,30 +188,3 @@ Known problems
   attacks. These are very hard to prevent, because our protocol is
   designed to allow query of a user database via proxy in order to
   provide network perspective.
-
-Twitter Timeline on Main View
----------------------------
-
-This is a feature to include a twitter feed that displays most recent tweets
-of a (determined) twitter account (accessed via Twitter API).
-If you chose to use it, the feature gets included in `home/index` of
-LEAP web app (as part of the main view).
-
-* Create Twitter Application on https://apps.twitter.com/
-  * Visit https://apps.twitter.com/ and log in with the twitter account you want to use
-  * Make sure you have a mobile phone number registered with your account to be able to proceed
-  * Choose the option to `Create New App`
-  * Fill in Application Details and Developer Agreement and `Create your Twitter application`
-  * Choose the section "Keys and Access Tokens" to get your consumer key and consumer secret
-  * Optional: Go to section "Permissions" and change the "Access" from `Read and Write` (by default) to `Read only`
-  * Have your consumer key and secret by hand for one of the next steps
-
-* Activate the feature within your local LEAP Web Application
-  * If not already existing create a secrets-file in /config with the name secrets.yml (`/config/secrets.yml`)
-  * Secrets-file should contain the following, make sure its in YAML: {"development"=> {"twitter"=>{"enabled"=>false, "twitter_handle"=>"", "bearer_token"=>"", "twitter_picture"=>nil}}, "test"=>{"twitter"=>{"enabled"=>false, "twitter_handle"=>"", "bearer_token"=>"", "twitter_picture"=>nil}}}
-  * To have your bearer token created, run script in terminal being in the file of leap_web: `script/generate_bearer_token`
-  * To have the script run properly you have to add before running: `--key your_consumerkey --secret your_consumersecret`
-  * Add also `--projectroot your_projectroot --twitterhandle your_twitterhandle` as well to not have manually put the data in your secrets-file
-  * The full command looks like this: `script/generate_bearer_token --key your_consumerkey --secret your_consumersecret --projectroot your_projectroot --twitterhandle your_twitterhandle`
-  * If you didn't give all your information to the script, had a typo or want to change anything else, please do so by finding the secrets-file at `/config/secrets.yml`
-  * Make sure that the correct twitterhandle and bearer-token is included
diff --git a/doc/TWITTER_FEED.md b/doc/TWITTER_FEED.md
new file mode 100644
index 0000000..12dc1be
--- /dev/null
+++ b/doc/TWITTER_FEED.md
@@ -0,0 +1,36 @@
+Display of status updates from twitter on main view (access to tweets via Twitter API)
+---------------------------
+
+This is a feature to include status updates that displays most recent tweets
+of a (determined) twitter account (accessed via Twitter API).
+If you chose to use it, the feature gets included in `home/index` of
+LEAP web app (as part of the main view).
+
+## How to use it ##
+
+* Create Twitter Application on https://apps.twitter.com/
+  * Visit https://apps.twitter.com/ and log in with the twitter account you want to use
+  * Make sure you have a mobile phone number registered with your account to be able to proceed
+  * Choose the option to `Create New App`
+  * Fill in Application Details and Developer Agreement and `Create your Twitter application`
+  * Choose the section "Keys and Access Tokens" to get your consumer key and consumer secret
+  * Optional: Go to section "Permissions" and change the "Access" from `Read and Write` (by default) to `Read only`
+  * Have your consumer key and secret by hand for one of the next steps
+
+* Activate the feature within your local LEAP Web Application
+  * If not already existing create a secrets-file in /config with the name secrets.yml (`/config/secrets.yml`)
+  * Secrets-file should contain the following, make sure its in YAML: {"development"=> {"twitter"=>{"enabled"=>false, "twitter_handle"=>"", "bearer_token"=>"", "twitter_picture"=>nil}}, "test"=>{"twitter"=>{"enabled"=>false, "twitter_handle"=>"", "bearer_token"=>"", "twitter_picture"=>nil}}}
+  * To have your bearer token created, run script in terminal being in the file of leap_web: `script/generate_bearer_token`
+  * To have the script run properly you have to add before running: `--key your_consumerkey --secret your_consumersecret`
+  * Add also `--projectroot your_projectroot --twitterhandle your_twitterhandle` as well to not have manually put the data in your secrets-file
+  * The full command looks like this: `script/generate_bearer_token --key your_consumerkey --secret your_consumersecret --projectroot your_projectroot --twitterhandle your_twitterhandle`
+  * If you didn't give all your information to the script, had a typo or want to change anything else, please do so by finding the secrets-file at `/config/secrets.yml`
+  * Make sure that the correct twitterhandle and bearer-token is included
+
+* Deactivate your bearer token
+  * To deactivate your generated bearer token you can run script/invalidate_bearer_token
+  * The full command looks like this: script/invalidate_bearer_token --key your_consumerkey --secret your_consumersecret --token your_bearer_token
+
+### Default avatar image ###
+
+This feature uses by default the the twitter bird as avatar picture (Twitter_Logo_Blue.png). By using the Twitter trademarks in these Brand Guidelines, you agree to follow these Twitter Trademark Guidelines (the “Guidelines”) as well as our Terms of Service and all other Twitter rules and policies. Find more details here: https://brand.twitter.com/.
-- 
cgit v1.2.3


From b19280e9937276d908d90be5da7c65cdfbb64be1 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Tue, 13 Sep 2016 15:21:12 +0200
Subject: Fixed typo

---
 doc/TWITTER_FEED.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/TWITTER_FEED.md b/doc/TWITTER_FEED.md
index 12dc1be..bfe2a1d 100644
--- a/doc/TWITTER_FEED.md
+++ b/doc/TWITTER_FEED.md
@@ -1,4 +1,4 @@
-Display of status updates from twitter on main view (access to tweets via Twitter API)
+# Display of status updates from twitter on main view #
 ---------------------------
 
 This is a feature to include status updates that displays most recent tweets
@@ -33,4 +33,4 @@ LEAP web app (as part of the main view).
 
 ### Default avatar image ###
 
-This feature uses by default the the twitter bird as avatar picture (Twitter_Logo_Blue.png). By using the Twitter trademarks in these Brand Guidelines, you agree to follow these Twitter Trademark Guidelines (the “Guidelines”) as well as our Terms of Service and all other Twitter rules and policies. Find more details here: https://brand.twitter.com/.
+This feature uses by default the twitter bird as avatar picture (Twitter_Logo_Blue.png). By using the Twitter trademarks in these Brand Guidelines, you agree to follow these Twitter Trademark Guidelines (the “Guidelines”) as well as our Terms of Service and all other Twitter rules and policies. Please find more details here: https://brand.twitter.com/.
-- 
cgit v1.2.3


From 8d825a904f4d84e388a5af2c873b06b344512795 Mon Sep 17 00:00:00 2001
From: thea <ta.kupler@gmail.com>
Date: Tue, 13 Sep 2016 14:59:46 +0200
Subject: reseted index.html.haml old state

---
 app/views/home/index.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
-- 
cgit v1.2.3


From 8a9c46dd6bd2538bf9f126ec6901d4ce3ebd2758 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Tue, 13 Sep 2016 15:23:11 +0200
Subject: Fixed typo

---
 doc/TWITTER_FEED.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/TWITTER_FEED.md b/doc/TWITTER_FEED.md
index bfe2a1d..218bc26 100644
--- a/doc/TWITTER_FEED.md
+++ b/doc/TWITTER_FEED.md
@@ -1,5 +1,4 @@
 # Display of status updates from twitter on main view #
----------------------------
 
 This is a feature to include status updates that displays most recent tweets
 of a (determined) twitter account (accessed via Twitter API).
-- 
cgit v1.2.3


From 59c841bb29d7fd07b12b1dc480653fd4a4d6ab05 Mon Sep 17 00:00:00 2001
From: thea <ta.kupler@gmail.com>
Date: Tue, 13 Sep 2016 15:37:50 +0200
Subject: reseted config/defaults.yml old state

---
 config/defaults.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/defaults.yml b/config/defaults.yml
index bcb8dac..7e2ea58 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -32,7 +32,6 @@ common: &common
   pagination_size: 30
   auth:
     token_expires_after: 60
-
   # handles that will be blocked from being used as logins or email aliases
   # in addition to the ones in /etc/passwd and http://tools.ietf.org/html/rfc2142
   handle_blacklist:
-- 
cgit v1.2.3


From e768e50cce83cf3e1ff3f5ac7b1b58f73368daef Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Tue, 13 Sep 2016 15:41:42 +0200
Subject: added twitter guidelines for usage of twitter image

---
 doc/TWITTER_FEED.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/TWITTER_FEED.md b/doc/TWITTER_FEED.md
index 218bc26..972e683 100644
--- a/doc/TWITTER_FEED.md
+++ b/doc/TWITTER_FEED.md
@@ -32,4 +32,4 @@ LEAP web app (as part of the main view).
 
 ### Default avatar image ###
 
-This feature uses by default the twitter bird as avatar picture (Twitter_Logo_Blue.png). By using the Twitter trademarks in these Brand Guidelines, you agree to follow these Twitter Trademark Guidelines (the “Guidelines”) as well as our Terms of Service and all other Twitter rules and policies. Please find more details here: https://brand.twitter.com/.
+This feature uses by default the twitter bird as avatar picture (Twitter_Logo_Blue.png). By using the Twitter trademarks, you agree to follow these Twitter Trademark Guidelines (the “Guidelines”) as well as Twitter's Terms of Service and all other Twitter rules and policies. Please find more details here: https://brand.twitter.com/.
-- 
cgit v1.2.3


From b66eb2b7af58cd4354f0c5262a7061e3d20e317c Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Tue, 13 Sep 2016 15:46:45 +0200
Subject: Clarifying on how to use twitter brand logo

---
 doc/TWITTER_FEED.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/TWITTER_FEED.md b/doc/TWITTER_FEED.md
index 972e683..dd3954c 100644
--- a/doc/TWITTER_FEED.md
+++ b/doc/TWITTER_FEED.md
@@ -32,4 +32,4 @@ LEAP web app (as part of the main view).
 
 ### Default avatar image ###
 
-This feature uses by default the twitter bird as avatar picture (Twitter_Logo_Blue.png). By using the Twitter trademarks, you agree to follow these Twitter Trademark Guidelines (the “Guidelines”) as well as Twitter's Terms of Service and all other Twitter rules and policies. Please find more details here: https://brand.twitter.com/.
+This feature uses by default the twitter bird as avatar picture (Twitter_Logo_Blue.png). By using the Twitter trademarks, you agree to follow the Twitter Trademark Guidelines as well as Twitter's Terms of Service and all other Twitter rules and policies. Please find more details here: https://brand.twitter.com/.
-- 
cgit v1.2.3


From 782be39862394c05a069eab9b7dd8f6779354917 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Tue, 13 Sep 2016 17:26:51 +0200
Subject: Change in code for caching

---
 app/helpers/twitter_helper.rb     | 37 +++++++++++++------------------------
 app/views/twitter/_index.html.erb |  2 +-
 2 files changed, 14 insertions(+), 25 deletions(-)

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
diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index e31117e..a7ebd1b 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -9,7 +9,7 @@
       </div>
 
       <div class="twitter_list">
-        <% twitter_timeline.each do |e| %>
+        <% tweets.each do |e| %>
           <div class="tweet">
             <div class="tweet_text"><%= " #{e.text}" %>
             </div>
-- 
cgit v1.2.3