twibot 0.1.1 → 0.1.2

data/History.txt

@@ -1,3 +1,9 @@
+== 0.1.2 / 2009-03-18
+
+* Removed some warnings
+* Applied patch from Dan Van Derveer fixing a few minor bugs related to the
+  options hash sent to Twitter4R
+
 == 0.1.1 / 2009-03-15
 
 * Fixed dependency

data/Readme.rdoc

@@ -132,6 +132,10 @@ As long as Twibot finds any messages and/or tweets, the interval stays the same
 sleep is increased by interval_step configuration option. This happens until it
 reaches max_interval, where it will stay until Twibot finds anything.
 
+== CONTRIBUTORS
+
+ * Dan Van Derveer (bug fixes)
+
 == LICENSE
 
 (The MIT License)

data/lib/twibot/bot.rb

@@ -25,7 +25,7 @@ module Twibot
         :tweet => nil
       }
     rescue Exception => krash
-      raise SystemExit.new krash.message
+      raise SystemExit.new(krash.message)
     end
 
     def prompt?
@@ -82,8 +82,8 @@ module Twibot
     def receive_messages
       type = :message
       return false unless handlers[type].length > 0
-
-      options = { :since_id => @processed[type] } if @processed[type]
+      options = {}
+      options[:since_id] = @processed[type] if @processed[type]
       dispatch_messages(type, @twitter.messages(:received, options), %w{message messages})
     end
 
@@ -93,8 +93,8 @@ module Twibot
     def receive_tweets
       type = :tweet
       return false unless handlers[type].length > 0
-
-      options = { :id => @processed[type] } if @processed[type]
+      options = {}
+      options[:since_id] = @processed[type] if @processed[type]
       dispatch_messages(type, @twitter.timeline_for(:me, options), %w{tweet tweets})
     end
 
@@ -104,15 +104,9 @@ module Twibot
     def receive_replies
       type = :reply
       return false unless handlers[type].length > 0
-
-      options = { :id => @processed[type] } if @processed[type]
-      messages = @twitter.timeline_for(:me, options)
-
-      # Pick only messages that start with our name
-      num = dispatch_messages(type, messages.find_all { |t| t.text =~ /^@#{@twitter.send :login}/ }, %w{reply replies})
-
-      # Avoid picking up messages over again
-      @processed[type] = messages.first.id if messages.length > 0
+      options = {}
+      options[:since_id] = @processed[type] if @processed[type]
+      num = dispatch_messages(type, @twitter.status(:replies, options), %w{reply replies})
       num
     end
 
@@ -121,6 +115,7 @@ module Twibot
     #
     def dispatch_messages(type, messages, labels)
       messages.each { |message| dispatch(type, message) }
+      # Avoid picking up messages over again
       @processed[type] = messages.first.id if messages.length > 0
 
       num = messages.length

data/lib/twibot.rb

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

data/test/test_bot.rb

@@ -58,7 +58,7 @@ class TestBot < Test::Unit::TestCase
   test "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, nil).returns([message("cjno", "Hei der!")])
+    Twitter::Client.any_instance.expects(:messages).with(:received, {}).returns([message("cjno", "Hei der!")])
 
     assert bot.receive_messages
   end
@@ -66,7 +66,7 @@ class TestBot < Test::Unit::TestCase
   test "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, nil).returns([message("cjno", "Hei der!")])
+    Twitter::Client.any_instance.expects(:messages).with(:received, {}).returns([message("cjno", "Hei der!")])
     assert_equal 1, bot.receive_messages
 
     Twitter::Client.any_instance.expects(:messages).with(:received, { :since_id => 1 }).returns([])
@@ -76,7 +76,7 @@ class TestBot < Test::Unit::TestCase
   test "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, nil).returns([tweet("cjno", "Hei der!")])
+    Twitter::Client.any_instance.expects(:timeline_for).with(:me, {}).returns([tweet("cjno", "Hei der!")])
 
     assert_equal 1, bot.receive_tweets
   end
@@ -84,25 +84,17 @@ class TestBot < Test::Unit::TestCase
   test "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, nil).returns([tweet("cjno", "Hei der!")])
+    Twitter::Client.any_instance.expects(:timeline_for).with(:me, {}).returns([tweet("cjno", "Hei der!")])
     assert_equal 1, bot.receive_tweets
 
-    Twitter::Client.any_instance.expects(:timeline_for).with(:me, { :id => 1 }).returns([])
+    Twitter::Client.any_instance.expects(:timeline_for).with(:me, { :since_id => 1 }).returns([])
     assert_equal 0, bot.receive_tweets
   end
 
-  test "should not receive reply when tweet does not start 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(:timeline_for).with(:me, nil).returns([tweet("cjno", "Hei der!")])
-
-    assert_equal 0, bot.receive_replies
-  end
-
   test "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(:timeline_for).with(:me, nil).returns([tweet("cjno", "@irbno Hei der!")])
+    Twitter::Client.any_instance.expects(:status).with(:replies, {}).returns([tweet("cjno", "@irbno Hei der!")])
 
     assert_equal 1, bot.receive_replies
   end
@@ -110,10 +102,10 @@ class TestBot < Test::Unit::TestCase
   test "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(:timeline_for).with(:me, nil).returns([tweet("cjno", "@irbno Hei der!")])
+    Twitter::Client.any_instance.expects(:status).with(:replies, {}).returns([tweet("cjno", "@irbno Hei der!")])
     assert_equal 1, bot.receive_replies
 
-    Twitter::Client.any_instance.expects(:timeline_for).with(:me, { :id => 1 }).returns([])
+    Twitter::Client.any_instance.expects(:status).with(:replies, { :since_id => 1 }).returns([])
     assert_equal 0, bot.receive_replies
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: twibot
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Christian Johansen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-15 00:00:00 +01:00
+date: 2009-03-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency