twitter_ebooks 2.2.8 → 2.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44b519ebe5950dda2bf315fa90935bfb3c674d46
-  data.tar.gz: c54ed9b372891ff615f10f7ee5ac0788008ba895
+  metadata.gz: 50a5dca9c31287964724b38cb022c6273a242a59
+  data.tar.gz: 7c2f8e441bc119f1bc29b8e7ece6650812785fa4
 SHA512:
-  metadata.gz: 11fb9f47f0ab6d327be5b44ae9ce6c32c55c2759a111d726ae0d3e187bac35f4c5473aed1395127e5ae30c26eeb3168fb3cbb7b5d3b94b6b7a89d24f38ec76d0
-  data.tar.gz: 72445d21adb5cc34ed28731390bbb49ca16fd198e684e5bc6dbee28087fedd2a78d1ce6a21b384d7c36b21b40063e7b12426106825a57d6d9eb40abf25e8f9fb
+  metadata.gz: fdd9dee8a8f53bb421761a0a485b0c5bcb2677355e6c4186c69c8e60d9f15dbd13a4c1cd77c09243e609bc53b02cecc3d2c6a2f81e2fadc4da0cc8b527558df3
+  data.tar.gz: 6a0beb91162f03bfd3ddc1edb386940919b066c13ef323d370b3314b9e4cdd3cca4463f22719ce0cecfd5f5f33fe5b5352268d71d99fa2f15f2b8f41749845a7

data/README.md

@@ -1,4 +1,4 @@
-# twitter\_ebooks 2.2.8
+# twitter\_ebooks 2.2.9
 
 Rewrite of my twitter\_ebooks code. While the original was solely a tweeting Markov generator, this framework helps you build any kind of interactive twitterbot which responds to mentions/DMs. See [ebooks\_example](https://github.com/mispy/ebooks_example) for an example of a full bot.
 

data/lib/twitter_ebooks/archive.rb

@@ -31,12 +31,14 @@ module Ebooks
         end
       end
 
-      Twitter::REST::Client.new do |config|
+      Twitter.configure do |config|
         config.consumer_key = @config[:consumer_key]
         config.consumer_secret = @config[:consumer_secret]
-        config.access_token = @config[:oauth_token]
-        config.access_token_secret = @config[:oauth_token_secret]
+        config.oauth_token = @config[:oauth_token]
+        config.oauth_token_secret = @config[:oauth_token_secret]
       end
+
+      Twitter::Client.new
     end
 
     def initialize(username, path, client=nil)

data/lib/twitter_ebooks/bot.rb

@@ -43,13 +43,15 @@ module Ebooks
         config.oauth_token_secret = @oauth_token_secret
       end
 
-      @twitter = Twitter::REST::Client.new do |config|
+      Twitter.configure do |config|
         config.consumer_key = @consumer_key
         config.consumer_secret = @consumer_secret
-        config.access_token = @access_token
-        config.access_token_secret = @access_token_secret
+        config.oauth_token = @oauth_token
+        config.oauth_token_secret = @oauth_token_secret
       end
 
+      @twitter = Twitter::Client.new
+
       needs_stream = [@on_follow, @on_message, @on_mention, @on_timeline].any? {|e| !e.nil?}
 
       @stream = TweetStream::Client.new if needs_stream
@@ -88,19 +90,19 @@ module Ebooks
       end
 
       @stream.userstream do |ev|
-        next unless ev.text # If it's not a text-containing tweet, ignore it
-        next if ev.user.screen_name == @username # Ignore our own tweets
+        next unless ev[:text] # If it's not a text-containing tweet, ignore it
+        next if ev[:user][:screen_name] == @username # Ignore our own tweets
 
         meta = {}
         mentions = ev.attrs[:entities][:user_mentions].map { |x| x[:screen_name] }
 
         reply_mentions = mentions.reject { |m| m.downcase == @username.downcase }
-        reply_mentions = [ev.user.screen_name] + reply_mentions
+        reply_mentions = [ev[:user][:screen_name]] + reply_mentions
 
         meta[:reply_prefix] = reply_mentions.uniq.map { |m| '@'+m }.join(' ') + ' '
         meta[:limit] = 140 - meta[:reply_prefix].length
 
-        mless = ev.text
+        mless = ev[:text]
         begin
           ev.attrs[:entities][:user_mentions].reverse.each do |entity|
             last = mless[entity[:indices][1]..-1]||''
@@ -108,7 +110,7 @@ module Ebooks
           end
         rescue Exception
           p ev.attrs[:entities][:user_mentions]
-          p ev.text
+          p ev[:text]
           raise
         end
         meta[:mentionless] = mless
@@ -117,8 +119,8 @@ module Ebooks
         # - The tweet mentions list contains our username
         # - The tweet is not being retweeted by somebody else
         # - Or soft-retweeted by somebody else
-        if mentions.map(&:downcase).include?(@username.downcase) && !ev.retweeted_status && !ev.text.start_with?('RT ')
-          log "Mention from @#{ev.user.screen_name}: #{ev.text}"
+        if mentions.map(&:downcase).include?(@username.downcase) && !ev[:retweeted_status] && !ev[:text].start_with?('RT ')
+          log "Mention from @#{ev[:user][:screen_name]}: #{ev[:text]}"
           @on_mention.call(ev, meta) if @on_mention
         else
           @on_timeline.call(ev, meta) if @on_timeline
@@ -139,11 +141,11 @@ module Ebooks
       opts = opts.clone
 
       if ev.is_a? Twitter::DirectMessage
-        log "Sending DM to @#{ev.sender.screen_name}: #{text}"
-        @twitter.direct_message_create(ev.sender.screen_name, text, opts)
+        log "Sending DM to @#{ev[:sender][:screen_name]}: #{text}"
+        @twitter.direct_message_create(ev[:sender][:screen_name], text, opts)
       elsif ev.is_a? Twitter::Tweet
-        log "Replying to @#{ev.user.screen_name} with: #{text}"
-        @twitter.update(text, in_reply_to_status_id: ev.id)
+        log "Replying to @#{ev[:user][:screen_name]} with: #{text}"
+        @twitter.update(text, in_reply_to_status_id: ev[:id])
       else
         raise Exception("Don't know how to reply to a #{ev.class}")
       end

data/lib/twitter_ebooks/version.rb

@@ -1,3 +1,3 @@
 module Ebooks
-  VERSION = "2.2.8"
+  VERSION = "2.2.9"
 end

data/twitter_ebooks.gemspec

@@ -19,7 +19,8 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'memory_profiler'
   gem.add_development_dependency 'pry-byebug'
 
-  gem.add_runtime_dependency 'twitter', '~> 5.1'
+  gem.add_runtime_dependency 'twitter', '~> 4.0'
+  gem.add_runtime_dependency 'simple_oauth', '~> 0.2.0'
   gem.add_runtime_dependency 'tweetstream'
   gem.add_runtime_dependency 'rufus-scheduler'
   gem.add_runtime_dependency 'gingerice'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twitter_ebooks
 version: !ruby/object:Gem::Version
-  version: 2.2.8
+  version: 2.2.9
 platform: ruby
 authors:
 - Jaiden Mispy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-19 00:00:00.000000000 Z
+date: 2014-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -58,14 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: simple_oauth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: tweetstream
   requirement: !ruby/object:Gem::Requirement