From 5b045724acd44e691552c0fb8f86b61aa2e0cd06 Mon Sep 17 00:00:00 2001
From: pushmatrix <daniel.beauchamp@gmail.com>
Date: Thu, 21 Nov 2013 17:50:11 +0100
Subject: Update to use the new Twitter 5.0.0 gem.

---
 dashing.gemspec                   | 5 +++--
 templates/project/Gemfile         | 2 +-
 templates/project/jobs/twitter.rb | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/dashing.gemspec b/dashing.gemspec
index 626f434..61c0b3b 100644
--- a/dashing.gemspec
+++ b/dashing.gemspec
@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |s|
   s.name        = 'dashing'
-  s.version     = '1.3.1'
-  s.date        = '2013-07-29'
+  s.version     = '1.3.2'
+  s.date        = '2013-11-21'
   s.executables << 'dashing'
 
 
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency('sass')
   s.add_dependency('coffee-script', '>=1.6.2')
+  s.add_dependency('execjs', '>=2.0.0')
   s.add_dependency('sinatra')
   s.add_dependency('sinatra-contrib')
   s.add_dependency('thin')
diff --git a/templates/project/Gemfile b/templates/project/Gemfile
index e6ccd84..3c7e7a9 100644
--- a/templates/project/Gemfile
+++ b/templates/project/Gemfile
@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 gem 'dashing'
 
 ## Remove this if you don't need a twitter widget.
-gem 'twitter'
\ No newline at end of file
+gem 'twitter', '>= 5.0.0'
\ No newline at end of file
diff --git a/templates/project/jobs/twitter.rb b/templates/project/jobs/twitter.rb
index 5e70f30..26228bc 100644
--- a/templates/project/jobs/twitter.rb
+++ b/templates/project/jobs/twitter.rb
@@ -3,7 +3,7 @@ require 'twitter'
 
 #### Get your twitter keys & secrets:
 #### https://dev.twitter.com/docs/auth/tokens-devtwittercom
-Twitter.configure do |config|
+twitter = Twitter::REST::Client.new do |config|
   config.consumer_key = 'YOUR_CONSUMER_KEY'
   config.consumer_secret = 'YOUR_CONSUMER_SECRET'
   config.oauth_token = 'YOUR_OAUTH_TOKEN'
@@ -14,10 +14,10 @@ search_term = URI::encode('#todayilearned')
 
 SCHEDULER.every '10m', :first_in => 0 do |job|
   begin
-    tweets = Twitter.search("#{search_term}").results
+    tweets = twitter.search("#{search_term}")
 
     if tweets
-      tweets.map! do |tweet|
+      tweets = tweets.map do |tweet|
         { name: tweet.user.name, body: tweet.text, avatar: tweet.user.profile_image_url_https }
       end
       send_event('twitter_mentions', comments: tweets)
-- 
cgit v1.2.3