chatterbot 0.6.3 → 0.6.5

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+# uncomment this line if your project needs to run something other than `rake`:
+# script: bundle exec rspec spec

data/chatterbot.gemspec

@@ -21,13 +21,13 @@ Gem::Specification.new do |s|
   s.licenses = ["WTFDBAL"]
 
   s.add_runtime_dependency(%q<oauth>, [">= 0"])
-  s.add_runtime_dependency(%q<twitter>, [">= 3.6.0"])
+  s.add_runtime_dependency(%q<twitter>, [">= 4.4.0"])
   s.add_runtime_dependency(%q<launchy>, [">= 2.1.2"])
   s.add_development_dependency(%q<yard>, [">= 0"])
   s.add_development_dependency(%q<redcarpet>, [">= 0"])
   s.add_development_dependency(%q<shoulda>, [">= 0"])
   s.add_development_dependency(%q<rake>, [">= 0"])
-  s.add_development_dependency(%q<rspec>, [">= 0"])
+  s.add_development_dependency(%q<rspec>, [">= 2.12.0"])
   s.add_development_dependency(%q<rdoc>, [">= 0"])
   s.add_development_dependency(%q<simplecov>, [">= 0"])
   s.add_development_dependency(%q<watchr>, [">= 0"])

data/examples/dsl_test.rb

@@ -6,3 +6,4 @@ exclude ["bar"]
 search("foo", :lang => "en") do |tweet|
   puts tweet.inspect
 end
+

data/examples/search_bot.rb

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+
+#
+# require the dsl lib to include all the methods you see below.
+#
+require 'rubygems'
+require 'chatterbot/dsl'
+
+puts "Loading search_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"
+
+search("twitter", :lang => "en") do |tweet|
+  puts tweet[:text]
+end
+

data/lib/chatterbot/bot.rb

@@ -29,11 +29,11 @@ module Chatterbot
         update_config
         puts "Reset to #{@config[:since_id]}"
         exit
-      else    
+      else
         # update config when we exit
         at_exit do
           raise $! if $!
-          update_config
+          update_config_at_exit
         end  
       end
     end

data/lib/chatterbot/config.rb

@@ -108,21 +108,24 @@ module Chatterbot
       end
     end
 
+    def update_config_at_exit
+      update_config
+    end
+    
     #
     # update the since_id with either the highest ID of the specified
     # tweets, unless it is lower than what we have already
     def update_since_id(search)
       return if search.nil?
       
-      tmp_id = case
-                 # Twitter::SearchResults
-               when search.respond_to?(:max_id) then search.max_id
+      tmp_id = case search
+               when Twitter::SearchResults then search.max_id
 
                  # incoming tweets
-               when search.respond_to?(:id) then search.id
+               when Twitter::Tweet then search.id
 
                  # an enumeration
-               when search.respond_to?(:max) then search.max { |a, b| a.id <=> b.id }.id
+               when Array then search.max { |a, b| a.id <=> b.id }.id
                  
                  # probably an actual tweet ID at this point,
                  # otherwise it will fail and return 0

data/lib/chatterbot/helpers.rb

@@ -23,11 +23,14 @@ module Chatterbot
     # Pull the username from a tweet hash -- this is different depending on
     # if we're doing a search, or parsing through replies/mentions.
     def from_user(s)
-      return s if s.is_a?(String)
-      return s.from_user if s.respond_to?(:from_user) #&& ! s.from_user.nil?
-#      return s.user.screen_name if s.respond_to?(:user)
-
-      s.has_key?(:from_user) ? s[:from_user] : s[:user][:screen_name]
+      case s
+      when Twitter::Tweet
+        s.from_user
+      when String
+        s
+      else
+        s.has_key?(:from_user) ? s[:from_user] : s[:user][:screen_name]
+      end
     end
 
     

data/lib/chatterbot/search.rb

@@ -28,7 +28,6 @@ module Chatterbot
                                       exclude_retweets(query),
                                       opts.merge(default_opts)
                                       )
