chatterbot 0.5.1 → 0.6.1

data/lib/chatterbot/version.rb

@@ -1,3 +1,3 @@
 module Chatterbot
-  VERSION = "0.5.1"
+  VERSION = "0.6.1"
 end

data/spec/blacklist_spec.rb

@@ -27,8 +27,8 @@ describe "Chatterbot::Blacklist" do
     end
 
     it "works with result hashes" do
-      @bot.skip_me?({:text => "did you know that i hate bots?"}).should == true
-      @bot.skip_me?({:text => "a tweet without any bad content"}).should == false
+      @bot.skip_me?(Twitter::Status.new(:id => 1, :text => "did you know that i hate bots?")).should == true
+      @bot.skip_me?(Twitter::Status.new(:id => 1, :text => "a tweet without any bad content")).should == false
     end
   end
 
@@ -52,8 +52,8 @@ describe "Chatterbot::Blacklist" do
     end
 
     it "works with result hashes" do
-      @bot.on_blacklist?({:from_user => "skippy"}).should == true
-      @bot.on_blacklist?({:from_user => "flippy"}).should == false
+      @bot.on_blacklist?(Twitter::Status.new(:id => 1, :from_user => "skippy")).should == true
+      @bot.on_blacklist?(Twitter::Status.new(:id => 1, :from_user => "flippy")).should == false
     end   
   end
 

data/spec/bot_spec.rb

@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Chatterbot::Bot" do
-  
+
 end

data/spec/client_spec.rb

@@ -6,12 +6,42 @@ describe "Chatterbot::Client" do
     @bot.client = mock(Object)
   end
 
+  describe "reset_since_id" do
+    it "runs a search to get a new max_id" do
+      bot = test_bot
+
+      bot.stub!(:search_client).and_return(fake_search(100, 1))
+      bot.search_client.should_receive(:search).with("a")
+      bot.reset_since_id
+
+      bot.config[:tmp_since_id].should == 100
+    end
+  end
+  
   it "runs init_client and login on #require_login" do
     @bot.should_receive(:init_client).and_return(true)
     @bot.should_receive(:login).and_return(true)
     @bot.require_login
   end
 
+  describe "init_client" do
+    before(:each) do
+      @client = mock(Twitter::Client)
+      @bot.should_receive(:client).and_return(@client)
+    end
+
+    it "returns true when client has credentials" do
+      @client.should_receive(:credentials?).and_return(true)
+      @bot.init_client.should == true
+    end
+
+    it "returns false when client does not have credentials" do
+      @client.should_receive(:credentials?).and_return(false)
+      @bot.init_client.should == false
+    end
+  end
+
+
   it "reset_client resets the client instance" do
     @bot.should_receive(:init_client).and_return(true)
     @bot.reset_client
@@ -31,18 +61,19 @@ describe "Chatterbot::Client" do
       @bot.should_receive(:needs_api_key?).and_return(false)
       @bot.should_receive(:needs_auth_token?).and_return(true)
       @bot.should_receive(:get_oauth_verifier).and_return("pin")
-      @bot.client.should_receive(:request_token).and_return(
-                                                            mock(:token => "token",
-                                                                 :secret => "secret"
-                                                                 )
-                                                            )
-      @bot.client.should_receive(:authorize).
-        with("token", "secret", { :oauth_verifier => "pin"}).
-        and_return(mock(:token => "access_token", :secret => "access_secret"))
     end
 
     it "handles getting an auth token" do
-      @bot.client.should_receive(:authorized?).and_return(true)
+      token = mock(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"))
+
+      @bot.should_receive(:get_screen_name)
       @bot.should_receive(:update_config)
       
       @bot.login
@@ -52,7 +83,6 @@ describe "Chatterbot::Client" do
     end
 
     it "handles errors" do
-      @bot.client.should_receive(:authorized?).and_return(false)
       @bot.should_receive(:display_oauth_error)
       @bot.login
     end

data/spec/config_spec.rb

@@ -96,6 +96,20 @@ describe "Chatterbot::Config" do
     end
   end
   
+  describe "reset_bot?" do
+    it "works when reset_bot isn't set" do
+      @bot.reset_bot?.should == false
+    end
+
+    it "works when reset_bot is set" do
+      @bot.config[:reset_since_id] = false
+      @bot.reset_bot?.should == false
+
+      @bot.config[:reset_since_id] = true
+      @bot.reset_bot?.should == true
+    end
+  end
+
   
   describe "debug_mode?" do
     it "works when debug_mode isn't set" do
@@ -120,26 +134,27 @@ describe "Chatterbot::Config" do
   
   describe "update_since_id" do
     it "works with searches" do
+#      data = [ fake_tweet(1000) ]
+
+      data = fake_search(1000, 1).search
+
       @bot.config[:tmp_since_id] = 100
-      @bot.update_since_id({ "max_id" => 1000 })
+      @bot.update_since_id(data)
       @bot.config[:tmp_since_id].should == 1000
     end
 
     it "works with tweets" do
       @bot.config[:tmp_since_id] = 100
-      @bot.update_since_id({ :id => 1000 })
-      @bot.config[:tmp_since_id].should == 1000
-    end
 
-    it "handles weird results" do
-      @bot.config[:tmp_since_id] = 100
-      @bot.update_since_id({ :foo => 1000 })
-      @bot.config[:tmp_since_id].should == 100
+      data = fake_tweet(1000, 1000, true)
+      @bot.update_since_id(data)
+      @bot.config[:tmp_since_id].should == 1000
     end
 
     it "never rolls back" do
       @bot.config[:tmp_since_id] = 100
-      @bot.update_since_id({ :id => 50 })
+      data = fake_tweet(50, 50, true)
+      @bot.update_since_id(data)
       @bot.config[:tmp_since_id].should == 100     
     end
   end

data/spec/dsl_spec.rb

@@ -62,15 +62,21 @@ describe "Chatterbot::DSL" do
       end
     end
 
+    describe "search" do
+      it "passes along to bot object" do
+        @bot.should_receive(:search).with("foo", { })
+        search("foo")
+      end
 
-    it "#search passes along to bot object" do
-      @bot.should_receive(:search).with("foo", { })
-      search("foo")
+      it "passes multiple queries along to bot object" do
+        @bot.should_receive(:search).with(["foo","bar"], { })
+        search(["foo","bar"])
+      end
     end
 
-    it "#search passes along to bot object" do
-      @bot.should_receive(:search).with(["foo","bar"], { })
-      search(["foo","bar"])
+    it "#retweet passes along to bot object" do
+      @bot.should_receive(:retweet).with(1234)
+      retweet(1234)
     end
 
     it "#replies passes along to bot object" do

data/spec/helpers_spec.rb

@@ -41,7 +41,7 @@ describe "Chatterbot::Helpers" do
     before(:each) do
       class TestBot < Chatterbot::Bot; end
       @bot = Chatterbot::Bot.new
-      @bot.client = mock(Object)
+      #@bot.client = mock(Object)
     end
 
     it "can set botname" do

data/spec/reply_spec.rb

@@ -8,14 +8,19 @@ describe "Chatterbot::Reply" do
     bot.replies
   end
 
-  # it "calls update_since_id" do
-  #   bot = Chatterbot::Bot.new
-  #   bot.should_receive(:require_login).and_return(true)
-  #   bot.stub!(:client).and_return(fake_replies(100))
-  #   bot.should_receive(:update_since_id).with({'results' => []})
+  it "updates since_id when complete" do
+    bot = test_bot
+    bot.should_receive(:require_login).and_return(true)
+    results = fake_replies(100, 1, 1000)
+
+    bot.stub!(:client).and_return(results)
+    
+    bot.replies do |x|
+      ;
+    end
 
-  #   bot.replies
-  # end
+    bot.config[:tmp_since_id].should == 1000
+  end
 
   it "iterates results" do
     bot = test_bot
@@ -26,7 +31,7 @@ describe "Chatterbot::Reply" do
 
     indexes = []
     bot.replies do |x|
-      indexes << x[:index]
+      indexes << x[:id]
     end
 
     indexes.should == [1,2,3]
@@ -41,9 +46,10 @@ describe "Chatterbot::Reply" do
 
     bot.stub!(:on_blacklist?).and_return(true, false)
 
+
     indexes = []
     bot.replies do |x|
-      indexes << x[:index]
+      indexes << x[:id]
     end
 
     indexes.should == [2,3]
@@ -56,7 +62,7 @@ describe "Chatterbot::Reply" do
     bot.stub!(:client).and_return(fake_replies(100, 3))    
     bot.stub!(:since_id).and_return(123)
     
-    bot.client.should_receive(:replies).with({:since_id => 123})
+    bot.client.should_receive(:mentions).with({:since_id => 123, :count => 200})
 
     bot.replies
   end
@@ -68,20 +74,8 @@ describe "Chatterbot::Reply" do
     bot.stub!(:client).and_return(fake_replies(100, 3))    
     bot.stub!(:since_id).and_return(0)
     
-    bot.client.should_receive(:replies).with({ })
+    bot.client.should_receive(:mentions).with({:count => 200})
 
     bot.replies
   end
-
-
-  it "outputs an error if we get one from API" do
-    bot = test_bot
-    bot.stub!(:require_login).and_return(true)
-    bot.stub!(:client).and_return(mock(Object, :replies => {"error" => "You messed up"}))
-
-    bot.should_receive(:critical).with("You messed up")
-
-    bot.replies
-  end
-  
 end

data/spec/retweet_spec.rb

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

data/spec/search_spec.rb

@@ -24,29 +24,24 @@ describe "Chatterbot::Search" do
     bot.should_receive(:search)
     bot.search("foo")
   end
-  
-  it "calls init_client" do
-    bot = test_bot
-    bot.should_receive(:init_client).and_return(false)
-    bot.search("foo")
-  end
+ 
 
   it "calls update_since_id" do
     bot = test_bot
 
-    bot.stub!(:client).and_return(fake_search(100))
-    bot.should_receive(:update_since_id).with({'max_id' => 100, 'results' => []})
-
+    data = fake_search(100, 1)
+    bot.stub!(:search_client).and_return(data)
+    bot.should_receive(:update_since_id).with(100)
+    
     bot.search("foo")
   end
 
   it "accepts multiple searches at once" do
     bot = test_bot
-    #bot = Chatterbot::Bot.new
 
-    bot.stub!(:client).and_return(fake_search(100))
-    bot.client.should_receive(:search).with("foo -include:retweets", {})
-    bot.client.should_receive(:search).with("bar -include:retweets", {})    
+    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"})
 
     bot.search(["foo", "bar"])
   end
@@ -54,8 +49,8 @@ describe "Chatterbot::Search" do
   it "accepts extra params" do
     bot = test_bot
 
-    bot.stub!(:client).and_return(fake_search(100))
-    bot.client.should_receive(:search).with("foo -include:retweets", {:lang => "en"})
+    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")
   end
@@ -63,8 +58,8 @@ describe "Chatterbot::Search" do
   it "accepts a single search query" do
     bot = test_bot
 
-    bot.stub!(:client).and_return(fake_search(100))
-    bot.client.should_receive(:search).with("foo -include:retweets", {})
+    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")
   end
@@ -73,28 +68,28 @@ describe "Chatterbot::Search" do
     bot = test_bot
     bot.stub!(:since_id).and_return(123)
     
-    bot.stub!(:client).and_return(fake_search(100))
-    bot.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"})
 
     bot.search("foo")
   end
 
   it "updates since_id when complete" do
     bot = test_bot
-    results = fake_search(100, 1, 1000)
-
-    bot.stub!(:client).and_return(results)
+    results = fake_search(1000, 1)
+    bot.stub!(:search_client).and_return(results)
     
+    bot.should_receive(:update_since_id).with(1000)
     bot.search("foo")
   end
   
   it "iterates results" do
     bot = test_bot
-    bot.stub!(:client).and_return(fake_search(100, 3))
+    bot.stub!(:search_client).and_return(fake_search(100, 3))
     indexes = []
 
     bot.search("foo") do |x|
-      indexes << x[:index]
+      indexes << x.attrs[:index]
     end
     
     indexes.should == [1,2,3]
@@ -102,13 +97,13 @@ describe "Chatterbot::Search" do
 
   it "checks blacklist" do
     bot = test_bot
-    bot.stub!(: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)
     
     indexes = []
     bot.search("foo") do |x|
-      indexes << x[:index]
+      indexes << x.attrs[:index]
     end
 
     indexes.should == [2,3]

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'simplecov'
 SimpleCov.start
 #$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -6,11 +7,8 @@ SimpleCov.start
 require 'bundler/setup'
 Bundler.require
 
-
-#require 'rspec'
-#require 'chatterbot'
-
-require "twitter_oauth"
+#require "twitter_oauth"
+require "twitter"
 
 require 'tempfile'
 require 'sqlite3'
@@ -28,29 +26,39 @@ def test_bot
 end
 
 def fake_search(max_id = 100, result_count = 0, id_base=0)
-  mock(TwitterOAuth::Client,
-       {
-         :search => {
-           'max_id' => max_id,
-           'results' => 1.upto(result_count).collect { |i| fake_tweet(i, id_base) }
-         }        
-       }
+  mock(Twitter::Client,
+       :credentials? => true,
+       :search => Twitter::SearchResults.new(:max_id => max_id,
+                                             :results => 1.upto(result_count).collect { |i| fake_tweet(i, id_base) } )
        )
+
+  # mock(Twitter::Client,
+  #      {
+  #        :credentials? => true,
+  #        :search => 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(TwitterOAuth::Client,
+  mock(Twitter::Client,
        {
-         :replies => 1.upto(result_count).collect { |i| fake_tweet(i, id_base) }
+         :credentials? => true,
+         :mentions => 1.upto(result_count).collect { |i| fake_tweet(i, id_base, true) }
        }
        )
 end
 
-def fake_tweet(index, id=0)
+def fake_tweet(index, id=0, as_object = false)
   id = index if id <= 0
-  {
+  x = {
     :from_user => "chatterbot",
     :index => index,
-    :id => id
+    :id => id,
+    :user => {
+      'screen_name' => "chatterbot"
+    }
   }
+
+  as_object == true ? Twitter::Status.new(x) : x
 end