chatterbot 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51a25308f3bbee15e4d9a39112c36f437aacb940
-  data.tar.gz: 688235a797f6cc29d4ba9f140d4b0860df22e29e
+  metadata.gz: 6a201bdebfa6dbcffa480ca035bc84053a6c6a10
+  data.tar.gz: 611a0e13a984bdb0afc67a208a011aa6b113e750
 SHA512:
-  metadata.gz: 245ebb9adb24c50cb231f200eabb25b8797776f160426a4939dad9514476b4e02cbbe246f58486f67f53ff3d38fe2ef539130a58adb2f470f512d502ded19f91
-  data.tar.gz: 20f78bcef37a7f3afbbc05c5365acec51e84f282992868ab28f8b29dd29bc068b7d8b0fb8f56cff82d9c788a4e4e5583764ba7921eba23a3fbc1df3e85d07d8d
+  metadata.gz: e2fc941f17f82850bef55c0af704b66b65cd1986640f8bdaa2b3ac53c528028a5f9feda5826822eccbc567b1f900ad03bb3a4872ae369b386f88c1d2430ea573
+  data.tar.gz: 4d605782e35d922cca012873ef32ea9c82e4aafb1e80a6424074467fdd26c280120f0e9276eff5f3f94826dcc5765265f59f93dbf2473f4666590be0445a205d

data/Gemfile

@@ -12,6 +12,8 @@ group :development do
 
   gem "shoulda", ">= 0"
   gem "rspec"
+  gem "rake"
+  #gem "twitter", "~> 4.4.0"
 
   gem "watchr"
 end

data/bin/chatterbot-register

@@ -64,8 +64,10 @@ unless @bot.screen_name.nil?
   end
 
   puts "Storing config info"
+  puts @bot.config.inspect
   @bot.update_config
-
+  @bot.config = nil
+  
   if @skeleton
     skel_dest = File.join(Dir.getwd, "#{@bot.botname}.rb")
     if File.exist?(skel_dest)

data/chatterbot.gemspec

@@ -29,12 +29,13 @@ Gem::Specification.new do |s|
   end
    
   s.add_runtime_dependency(%q<oauth>, [">= 0"])
-  s.add_runtime_dependency(%q<twitter>, [">= 4.4.0"])
+  s.add_runtime_dependency(%q<twitter>, ["4.8.1"])
   s.add_runtime_dependency(%q<launchy>, [">= 2.1.2"])
   s.add_development_dependency(%q<yard>, [">= 0"])
   s.add_development_dependency(%q<shoulda>, [">= 0"])
   s.add_development_dependency(%q<rake>, [">= 0"])
   s.add_development_dependency(%q<rspec>, [">= 2.14.1"])
+  s.add_development_dependency(%q<rspec-mocks>, [">= 2.14.1"])
   s.add_development_dependency(%q<rdoc>, [">= 0"])
   s.add_development_dependency(%q<simplecov>, [">= 0"])
   s.add_development_dependency(%q<watchr>, [">= 0"])

data/lib/chatterbot/client.rb

@@ -49,6 +49,15 @@ module Chatterbot
       result = client.search("a")
       update_since_id(result)
     end
+
+    #
+    # resets the since_id_reply for this bot to the last mention received
+    #
+    def reset_since_id_reply
+      config[:tmp_since_id_reply] = 0
+      result = client.mentions.max_by(&:id)
+      update_since_id_reply(result)
+    end
    
 
     #
@@ -67,6 +76,7 @@ module Chatterbot
         :result_type => "recent"
       }
       opts[:since_id] = since_id if since_id > 0
+      opts[:since_id_reply] = since_id_reply if since_id_reply > 0
 
       opts
     end
@@ -161,14 +171,15 @@ module Chatterbot
           @access_token = request_token.get_access_token(:oauth_verifier => pin.chomp)
           get_screen_name
 
-          config[:token] = @access_token.token
-          config[:secret] = @access_token.secret
+          self.config[:token] = @access_token.token
+          self.config[:secret] = @access_token.secret
 
           update_config unless ! do_update_config
           reset_client
 
         rescue OAuth::Unauthorized => e
           display_oauth_error