-
         update_since_id(result.max_id)
 
         result.collection.each { |s|

data/lib/chatterbot/version.rb

@@ -1,3 +1,3 @@
 module Chatterbot
-  VERSION = "0.6.3"
+  VERSION = "0.6.5"
 end

data/spec/blacklist_spec.rb

@@ -92,8 +92,8 @@ describe "Chatterbot::Blacklist" do
 
   describe "db interaction" do
     before(:each) do
-      @db_tmp = Tempfile.new("blacklist.db")
-      @db_uri = "sqlite://#{@db_tmp.path}"
+#      @db_tmp = Tempfile.new("blacklist.db")
+      @db_uri = "sqlite:/"
 
       @bot = Chatterbot::Bot.new    
       @bot.config[:db_uri] = @db_uri

data/spec/client_spec.rb

@@ -12,6 +12,7 @@ describe "Chatterbot::Client" do
 
       bot.stub!(:search_client).and_return(fake_search(100, 1))
       bot.search_client.should_receive(:search).with("a")
+      bot.search("a")
       bot.reset_since_id
 
       bot.config[:tmp_since_id].should == 100

data/spec/config_spec.rb

@@ -134,8 +134,6 @@ 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
@@ -151,6 +149,19 @@ describe "Chatterbot::Config" do
       @bot.config[:tmp_since_id].should == 1000
     end
 
+    it "works with arrays" do
+      @bot.config[:tmp_since_id] = 100
+
+      data = [
+              fake_tweet(500, 1000, true),
+              fake_tweet(1000, 1000, true),
+              fake_tweet(400, 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
       data = fake_tweet(50, 50, true)

data/spec/db_spec.rb

@@ -4,10 +4,11 @@ require 'sequel'
 
 describe "Chatterbot::DB" do
   before(:each) do
-    @db_tmp = Tempfile.new("config.db")
-    @db_uri = "sqlite://#{@db_tmp.path}"
-
-    @bot = Chatterbot::Bot.new    
+    @db_uri = "sqlite:/tmp/chatterbot.db"
+    File.delete("/tmp/chatterbot.db") if File.exist?("/tmp/chatterbot.db")
+    
+    @bot = Chatterbot::Bot.new
+    @bot.stub!(:update_config_at_exit)
     @bot.config[:db_uri] = @db_uri
   end
 
@@ -18,24 +19,29 @@ describe "Chatterbot::DB" do
       @bot.db
     end
   end
+
+  context "db interactions" do
+    after(:each) do
+      @bot.db.disconnect unless @bot.db.nil?
+    end
   
-  describe "table creation" do
-    [:blacklist, :tweets, :config].each do |table|
-      it "should create table #{table}" do
+    describe "table creation" do
+      [:blacklist, :tweets, :config].each do |table|
+        it "should create table #{table}" do
+          @tmp_conn = @bot.db
+          @tmp_conn.tables.include?(table).should == true
+        end
+      end      
+    end
+    
+    describe "store_database_config" do
+      it "doesn't fail" do
+        @bot = Chatterbot::Bot.new    
+        @bot.config[:db_uri] = @db_uri
+        
         @bot.db
-        @tmp_conn = Sequel.connect(@db_uri)
-        @tmp_conn.tables.include?(table).should == true
+        @bot.store_database_config.should == true
       end
-    end      
-  end
-  
-  describe "store_database_config" do
-    it "doesn't fail" do
-      @bot = Chatterbot::Bot.new    
-      @bot.config[:db_uri] = @db_uri
-
-      @bot.db      
-      @bot.store_database_config.should == true
     end
   end
 end

data/spec/helpers_spec.rb

@@ -28,8 +28,8 @@ describe "Chatterbot::Helpers" do
       @bot.from_user("x").should == "x"
     end
 
-    it "should accept :from_user" do
-      @bot.from_user(:from_user => "x").should == "x"
+    it "should accept :from_user tweet" do
+      @bot.from_user(Twitter::Tweet.new(:id => 123, :from_user => "x")).should == "x"
     end
 
     it "should accept :screen_name" do

data/spec/spec_helper.rb

@@ -10,8 +10,8 @@ Bundler.require
 #require "twitter_oauth"
 require "twitter"
 
-require 'tempfile'
-require 'sqlite3'
+#require 'tempfile'
+#require 'sqlite3'
 
 
 # Requires supporting files with custom matchers and macros, etc,
@@ -22,22 +22,16 @@ 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
 end
 
 def fake_search(max_id = 100, result_count = 0, id_base=0)
   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) } )
+       :search => Twitter::SearchResults.new(:search_metadata => {:max_id => max_id},
+                                             :statuses => 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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chatterbot
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-23 00:00:00.000000000 Z
+date: 2013-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 4.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 4.4.0
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -199,6 +199,7 @@ extra_rdoc_files: []
 files:
 - .document
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.markdown
@@ -212,6 +213,7 @@ files:
 - examples/dsl_test.rb
 - examples/echoes_bot.rb
 - examples/loop_bot.rb
+- examples/search_bot.rb
 - examples/tweet_logger.rb
 - lib/chatterbot.rb
 - lib/chatterbot/blacklist.rb
@@ -257,7 +259,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3131576310873480670
+      hash: 1490359172289579377
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -266,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3131576310873480670
+      hash: 1490359172289579377
 requirements: []
 rubyforge_project: chatterbot
 rubygems_version: 1.8.24