chatterbot 0.2.1 → 0.2.2

data/examples/dsl_test.rb

@@ -2,8 +2,7 @@
 
 require 'chatterbot/dsl'
 
-exclude ["foo", "bar"]
-search("foo") do |tweet|
-# #  reply "@#{tweet['from_user']} I am serious, and don't call me Shirley!", tweet
+exclude ["bar"]
+search("foo", :lang => "en") do |tweet|
   puts tweet.inspect
 end

data/examples/echoes_bot.rb

@@ -4,6 +4,7 @@
 #
 # require the dsl lib to include all the methods you see below.
 #
+require 'rubygems'
 require 'chatterbot/dsl'
 
 puts "Loading echoes_bot.rb"

data/lib/chatterbot/client.rb

@@ -11,6 +11,7 @@ module Chatterbot
     # default options when querying twitter -- this could be extended
     # with a language, etc.
     def default_opts
+      return {} if since_id <= 0
       {
         :since_id => since_id
       }

data/lib/chatterbot/config.rb

@@ -44,7 +44,7 @@ module Chatterbot
     #
     # Should we run any config updates?
     def update_config?
-      config[:dry_run] || true
+      config.has_key?(:dry_run) ? ! config[:dry_run] : true
     end
 
     #
@@ -69,7 +69,7 @@ module Chatterbot
     #
     # return the ID of the most recent tweet pulled up in searches
     def since_id
-      config[:since_id] || 1
+      config[:since_id] || 0
     end   
 
     #

data/lib/chatterbot/dsl.rb

@@ -72,8 +72,8 @@ module Chatterbot
     
     #
     # search twitter for the specified terms
-    def search(query, &block)
-      @bot.search(query, &block)
+    def search(query, opts = {}, &block)
+      @bot.search(query, opts, &block)
     end
     
     #

data/lib/chatterbot/search.rb

@@ -5,7 +5,7 @@ module Chatterbot
   module Search
 
     # internal search code
-    def search(queries, &block)
+    def search(queries, opts = {}, &block)
       return unless init_client
       
       debug "check for tweets since #{since_id}"
@@ -18,7 +18,7 @@ module Chatterbot
       # search twitter
       #
       queries.each { |query|
-        search = client.search(query, default_opts)
+        search = client.search(query, opts.merge(default_opts))
         update_since_id(search)
 
         if search != nil

data/lib/chatterbot/version.rb

@@ -1,3 +1,3 @@
 module Chatterbot
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/config_spec.rb

@@ -26,6 +26,16 @@ describe "Chatterbot::Config" do
       @bot.config[:custom].should == :value
     end
 
+    it "update_config? is true by default" do
+      @bot.update_config?.should == true
+    end
+
+    it "update_config? is false if this is a dry run" do
+      @bot.config[:dry_run] = true
+      @bot.update_config?.should == false
+    end
+
+    
     it "returns a log dest" do
       @bot.should_receive(:load_config).and_return({:log_dest => :bar})    
       @bot.config = nil

data/spec/dsl_spec.rb

@@ -45,12 +45,12 @@ describe "Chatterbot::DSL" do
     
     
     it "#search passes along to bot object" do
-      @bot.should_receive(:search).with("foo")
+      @bot.should_receive(:search).with("foo", { })
       search("foo")
     end
 
     it "#search passes along to bot object" do
-      @bot.should_receive(:search).with(["foo","bar"])
+      @bot.should_receive(:search).with(["foo","bar"], { })
       search(["foo","bar"])
     end
     

data/spec/search_spec.rb

@@ -27,17 +27,36 @@ describe "Chatterbot::Search" do
     #bot = Chatterbot::Bot.new
 
     bot.stub!(:client).and_return(fake_search(100))
-    bot.client.should_receive(:search).with("foo", {:since_id => 1})
-    bot.client.should_receive(:search).with("bar", {:since_id => 1})    
+    bot.client.should_receive(:search).with("foo", {})
+    bot.client.should_receive(:search).with("bar", {})    
 
     bot.search(["foo", "bar"])
   end
 
+  it "accepts extra params" do
+    bot = test_bot
+
+    bot.stub!(:client).and_return(fake_search(100))
+    bot.client.should_receive(:search).with("foo", {:lang => "en"})
+
+    bot.search("foo", :lang => "en")
+  end
+
   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", {:since_id => 1})
+    bot.client.should_receive(:search).with("foo", {})
+
+    bot.search("foo")
+  end
+
+  it "passes along since_id" 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", {:since_id => 123})
 
     bot.search("foo")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chatterbot
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-25 00:00:00.000000000Z
+date: 2011-05-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter_oauth
-  requirement: &16420860 !ruby/object:Gem::Requirement
+  requirement: &21124680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16420860
+  version_requirements: *21124680
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &16420360 !ruby/object:Gem::Requirement
+  requirement: &21124180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16420360
+  version_requirements: *21124180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &16419880 !ruby/object:Gem::Requirement
+  requirement: &21123700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16419880
+  version_requirements: *21123700
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &16419400 !ruby/object:Gem::Requirement
+  requirement: &21123220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16419400
+  version_requirements: *21123220
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &16418920 !ruby/object:Gem::Requirement
+  requirement: &21122740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *16418920
+  version_requirements: *21122740
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &16418440 !ruby/object:Gem::Requirement
+  requirement: &21122260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16418440
+  version_requirements: *21122260
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &16417960 !ruby/object:Gem::Requirement
+  requirement: &21121780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16417960
+  version_requirements: *21121780
 description: A framework for writing bots that run on Twitter. Comes with a simple
   DSL for easy coding.
 email: colin@muffinlabs.com