+          puts e.inspect
           return false
         end
       end

data/lib/chatterbot/config.rb

@@ -38,6 +38,7 @@ module Chatterbot
     def debug_mode=(d)
       config[:debug_mode] = d
     end
+
     def no_update=(d)
       config[:no_update] = d
     end
@@ -92,7 +93,20 @@ module Chatterbot
     # return the ID of the most recent tweet pulled up in searches
     def since_id
       config[:since_id] || 0
-    end   
+    end
+
+    #
+    # store since_id_reply to a different key so that it doesn't actually
+    # get updated until the bot is done running
+    def since_id_reply=(x)
+      config[:tmp_since_id_reply] = x
+    end
+
+    #
+    # return the ID of the most recent tweet pulled up in mentions or since_id if since_id_reply is nil
+    def since_id_reply
+      config[:since_id_reply] || since_id
+    end
 
     #
     # write out our config file
@@ -115,6 +129,18 @@ module Chatterbot
     def max_id_from(s)
       s.max { |a, b| a.id <=> b.id }.id
     end
+
+    #
+    # update the since_id_reply with the id of the given tweet,
+    # unless it is lower thant what we have already
+    #
+    def update_since_id_reply(tweet)
+      return if tweet.nil? or tweet.class != Twitter::Tweet
+
+      tmp_id = tweet.id
+
+      config[:tmp_since_id_reply] = [config[:tmp_since_id_reply].to_i, tmp_id].max
+    end
     
     #
     # update the since_id with either the highest ID of the specified
@@ -268,6 +294,7 @@ module Chatterbot
       
       # update the since_id now
       tmp[:since_id] = tmp.delete(:tmp_since_id) unless ! tmp.has_key?(:tmp_since_id)
+      tmp[:since_id_reply] = tmp.delete(:tmp_since_id_reply) unless ! tmp.has_key?(:tmp_since_id_reply)
 
       tmp
     end
@@ -302,6 +329,7 @@ module Chatterbot
       configs = db[:config]
       data = {
         :since_id => config.has_key?(:tmp_since_id) ? config[:tmp_since_id] : config[:since_id],
+        :since_id_reply => config.has_key?(:tmp_since_id_reply) ? config[:tmp_since_id_reply] : config[:since_id_reply],
         :token => config[:token],
         :secret => config[:secret],
         :consumer_secret => config[:consumer_secret],

data/lib/chatterbot/db.rb

@@ -58,6 +58,7 @@ module Chatterbot
           String :id, :primary_key => true
 
           Bignum :since_id
+          Bignum :since_id_reply
 
           String :secret
           String :token

data/lib/chatterbot/dsl.rb

@@ -5,7 +5,10 @@ module Chatterbot
   #
   # very basic DSL to handle the common stuff you would want to do with a bot.
   module DSL
-
+    def client
+      bot.client
+    end
+    
     #
     # search twitter for the specified terms, then pass any matches to
     # the block.
@@ -84,6 +87,7 @@ module Chatterbot
       opts.on('-v', '--verbose', "verbose output to stdout")    { params[:verbose] = true }
       opts.on('--dry-run', "Run the bot in test mode, and also don't update the database")    { params[:debug_mode] = true ; params[:no_update] = true }
       opts.on('-s', '--since_id [ARG]', "Check for tweets since tweet id #[ARG]")    { |s| params[:since_id] = s.to_i }
+      opts.on('-m', '--since_id_reply [ARG]', "Check for mentions since tweet id #[ARG]")    { |s| params[:since_id_reply] = s.to_i }
       opts.on('-r', '--reset', "Reset your bot to ignore old tweets") {
         params[:debug_mode] = true
         params[:reset_since_id] = true
@@ -145,6 +149,11 @@ module Chatterbot
       end
     end
 
+    #
+    # return a list of users following the bot. This passes directly
+    # to the underlying Twitter API call
+    # @see http://rdoc.info/gems/twitter/Twitter/API/FriendsAndFollowers#followers-instance_method
+    #
     def followers(opts={})
       bot.followers(opts)
     end
@@ -171,7 +180,10 @@ module Chatterbot
     #
     # The ID of the most recent tweet processed by the bot
     #
-    def since_id
+    def since_id(s=nil)
+      if s
+        bot.config[:since_id] = s
+      end
       bot.config[:since_id]
     end
 
@@ -189,7 +201,11 @@ module Chatterbot
     def token(s)
       bot.config[:token] = s
     end
-    
+
+    def since_id_reply
+      bot.config[:since_id_reply]
+    end
+
     #
     # explicitly save the configuration/state of the bot.
     #

data/lib/chatterbot/reply.rb

@@ -8,15 +8,15 @@ module Chatterbot
     def replies(&block)
       return unless require_login
 
-      debug "check for replies since #{since_id}"
+      debug "check for replies since #{since_id_reply}"
 
-      opts = since_id > 0 ? {:since_id => since_id} : {}
+      opts = since_id_reply > 0 ? {:since_id => since_id_reply} : {}
       opts[:count] = 200
 
       results = client.mentions(opts)
       results.each { |s|
+        update_since_id_reply(s)
         unless ! block_given? || on_blacklist?(s) || skip_me?(s)
-          update_since_id(s)
           yield s         
         end
       }

data/lib/chatterbot/skeleton.rb

@@ -7,11 +7,14 @@ module Chatterbot
       def generate(bot)
         path = File.join(Chatterbot.libdir, "..", "templates", "skeleton.txt")
         src = File.read(path)
+        puts bot.config.inspect
         opts = bot.config.merge({
           :name => bot.botname,
           :timestamp => Time.now
         })
 
+        puts opts.inspect
+        
         if RUBY_VERSION =~ /^1\.8\./
           apply_vars(src, opts)
         else

data/lib/chatterbot/version.rb

@@ -1,3 +1,3 @@
 module Chatterbot
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/spec/blacklist_spec.rb

@@ -10,7 +10,7 @@ describe "Chatterbot::Blacklist" do
   describe "skip_me?" do
     before(:each) do
       @bot = test_bot
-      @bot.stub!(:exclude).and_return(["junk", "i hate bots", "foobar", "spam"])
+      @bot.stub(:exclude).and_return(["junk", "i hate bots", "foobar", "spam"])
     end
 
     it "blocks tweets with phrases we don't want" do
@@ -35,7 +35,7 @@ describe "Chatterbot::Blacklist" do
   describe "on_blacklist?" do
     before(:each) do
       @bot = test_bot
-      @bot.stub!(:blacklist).and_return(["skippy", "blippy", "dippy"])
+      @bot.stub(:blacklist).and_return(["skippy", "blippy", "dippy"])
     end
 
     it "blocks users we don't want" do
@@ -68,20 +68,20 @@ describe "Chatterbot::Blacklist" do
     end
 
     it "collects name from the db if it exists" do
-      @bot.stub!(:has_db?).and_return(true)
-      blacklist_table = mock(Object)
-      mock_dataset = mock(Object, {:count => 1})
+      @bot.stub(:has_db?).and_return(true)
+      blacklist_table = double(Object)
+      double_dataset = double(Object, {:count => 1})
       blacklist_table.should_receive(:where).
         with({ :user => "a"}).
-        and_return( mock_dataset )
+        and_return( double_dataset )
 
       
-      missing_dataset = mock(Object, {:count => 0})
+      missing_dataset = double(Object, {:count => 0})
       blacklist_table.should_receive(:where).
         with({ :user => "b"}).
         and_return( missing_dataset )
       
-      @bot.stub!(:db).and_return({ 
+      @bot.stub(:db).and_return({ 
                                    :blacklist => blacklist_table
                                  })
       @bot.on_global_blacklist?("a").should == true

data/spec/client_spec.rb

@@ -3,14 +3,27 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe "Chatterbot::Client" do
   before(:each) do
     @bot = Chatterbot::Bot.new
-    @bot.client = mock(Object)
+    @bot.client = double(Object)
+  end
+
+  describe "reset_since_id_reply" do
+    it "gets the id of the last reply" do
+      bot = test_bot
+      bot.stub(:client).and_return(fake_replies(1, 1000))
+      bot.client.should_receive(:mentions)
+
+      bot.reset_since_id_reply
+
+      bot.config[:tmp_since_id_reply].should == 1000
+    end
+
   end
 
   describe "reset_since_id" do
     it "runs a search to get a new max_id" do
       bot = test_bot
 
-      bot.stub!(:client).and_return(fake_search(100, 1))
+      bot.stub(:client).and_return(fake_search(100, 1))
       bot.client.should_receive(:search).with("a")
 #      bot.search("a")
       bot.reset_since_id
@@ -27,7 +40,7 @@ describe "Chatterbot::Client" do
 
   describe "init_client" do
     before(:each) do
-      @client = mock(Twitter::Client)
+      @client = double(Twitter::Client)
       @bot.should_receive(:client).and_return(@client)
     end
 
@@ -65,14 +78,14 @@ describe "Chatterbot::Client" do
     end
 
     it "handles getting an auth token" do
-      token = mock(Object,
+      token = double(Object,
                    :token => "token",
                    :secret => "secret"                                                                
                    )
 
       @bot.should_receive(:request_token).and_return(token)
       token.should_receive(:get_access_token).with(:oauth_verifier => "pin").
-        and_return(mock(:token => "access_token", :secret => "access_secret"))
+        and_return(double(:token => "access_token", :secret => "access_secret"))
 
       @bot.should_receive(:get_screen_name)
       @bot.should_receive(:update_config)
@@ -91,16 +104,16 @@ describe "Chatterbot::Client" do
 
   describe "get_screen_name" do
     before(:each) do
-      @json = '{"id":12345,"screen_name":"mockbot"}'
+      @json = '{"id":12345,"screen_name":"bot"}'
 
-      @token = mock(Object)
-      response = mock(Object, :body => @json)
+      @token = double(Object)
+      response = double(Object, :body => @json)
       @token.should_receive(:get).with("/1.1/account/verify_credentials.json").and_return(response)
     end
 
     it "should work" do
       @bot.get_screen_name(@token)
-      @bot.screen_name.should == "mockbot"
+      @bot.screen_name.should == "bot"
     end
   end
   

data/spec/config_spec.rb

@@ -125,13 +125,46 @@ describe "Chatterbot::Config" do
     end
   end
 
+  describe "since_id_reply=" do
+    it "works" do
+
+      @bot.since_id_reply = 123
+      @bot.config[:tmp_since_id_reply].should == 123
+    end
+  end
+
+  describe "update_since_id_reply" do
+    it "works with tweets" do
+      @bot.config[:tmp_since_id_reply] = 100
+
+      data = fake_tweet(1000, 1000, true)
+      @bot.update_since_id_reply(data)
+      @bot.config[:tmp_since_id_reply].should == 1000
+    end
+
+    it "doesn't work with searches" do
+      data = fake_search(1000, 1).search
+
+      @bot.config[:tmp_since_id_reply] = 100
+      @bot.update_since_id_reply(data)
+      @bot.config[:tmp_since_id_reply].should == 100
+    end
+
+    it "never rolls back" do
+      @bot.config[:tmp_since_id_reply] = 100
+      data = fake_tweet(50, 50, true)
+      @bot.update_since_id(data)
+      @bot.config[:tmp_since_id_reply].should == 100
+    end
+  end
+
   describe "since_id=" do
     it "works" do
       @bot.since_id = 123
       @bot.config[:tmp_since_id].should == 123
     end
   end
-  
+
   describe "update_since_id" do
     it "works with searches" do
       data = fake_search(1000, 1).search
@@ -179,8 +212,8 @@ describe "Chatterbot::Config" do
     end
 
     it "doesn't update keys from the global config" do
-      @bot.stub!(:global_config).and_return({:foo => :bar, :a => :b})
-      @bot.stub!(:bot_config).and_return({:foo => :bar, :custom => :value})      
+      @bot.stub(:global_config).and_return({:foo => :bar, :a => :b})
+      @bot.stub(:bot_config).and_return({:foo => :bar, :custom => :value})      
 
       @bot.config = nil
       
@@ -188,8 +221,8 @@ describe "Chatterbot::Config" do
     end
     
     it "does update keys from the global config if they've been customized" do
-      @bot.stub!(:global_config).and_return({:foo => :bar, :a => :b})
-      @bot.stub!(:bot_config).and_return({:foo => :baz, :custom => :value})      
+      @bot.stub(:global_config).and_return({:foo => :bar, :a => :b})
+      @bot.stub(:bot_config).and_return({:foo => :baz, :custom => :value})      
 
       @bot.config = nil
       
@@ -200,6 +233,11 @@ describe "Chatterbot::Config" do
       @bot.config[:tmp_since_id] = 100
       @bot.config_to_save[:since_id].should == 100
     end
+
+    it "updates since_id_reply" do
+      @bot.config[:tmp_since_id_reply] = 100
+      @bot.config_to_save[:since_id_reply].should == 100
+    end
   end
 
   
@@ -283,8 +321,8 @@ describe "Chatterbot::Config" do
       
       @src = Tempfile.new("config")
 
-      @bot.stub!(:config_file).and_return(@src.path)
-      @bot.stub!(:config_to_save).and_return(tmp)
+      @bot.stub(:config_file).and_return(@src.path)
+      @bot.stub(:config_to_save).and_return(tmp)
     end
 
     it "should work" do

data/spec/db_spec.rb

@@ -23,7 +23,7 @@ describe "Chatterbot::DB" do
   context "db interactions" do
     before(:each) do
       @bot = Chatterbot::Bot.new
-      @bot.stub!(:update_config_at_exit)
+      @bot.stub(:update_config_at_exit)
       @bot.config[:db_uri] = @db_uri
     end
 

data/spec/dsl_spec.rb

@@ -3,10 +3,16 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe "Chatterbot::DSL" do
   describe "client routines" do
     before(:each) do
-      @bot = mock(Chatterbot::Bot, :config => {})
+      @bot = double(Chatterbot::Bot, :config => {})
       @bot.send :require, 'chatterbot/dsl'
 
-      Chatterbot::DSL.stub!(:bot).and_return(@bot)
+      Chatterbot::DSL.stub(:bot).and_return(@bot)
+    end
+
+    describe "client" do
+      it "returns the bot object" do
+        client.should eql(@bot.client)
+      end
     end
 
     describe "blacklist" do
@@ -120,11 +126,23 @@ describe "Chatterbot::DSL" do
         @bot.should_receive(:config).and_return({:since_id => 1234})
         since_id.should == 1234
       end
+
+      it "can be set" do
+        since_id(1234)
+        @bot.config[:since_id].should == 1234
+      end
+    end
+
+    describe "since_id_reply" do
+      it "should pass to bot object" do
+        @bot.should_receive(:config).and_return({:since_id_reply => 1234})
+        since_id_reply.should == 1234
+      end
     end
 
     describe "db" do
       it "should pass to bot object" do
-        bot_db = mock(Object)
+        bot_db = double(Object)
         @bot.should_receive(:db).and_return(bot_db)
 
         db.should eql(bot_db)

data/spec/followers_spec.rb

@@ -10,7 +10,7 @@ describe "Chatterbot::Followers" do
   it "returns followers" do
     bot = test_bot
     bot.should_receive(:require_login).and_return(true)
-    bot.stub!(:client).and_return(fake_followers(3))
+    bot.stub(:client).and_return(fake_followers(3))
 
     result = bot.followers
     result.size.should == 3

data/spec/logging_spec.rb

@@ -4,8 +4,8 @@ describe "Chatterbot::Logging" do
   describe "debug logging" do
     before(:each) do
       @bot = Chatterbot::Bot.new
-      @logger = mock(Logger)
-      @bot.stub!(:logger).and_return(@logger)
+      @logger = double(Logger)
+      @bot.stub(:logger).and_return(@logger)
     end
 
     it "should call logger on debug" do
@@ -39,10 +39,10 @@ describe "Chatterbot::Logging" do
       @bot.should_receive(:log_tweets?).and_return(true)
 
       @bot.should_receive(:botname).and_return("logger")
-      Time.stub!(:now).and_return(123)                
+      Time.stub(:now).and_return(123)                
 
-      @tweets_table = mock(Object)     
-      @bot.stub!(:db).and_return({ 
+      @tweets_table = double(Object)     
+      @bot.stub(:db).and_return({ 
                                    :tweets => @tweets_table
                                  })   
     end

data/spec/reply_spec.rb

@@ -7,26 +7,25 @@ describe "Chatterbot::Reply" do
     bot.replies
   end
 
-  it "updates since_id when complete" do
+  it "updates since_id_reply when complete" do
     bot = test_bot
     bot.should_receive(:require_login).and_return(true)
-    results = fake_replies(100, 1, 1000)
+    results = fake_replies(1, 1000)
 
-    bot.stub!(:client).and_return(results)
+    bot.stub(:client).and_return(results)
     
-    bot.replies do |x|
-      ;
+    bot.replies do
     end
 
-    bot.config[:tmp_since_id].should == 1000
+    bot.config[:tmp_since_id_reply].should == 1000
   end
 
   it "iterates results" do
     bot = test_bot
     bot.should_receive(:require_login).and_return(true)
-    bot.stub!(:client).and_return(fake_replies(100, 3))
+    bot.stub(:client).and_return(fake_replies(3))
     
-    bot.should_receive(:update_since_id).exactly(3).times
+    bot.should_receive(:update_since_id_reply).exactly(3).times
 
     indexes = []
     bot.replies do |x|
@@ -39,11 +38,9 @@ describe "Chatterbot::Reply" do
   it "checks blacklist" do
     bot = test_bot
     bot.should_receive(:require_login).and_return(true)
-    bot.stub!(:client).and_return(fake_replies(100, 3))
+    bot.stub(:client).and_return(fake_replies(3))
     
-    bot.should_receive(:update_since_id).exactly(2).times
-
-    bot.stub!(:on_blacklist?).and_return(true, false)
+    bot.stub(:on_blacklist?).and_return(true, false, false)
 
 
     indexes = []
@@ -55,11 +52,11 @@ describe "Chatterbot::Reply" do
   end
 
 
-  it "passes along since_id" do
+  it "passes along since_id_reply" do
     bot = test_bot
     bot.should_receive(:require_login).and_return(true)
-    bot.stub!(:client).and_return(fake_replies(100, 3))    
-    bot.stub!(:since_id).and_return(123)
+    bot.stub(:client).and_return(fake_replies(100, 3))    
+    bot.stub(:since_id_reply).and_return(123)
     
     bot.client.should_receive(:mentions).with({:since_id => 123, :count => 200})
 
@@ -67,14 +64,26 @@ describe "Chatterbot::Reply" do
   end
   
 
-  it "doesn't pass along invalid since_id" do
+  it "doesn't pass along invalid since_id_reply" do
     bot = test_bot
     bot.should_receive(:require_login).and_return(true)
-    bot.stub!(:client).and_return(fake_replies(100, 3))    
-    bot.stub!(:since_id).and_return(0)
+    bot.stub(:client).and_return(fake_replies(100, 3))    
+    bot.stub(:since_id_reply).and_return(0)
     
     bot.client.should_receive(:mentions).with({:count => 200})
 
     bot.replies
   end
+
+  it "pass along since_id if since_id_reply is nil or zero" do
+    bot = test_bot
+    bot.should_receive(:require_login).and_return(true)
+    bot.stub(:client).and_return(fake_replies(100, 3))
+    bot.stub(:since_id).and_return(12345)
+
+    bot.client.should_receive(:mentions).with({:count => 200, :since_id => 12345})
+
+    bot.replies
+
+  end
 end

data/spec/retweet_spec.rb

@@ -15,9 +15,9 @@ describe "Chatterbot::Retweet" do
       bot = test_bot
 
       bot.should_receive(:require_login).and_return(true)
-      bot.stub!(:client).and_return(mock(Twitter::Client))
+      bot.stub(:client).and_return(mock(Twitter::Client))
 
-      bot.stub!(:debug_mode?).and_return(false)
+      bot.stub(:debug_mode?).and_return(false)
 
       tweet_id = 12345
       bot.client.should_receive(:retweet).with(tweet_id)

data/spec/search_spec.rb

@@ -30,7 +30,7 @@ describe "Chatterbot::Search" do
     bot = test_bot
 
     data = fake_search(100, 1)
-    bot.stub!(:search_client).and_return(data)
+    bot.stub(:search_client).and_return(data)
     bot.should_receive(:update_since_id).with(100)
     
     bot.search("foo")
@@ -39,7 +39,7 @@ describe "Chatterbot::Search" do
   it "accepts multiple searches at once" do
     bot = test_bot
 
-    bot.stub!(:search_client).and_return(fake_search(100, 1))
+    bot.stub(:search_client).and_return(fake_search(100, 1))
     bot.search_client.should_receive(:search).with("foo -include:retweets", {:result_type=>"recent"})
     bot.search_client.should_receive(:search).with("bar -include:retweets", {:result_type=>"recent"})
 
@@ -49,7 +49,7 @@ describe "Chatterbot::Search" do
   it "accepts extra params" do
     bot = test_bot
 
-    bot.stub!(:search_client).and_return(fake_search(100, 1))
+    bot.stub(:search_client).and_return(fake_search(100, 1))
     bot.search_client.should_receive(:search).with("foo -include:retweets", {:lang => "en", :result_type=>"recent"})
 
     bot.search("foo", :lang => "en")
@@ -58,7 +58,7 @@ describe "Chatterbot::Search" do
   it "accepts a single search query" do
     bot = test_bot
 
-    bot.stub!(:search_client).and_return(fake_search(100, 1))
+    bot.stub(:search_client).and_return(fake_search(100, 1))
     bot.search_client.should_receive(:search).with("foo -include:retweets", {:result_type=>"recent"})
 
     bot.search("foo")
@@ -66,10 +66,11 @@ describe "Chatterbot::Search" do
 
   it "passes along since_id" do
     bot = test_bot
-    bot.stub!(:since_id).and_return(123)
+    bot.stub(:since_id).and_return(123)
+    bot.stub(:since_id_reply).and_return(456)
     
-    bot.stub!(:search_client).and_return(fake_search(100, 1))
-    bot.search_client.should_receive(:search).with("foo -include:retweets", {:since_id => 123, :result_type => "recent"})
+    bot.stub(:search_client).and_return(fake_search(100, 1))
+    bot.search_client.should_receive(:search).with("foo -include:retweets", {:since_id => 123, :result_type => "recent", :since_id_reply => 456})
 
     bot.search("foo")
   end
@@ -77,7 +78,7 @@ describe "Chatterbot::Search" do
   it "updates since_id when complete" do
     bot = test_bot
     results = fake_search(1000, 1)
-    bot.stub!(:search_client).and_return(results)
+    bot.stub(:search_client).and_return(results)
     
     bot.should_receive(:update_since_id).with(1000)
     bot.search("foo")
@@ -85,7 +86,7 @@ describe "Chatterbot::Search" do
   
   it "iterates results" do
     bot = test_bot
-    bot.stub!(:search_client).and_return(fake_search(100, 3))
+    bot.stub(:search_client).and_return(fake_search(100, 3))
     indexes = []
 
     bot.search("foo") do |x|
@@ -97,9 +98,9 @@ describe "Chatterbot::Search" do
 
   it "checks blacklist" do
     bot = test_bot
-    bot.stub!(:search_client).and_return(fake_search(100, 3))
+    bot.stub(:search_client).and_return(fake_search(100, 3))
     
-    bot.stub!(:on_blacklist?).and_return(true, false)
+    bot.stub(:on_blacklist?).and_return(true, false)
     
     indexes = []
     bot.search("foo") do |x|

data/spec/skeleton_spec.rb

@@ -11,7 +11,7 @@ describe "Chatterbot::Skeleton" do
       :secret => "secret",
       :token => "token"
     }
-    @bot.stub!(:botname).and_return("Skelley_The_Skeleton")
+    @bot.stub(:botname).and_return("Skelley_The_Skeleton")
 
     @output = Chatterbot::Skeleton.generate(@bot)
   end

data/spec/spec_helper.rb

@@ -21,21 +21,21 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 def test_bot
   bot = Chatterbot::Bot.new
-  bot.stub!(:load_config).and_return({})
-  bot.stub!(:update_config_at_exit)
+  bot.stub(:load_config).and_return({})
+  bot.stub(:update_config_at_exit)
   bot
 end
 
 def fake_search(max_id = 100, result_count = 0, id_base=0)
-  mock(Twitter::Client,
+  double(Twitter::Client,
        :credentials? => true,
        :search => Twitter::SearchResults.new(:search_metadata => {:max_id => max_id},
                                              :statuses => 1.upto(result_count).collect { |i| fake_tweet(i, id_base) } )
        )
 end
 
-def fake_replies(max_id = 100, result_count = 0, id_base = 0)
-  mock(Twitter::Client,
+def fake_replies(result_count = 0, id_base = 0)
+  double(Twitter::Client,
        {
          :credentials? => true,
          :mentions => 1.upto(result_count).collect { |i| fake_tweet(i, id_base, true) }
@@ -44,7 +44,7 @@ def fake_replies(max_id = 100, result_count = 0, id_base = 0)
 end
 
 def fake_followers(count)
-  mock(Twitter::Client,
+  double(Twitter::Client,
        {
          :credentials? => true,
          :followers => 1.upto(count).collect { |i| fake_follower(i) }
@@ -69,3 +69,4 @@ end
 def fake_follower(index=0)
   Twitter::User.new(:id => index, :name => "Follower #{index}")
 end
+

data/spec/tweet_spec.rb

@@ -15,9 +15,9 @@ describe "Chatterbot::Tweet" do
       bot = test_bot
 
       bot.should_receive(:require_login).and_return(true)
-      bot.stub!(:client).and_return(mock(Twitter::Client))
+      bot.stub(:client).and_return(double(Twitter::Client))
 
-      bot.stub!(:debug_mode?).and_return(false)
+      bot.stub(:debug_mode?).and_return(false)
 
       test_str = "test!"
       bot.client.should_receive(:update).with(test_str, {})
@@ -28,9 +28,9 @@ describe "Chatterbot::Tweet" do
       bot = test_bot
       
       bot.should_receive(:require_login).and_return(true)
-      bot.stub!(:client).and_return(mock(Twitter::Client))
+      bot.stub(:client).and_return(double(Twitter::Client))
 
-      bot.stub!(:debug_mode?).and_return(true)
+      bot.stub(:debug_mode?).and_return(true)
 
       bot.client.should_not_receive(:update)
       bot.tweet "no tweet!"
@@ -47,9 +47,9 @@ describe "Chatterbot::Tweet" do
     it "calls client.update with the right values" do
       bot = test_bot
       bot.should_receive(:require_login).and_return(true)
-      bot.stub!(:client).and_return(mock(Twitter::Client))
+      bot.stub(:client).and_return(double(Twitter::Client))
 
-      bot.stub!(:debug_mode?).and_return(false)
+      bot.stub(:debug_mode?).and_return(false)
 
       test_str = "test!"
 
@@ -64,9 +64,9 @@ describe "Chatterbot::Tweet" do
     it "doesn't reply when debug_mode? is set" do
       bot = test_bot
       bot.should_receive(:require_login).and_return(true)
-      bot.stub!(:client).and_return(mock(Twitter::Client))
+      bot.stub(:client).and_return(double(Twitter::Client))
 
-      bot.stub!(:debug_mode?).and_return(true)
+      bot.stub(:debug_mode?).and_return(true)
 
       bot.client.should_not_receive(:update)
       bot.reply "no reply test!", {:id => 100}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chatterbot
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Colin Mitchell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
@@ -42,16 +42,16 @@ dependencies:
   name: twitter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: 4.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: 4.8.1
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 2.14.1
+- !ruby/object:Gem::Dependency
+  name: rspec-mocks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.14.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -246,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: chatterbot
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: A ruby framework for writing Twitter bots