bjeanes-twibot 0.1.6 → 0.1.7

data/History.txt

@@ -1,3 +1,20 @@
+== 0.1.7 / 2009-04-18
+
+* Added :process option that configures how the bot will process incoming tweets and messages
+
+== 0.1.6 / 2009-04-13
+
+* Fixed configure block not actually working for username and password (Bodaniel Jeanes)
+* Minor updates in tests
+
+== 0.1.5 / 2009-04-12
+
+* Added support for regular expression routes
+* Make timeline_for option configurable, ie in config: timeline_for: :public
+* Fixed bug: Users where unlawfully rejected when their screen name started with
+             a capital letter (Wilco)
+* Fixed bug: Twibot crashed if there were no handlers registered
+
 == 0.1.4 / 2009-03-24
 
 * Removed some warnings

data/Readme.rdoc

@@ -148,6 +148,7 @@ reaches max_interval, where it will stay until Twibot finds anything.
 * Ben Vandgrift (Twitter downtime error handling) - http://neovore.com/
 * Jens Ohlig (warnings)
 * Wilco van Duinkerken (bug fixes) - http://www.sparkboxx.com/
+* Bodaniel Jeanes (configure block fix) - http://bjeanes.github.com/
 
 == License
 

data/lib/twibot.rb

@@ -7,7 +7,7 @@ require File.join(File.dirname(__FILE__), 'hash')
 module Twibot
 
   # :stopdoc:
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:

data/lib/twibot/bot.rb

@@ -24,7 +24,7 @@ module Twibot
     def prompt?
       @prompt
     end
-    
+
     def processed
       @processed ||= {
         :message => nil,
@@ -32,7 +32,7 @@ module Twibot
         :tweet => nil
       }
     end
-    
+
     def twitter
       @twitter ||= Twitter::Client.new :login => config[:login], :password => config[:password]
     end
@@ -47,24 +47,32 @@ module Twibot
         puts "\nAnd it's a wrap. See ya soon!"
         exit
       end
+      
+      case config[:process]
+      when :all, nil
+        # do nothing so it will fetch ALL
+      when :new
+        # Make sure we don't process messages and tweets received prior to bot launch
+        messages = twitter.messages(:received, { :count => 1 })
+        processed[:message] = messages.first.id if messages.length > 0
+
+        handle_tweets = !handlers.nil? && handlers[:tweet].length + handlers[:reply].length > 0
+        tweets = []
 
-      # Make sure we don't process messages and tweets received prior to bot launch
-      messages = twitter.messages(:received, { :count => 1 })
-      processed[:message] = messages.first.id if messages.length > 0
-
-      handle_tweets = !@handlers.nil? && @handlers[:tweet].length + @handlers[:reply].length > 0
-      tweets = []
+        begin
+          tweets = handle_tweets ? twitter.timeline_for(config[:timeline_for], { :count => 1 }) : []
+        rescue Twitter::RESTError => e
+          log.error("Failed to connect to Twitter.  It's likely down for a bit:")
+          log.error(e.to_s)
+        end
 
-      begin
-        tweets = handle_tweets ? twitter.timeline_for(config[:timeline_for], { :count => 1 }) : []
-      rescue Twitter::RESTError => e
-        log.error("Failed to connect to Twitter.  It's likely down for a bit:")
-        log.error(e.to_s)
+        processed[:tweet] = tweets.first.id if tweets.length > 0
+        processed[:reply] = tweets.first.id if tweets.length > 0
+      when Numeric, /\d+/ # a tweet ID to start from
+        processed[:tweet] = processed[:reply] = processed[:message] = config[:process]
+      else abort "Unknown process option #{config[:process]}, aborting..."
       end
 
-      processed[:tweet] = tweets.first.id if tweets.length > 0
-      processed[:reply] = tweets.first.id if tweets.length > 0
-
       poll
     end
 
@@ -115,9 +123,7 @@ module Twibot
       options = {}
       options[:since_id] = processed[type] if processed[type]
       begin
