roflbot 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/roflbot/base.rb

@@ -74,7 +74,11 @@ module Roflbot
     end
 
     def respond_via_twitter
-      mentions = @twitter.mentions(@since_id ? {:since_id => @since_id} : {})
+      begin
+        mentions = @twitter.mentions(@since_id ? {:since_id => @since_id} : {})
+      rescue StandardError
+        mentions = []
+      end
       if !mentions.empty?
         @since_id = mentions[-1].id
         @options['accounts']['Twitter']['since_id'] = @since_id
@@ -86,12 +90,15 @@ module Roflbot
           message = tweet.text.sub(/^@[^\s]+\s+/, "")
 
           next  if !expectation.matches?(message)
-          case expectation.response
-          when Proc
-            @twitter.update("@#{tweet.user.screen_name} #{expectation.response.call}")
-          when String
-            @twitter.update("@#{tweet.user.screen_name} #{expectation.response}")
-          end
+
+          status =
+            case expectation.response
+            when Proc
+              "@#{tweet.user.screen_name} #{expectation.response.call}"
+            when String
+              "@#{tweet.user.screen_name} #{expectation.response}"
+            end
+          @twitter.update(status, :in_reply_to_status_id => tweet.id)
           break
         end
       end

data/roflbot.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roflbot}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Stephens"]
-  s.date = %q{2010-06-30}
+  s.date = %q{2010-07-06}
   s.default_executable = %q{roflbot}
   s.description = %q{roflbot will make you a rofl waffle}
   s.email = %q{viking415@gmail.com}

data/test/roflbot/test_base.rb

@@ -52,22 +52,30 @@ module Roflbot
 
       seq = sequence("foo")
       @twitter.expects(:mentions).returns([fake_tweet("hey", 12345)]).in_sequence(seq)
-      @twitter.expects(:update).with("@dudeguy oh hai").in_sequence(seq)
+      @twitter.expects(:update).with("@dudeguy oh hai", :in_reply_to_status_id => 12345).in_sequence(seq)
       roflbot.respond_via_twitter
 
       seq = sequence("bar")
       @twitter.expects(:mentions).with(:since_id => 12345).returns([fake_tweet("hey", 23456)]).in_sequence(seq)
-      @twitter.expects(:update).with("@dudeguy oh hai").in_sequence(seq)
+      @twitter.expects(:update).with("@dudeguy oh hai", :in_reply_to_status_id => 23456).in_sequence(seq)
       roflbot.respond_via_twitter
     end
 
+    def test_handles_twitter_exceptions
+      roflbot = Base.new(@options)
+      roflbot.expects(/^hey$/).responds("oh hai")
+
+      @twitter.expects(:mentions).raises(Twitter::TwitterError, 'foo')
+      assert_nothing_raised { roflbot.respond_via_twitter }
+    end
+
     def test_saves_since_id
       roflbot = Base.new(@options)
       roflbot.expects(/^hey$/).responds("oh hai")
 
       seq = sequence("foo")
       @twitter.expects(:mentions).returns([fake_tweet("hey", 12345)]).in_sequence(seq)
-      @twitter.expects(:update).with("@dudeguy oh hai").in_sequence(seq)
+      @twitter.expects(:update).with("@dudeguy oh hai", kind_of(Hash)).in_sequence(seq)
       roflbot.respond_via_twitter
 
       assert_equal 12345, roflbot.options['accounts']['Twitter']['since_id']
@@ -80,7 +88,7 @@ module Roflbot
 
       seq = sequence("foo")
       @twitter.expects(:mentions).with(:since_id => 1337).returns([fake_tweet("hey", 12345)]).in_sequence(seq)
-      @twitter.expects(:update).with("@dudeguy oh hai").in_sequence(seq)
+      @twitter.expects(:update).with("@dudeguy oh hai", kind_of(Hash)).in_sequence(seq)
       roflbot.respond_via_twitter
     end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Jeremy Stephens
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-30 00:00:00 -05:00
+date: 2010-07-06 00:00:00 -05:00
 default_executable: roflbot
 dependencies: 
 - !ruby/object:Gem::Dependency