chatterbot 0.3.0 → 0.4.0

data/README.markdown

@@ -183,6 +183,9 @@ to ignore tweets with links, you could do something like this:
 TODO
 ====
 
+* document DSL methods
+* document database setup
+* consider switching to Twitter gem for API
 * web-based frontend for tracking bot activity
 * opt-out system that adds people to blacklist if they reply to a bot
   in the right way

data/examples/echoes_bot.rb

@@ -21,7 +21,12 @@ puts "checking for replies to me"
 replies do |tweet|
   
   # replace the incoming username with the handle of the user who tweeted us
-  src = tweet[:text].gsub(/@echoes_bot/, tweet_user(tweet))
+  # src = tweet[:text].gsub(/@echoes_bot/, tweet_user(tweet))
+
+  # replace the incoming username with #USER#, which will be replaced
+  # with the handle of the user who tweeted us by the
+  # replace_variables helper
+  src = tweet[:text].gsub(/@echoes_bot/, "#USER#")  
 
   # send it back!
   reply src, tweet

data/examples/loop_bot.rb

@@ -0,0 +1,44 @@
+#!/usr/bin/env ruby
+
+#
+# simple example of how to run a bot in a loop. if you want to do
+# that, you need to call update_config to update the database at the
+# end of each iteration -- this will keep you from processing the same
+# tweets multiple times
+#
+
+
+#
+# require the dsl lib to include all the methods you see below.
+#
+require 'rubygems'
+require 'chatterbot/dsl'
+
+puts "Loading echoes_bot.rb"
+
+##
+## If I wanted to exclude some terms from triggering this bot, I would list them here.
+## For now, we'll block URLs to keep this from being a source of spam
+##
+exclude "http://"
+
+blacklist "mean_user, private_user"
+
+loop do
+
+  puts "run search #{since_id}"
+  search "twitter" do |tweet|
+    # here you could do something with a tweet
+  end
+  
+  puts "checking for replies to me"
+  replies do |tweet|
+    src = "#USER# it is very nice of you to say that!"  
+    reply src, tweet
+  end
+
+  # explicitly update our config
+  update_config
+
+  sleep 1
+end

data/lib/chatterbot/dsl.rb

@@ -128,6 +128,14 @@ module Chatterbot
     def reply(txt, source)
       bot.reply(txt, source)
     end
+
+    def since_id
+      bot.config[:since_id]
+    end
+    
+    def update_config
+      bot.update_config
+    end
   end
 end
 

data/lib/chatterbot/version.rb

@@ -1,3 +1,3 @@
 module Chatterbot
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/spec/dsl_spec.rb

@@ -8,7 +8,7 @@ describe "Chatterbot::DSL" do
 
       Chatterbot::DSL.stub!(:bot).and_return(@bot)
     end
-  
+    
     describe "blacklist" do
       it "#blacklist passes along to bot object" do
         @bot.should_receive(:blacklist=).with(["foo"])
@@ -86,7 +86,21 @@ describe "Chatterbot::DSL" do
     it "#reply passes along to bot object" do
       @bot.should_receive(:reply).with("hello sailor!", { :source => "source "})
       reply "hello sailor!", { :source => "source "}
+    end    
+
+    describe "update_config" do
+      it "should pass to bot object" do
+        @bot.should_receive(:update_config)
+        update_config
+      end
     end
-    
+
+    describe "since_id" do
+      it "should pass to bot object" do
+        @bot.should_receive(:config).and_return({:since_id => 1234})
+        since_id.should == 1234
+      end
+    end
+
   end
 end

data/spec/search_spec.rb

@@ -78,6 +78,15 @@ describe "Chatterbot::Search" do
 
     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)
+    
+    bot.search("foo")
+  end
   
   it "iterates results" do
     bot = test_bot
@@ -93,7 +102,6 @@ describe "Chatterbot::Search" do
 
   it "checks blacklist" do
     bot = test_bot
-#    bot = Chatterbot::Bot.new
     bot.stub!(:client).and_return(fake_search(100, 3))
     
     bot.stub!(:on_blacklist?).and_return(true, false)

data/spec/spec_helper.rb

@@ -27,28 +27,30 @@ def test_bot
   bot
 end
 
-def fake_search(max_id = 100, result_count = 0)
+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) }
+           'results' => 1.upto(result_count).collect { |i| fake_tweet(i, id_base) }
          }        
        }
        )
 end
 
-def fake_replies(max_id = 100, result_count = 0)
+def fake_replies(max_id = 100, result_count = 0, id_base = 0)
   mock(TwitterOAuth::Client,
        {
-         :replies => 1.upto(result_count).collect { |i| fake_tweet(i) }
+         :replies => 1.upto(result_count).collect { |i| fake_tweet(i, id_base) }
        }
        )
 end
 
-def fake_tweet(index)
+def fake_tweet(index, id=0)
+  id = index if id <= 0
   {
     :from_user => "chatterbot",
-    :index => index
+    :index => index,
+    :id => id
   }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chatterbot
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-15 00:00:00.000000000Z
+date: 2011-12-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter_oauth
-  requirement: &11890200 !ruby/object:Gem::Requirement
+  requirement: &24000540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11890200
+  version_requirements: *24000540
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &11889700 !ruby/object:Gem::Requirement
+  requirement: &24000040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11889700
+  version_requirements: *24000040
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &11889220 !ruby/object:Gem::Requirement
+  requirement: &23999560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11889220
+  version_requirements: *23999560
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &11888740 !ruby/object:Gem::Requirement
+  requirement: &24048660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11888740
+  version_requirements: *24048660
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &11888260 !ruby/object:Gem::Requirement
+  requirement: &24048180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *11888260
+  version_requirements: *24048180
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &11887780 !ruby/object:Gem::Requirement
+  requirement: &24047700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11887780
+  version_requirements: *24047700
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &11887300 !ruby/object:Gem::Requirement
+  requirement: &24047220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11887300
+  version_requirements: *24047220
 description: A framework for writing bots that run on Twitter. Comes with a simple
   DSL for easy coding.
 email: colin@muffinlabs.com
@@ -112,6 +112,7 @@ files:
 - examples/config.yml.example
 - examples/dsl_test.rb
 - examples/echoes_bot.rb
+- examples/loop_bot.rb
 - lib/chatterbot.rb
 - lib/chatterbot/blacklist.rb
 - lib/chatterbot/bot.rb