-        dispatch_messages(type,
-          twitter.timeline_for(config[:include_friends] ? :friends : :me,
-          options), %w{tweet tweets})
+        dispatch_messages(type, twitter.timeline_for(config.to_hash[:timeline_for] || :public, options), %w{tweet tweets})
       rescue Twitter::RESTError => e
         log.error("Failed to connect to Twitter.  It's likely down for a bit:")
         log.error(e.to_s)

data/lib/twibot/config.rb

@@ -27,6 +27,7 @@ module Twibot
       :log_file => nil,
       :login => nil,
       :password => nil,
+      :process => :new,
       :prompt => false,
       :daemonize => false,
       :include_friends => false,

data/test/test_bot.rb

@@ -55,10 +55,68 @@ class TestBot < Test::Unit::TestCase
     assert !bot.receive_tweets
   end
 
+  context "with the process option specified" do
+    setup do
+      @bot = Twibot::Bot.new(@config = Twibot::Config.default)
+      @bot.stubs(:prompt?).returns(false)
+      @bot.stubs(:twitter).returns(stub)
+      @bot.stubs(:processed).returns(stub)
+
+      # stop Bot actually starting during tests
+      @bot.stubs(:poll)
+    end
+
+    should "not process tweets prior to bot launch if :process option is set to :new" do
+      @bot.stubs(:handlers).returns({:tweet => [stub], :reply => []})
+
+      # Should fetch the latest ID for both messages and tweets
+      @bot.twitter.expects(:messages).with(:received, { :count => 1 }).
+        returns([stub(:id => (message_id = stub))]).once
+      @bot.twitter.expects(:timeline_for).with(:public, { :count => 1 }).
+        returns([stub(:id => (tweet_id = stub))]).once
+
+      # And set them to the since_id value to be used for future polling
+      @bot.processed.expects(:[]=).with(:message, message_id)
+      @bot.processed.expects(:[]=).with(:tweet,   tweet_id)
+      @bot.processed.expects(:[]=).with(:reply,   tweet_id)
+
+      @bot.configure { |c| c.process = :new }
+      @bot.run!
+    end
+
+    [:all, nil].each do |value|
+      should "process all tweets if :process option is set to #{value.inspect}" do
+        @bot.twitter.expects(:messages).never
+        @bot.twitter.expects(:timeline_for).never
+
+        # Shout not set the any value for the since_id tweets
+        @bot.processed.expects(:[]=).never
+
+        @bot.configure { |c| c.process = value }
+        @bot.run!
+      end
+    end
+
+    should "process all tweets after the ID specified in the :process option" do
+      tweet_id = 12345
+
+      @bot.processed.expects(:[]=).with(anything, 12345).times(3)
+
+      @bot.configure { |c| c.process = tweet_id }
+      @bot.run!
+    end
+
+    should "raise exit when the :process option is not recognized" do
+      @bot.configure { |c| c.process = "something random" }
+      assert_raise(SystemExit) { @bot.run! }
+    end
+
+  end
+
   should "receive message" do
     bot = Twibot::Bot.new(Twibot::Config.new(:log_level => "error"))
     bot.add_handler(:message, Twibot::Handler.new)
-    Twitter::Client.any_instance.expects(:messages).with(:received, {}).returns([twitter_message("cjno", "Hei der!")])
+    bot.twitter.expects(:messages).with(:received, {}).returns([twitter_message("cjno", "Hei der!")])
 
     assert bot.receive_messages
   end
@@ -66,25 +124,25 @@ class TestBot < Test::Unit::TestCase
   should "remember last received message" do
     bot = Twibot::Bot.new(Twibot::Config.new(:log_level => "error"))
     bot.add_handler(:message, Twibot::Handler.new)
-    Twitter::Client.any_instance.expects(:messages).with(:received, {}).returns([twitter_message("cjno", "Hei der!")])
+    bot.twitter.expects(:messages).with(:received, {}).returns([twitter_message("cjno", "Hei der!")])
     assert_equal 1, bot.receive_messages
 
-    Twitter::Client.any_instance.expects(:messages).with(:received, { :since_id => 1 }).returns([])
+    bot.twitter.expects(:messages).with(:received, { :since_id => 1 }).returns([])
     assert_equal 0, bot.receive_messages
   end
 
   should "receive tweet" do
     bot = Twibot::Bot.new(Twibot::Config.new(:log_level => "error"))
     bot.add_handler(:tweet, Twibot::Handler.new)
-    Twitter::Client.any_instance.expects(:timeline_for).with(:me, {}).returns([tweet("cjno", "Hei der!")])
+    bot.twitter.expects(:timeline_for).with(:public, {}).returns([tweet("cjno", "Hei der!")])
 
     assert_equal 1, bot.receive_tweets
   end
 
   should "receive friend tweets if configured" do
-    bot = Twibot::Bot.new(Twibot::Config.new({:log_level => "error", :include_friends => true}))
+    bot = Twibot::Bot.new(Twibot::Config.new({:log_level => "error", :timeline_for => :friends}))
     bot.add_handler(:tweet, Twibot::Handler.new)
-    Twitter::Client.any_instance.expects(:timeline_for).with(:friends, {}).returns([tweet("cjno", "Hei der!")])
+    bot.twitter.expects(:timeline_for).with(:friends, {}).returns([tweet("cjno", "Hei der!")])
 
     assert_equal 1, bot.receive_tweets
   end
@@ -92,17 +150,17 @@ class TestBot < Test::Unit::TestCase
   should "remember received tweets" do
     bot = Twibot::Bot.new(Twibot::Config.new(:log_level => "error"))
     bot.add_handler(:tweet, Twibot::Handler.new)
-    Twitter::Client.any_instance.expects(:timeline_for).with(:me, {}).returns([tweet("cjno", "Hei der!")])
+    bot.twitter.expects(:timeline_for).with(:public, {}).returns([tweet("cjno", "Hei der!")])
     assert_equal 1, bot.receive_tweets
 
-    Twitter::Client.any_instance.expects(:timeline_for).with(:me, { :since_id => 1 }).returns([])
+    bot.twitter.expects(:timeline_for).with(:public, { :since_id => 1 }).returns([])
     assert_equal 0, bot.receive_tweets
   end
 
   should "receive reply when tweet starts with login" do
     bot = Twibot::Bot.new(Twibot::Config.new(:log_level => "error", :login => "irbno"))
     bot.add_handler(:reply, Twibot::Handler.new)
-    Twitter::Client.any_instance.expects(:status).with(:replies, {}).returns([tweet("cjno", "@irbno Hei der!")])
+    bot.twitter.expects(:status).with(:replies, {}).returns([tweet("cjno", "@irbno Hei der!")])
 
     assert_equal 1, bot.receive_replies
   end
@@ -110,10 +168,10 @@ class TestBot < Test::Unit::TestCase
   should "remember received replies" do
     bot = Twibot::Bot.new(Twibot::Config.new(:log_level => "error", :login => "irbno"))
     bot.add_handler(:reply, Twibot::Handler.new)
-    Twitter::Client.any_instance.expects(:status).with(:replies, {}).returns([tweet("cjno", "@irbno Hei der!")])
+    bot.twitter.expects(:status).with(:replies, {}).returns([tweet("cjno", "@irbno Hei der!")])
     assert_equal 1, bot.receive_replies
 
-    Twitter::Client.any_instance.expects(:status).with(:replies, { :since_id => 1 }).returns([])
+    bot.twitter.expects(:status).with(:replies, { :since_id => 1 }).returns([])
     assert_equal 0, bot.receive_replies
   end
 

data/twibot.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{twibot}
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Christian Johansen"]
-  s.date = %q{2009-04-13}
+  s.date = %q{2009-04-18}
   s.description = %q{Twibot (pronounced like "Abbot"), is a Ruby microframework for creating Twitter bots, heavily inspired by Sinatra.}
   s.email = %q{christian@cjohansen.no}
   s.extra_rdoc_files = ["History.txt", "Readme.rdoc"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bjeanes-twibot
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - Christian Johansen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-13 00:00:00 -07:00
+date: 2009-04-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency