From b9dc843101c214b112d2ae4796d79ff4ec5f7b4d Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Tue, 19 Nov 2013 10:05:40 +0100
Subject: [PATCH] Updated to new twitter lib.

---
 app/models/channel/twitter2.rb | 26 +++++++++++++-------------
 test/unit/twitter_test.rb      | 30 +++++++++++++++---------------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/app/models/channel/twitter2.rb b/app/models/channel/twitter2.rb
index 75bb307e0..ea098778c 100644
--- a/app/models/channel/twitter2.rb
+++ b/app/models/channel/twitter2.rb
@@ -4,12 +4,12 @@ require 'twitter'
 
 class Channel::Twitter2
   def connect(channel)
-    @client = Twitter::Client.new(
-      :consumer_key       => channel[:options][:consumer_key],
-      :consumer_secret    => channel[:options][:consumer_secret],
-      :oauth_token        => channel[:options][:oauth_token],
-      :oauth_token_secret => channel[:options][:oauth_token_secret]
-    )
+    @client = Twitter::REST::Client.new do |config|
+      config.consumer_key        = channel[:options][:consumer_key]
+      config.consumer_secret     = channel[:options][:consumer_secret]
+      config.access_token        = channel[:options][:oauth_token]
+      config.access_token_secret = channel[:options][:oauth_token_secret]
+    end
   end
 
   def fetch (channel)
@@ -265,15 +265,15 @@ class Channel::Twitter2
     #    logger.debug('tweeeeettttt!!!!!!')
     channel = Channel.where( :area => 'Twitter::Inbound', :active => true ).first
 
-    client = Twitter::Client.new(
-      :consumer_key       => channel[:options][:consumer_key],
-      :consumer_secret    => channel[:options][:consumer_secret],
-      :oauth_token        => channel[:options][:oauth_token],
-      :oauth_token_secret => channel[:options][:oauth_token_secret]
-    )
+    client = Twitter::REST::Client.new do |config|
+      config.consumer_key        = channel[:options][:consumer_key]
+      config.consumer_secret     = channel[:options][:consumer_secret]
+      config.access_token        = channel[:options][:oauth_token]
+      config.access_token_secret = channel[:options][:oauth_token_secret]
+    end
     if attr[:type] == 'twitter direct-message'
       puts 'to:' + attr[:to].to_s
-      dm = client.direct_message_create(
+      dm = client.create_direct_message(
         attr[:to].to_s,
         attr[:body].to_s,
         {}
diff --git a/test/unit/twitter_test.rb b/test/unit/twitter_test.rb
index e14d47807..271524678 100644
--- a/test/unit/twitter_test.rb
+++ b/test/unit/twitter_test.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
 require 'test_helper'
- 
+
 class TwitterTest < ActiveSupport::TestCase
 
   # app config
@@ -85,12 +85,12 @@ class TwitterTest < ActiveSupport::TestCase
     sleep 10
 
     # reply by me_bauer
-    client = Twitter::Client.new(
-      :consumer_key       => consumer_key,
-      :consumer_secret    => consumer_secret,
-      :oauth_token        => user2_token,
-      :oauth_token_secret => user2_token_secret
-    )
+    client = Twitter::REST::Client.new do |config|
+      config.consumer_key        = consumer_key
+      config.consumer_secret     = consumer_secret
+      config.access_token        = user2_token
+      config.access_token_secret = user2_token_secret
+    end
     tweets = client.search( hash )
     tweets.results.map do |tweet|
       assert_equal( tweet.id, article.message_id )
@@ -119,19 +119,19 @@ class TwitterTest < ActiveSupport::TestCase
 
   test 'new by direct message inbound' do
     # cleanup direct messages of system
-    client = Twitter::Client.new(
-      :consumer_key       => consumer_key,
-      :consumer_secret    => consumer_secret,
-      :oauth_token        => user1_token,
-      :oauth_token_secret => user1_token_secret
-    )   
+    client = Twitter::REST::Client.new do |config|
+      config.consumer_key        = consumer_key
+      config.consumer_secret     = consumer_secret
+      config.access_token        = user1_token
+      config.access_token_secret = user1_token_secret
+    end
     dms = client.direct_messages( :count => 200 )
     dms.each {|dm|
       client.direct_message_destroy(dm.id)
     }
 
     # direct message to @armin_theo
-    client = Twitter::Client.new(
+    client = Twitter::REST::Client.new(
       :consumer_key       => consumer_key,
       :consumer_secret    => consumer_secret,
       :oauth_token        => user2_token,
@@ -183,4 +183,4 @@ class TwitterTest < ActiveSupport::TestCase
     sleep 10
 
   end
-end
\ No newline at end of file
+end