chatterbot 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 291622b1f2a0cbb3b3c7eefd3b3cdee644cec193
-  data.tar.gz: db6c7840161544af76021b4e6f86f347c1f74919
+  metadata.gz: fd1f15ba5a3ff9b93011fd3da19223859262e10e
+  data.tar.gz: a535d7da9c4107fb810d8e838e99f2d3feb5eeca
 SHA512:
-  metadata.gz: d2c631c18d4c99ed808ad43668a9a2f00915404185e275f62a830cd3d685113f8b0289622b2832c03acc3d9ddf489488b5798bff10793a424d38a847ca0af5b5
-  data.tar.gz: 249cd8b6ad2be5921b60b32c5d39ac2bd54f19aace9c0c6db9332dbe696b8cf6145796e318bab047c5345e0f9818c3783f67788dd320172ca3a2d5903bf9fe77
+  metadata.gz: 6f18198504ee50b9ba3015d7f45ea46061c14a55e4d02be568ef738d4e13567e9d7118473ff0c942a49a8fc0789cdda46f2d84acf69f35828f55da8283443774
+  data.tar.gz: c57548daa22ef87724d6f101f2c3fee9922c7b7e953a62e395eb4b207ad3d86cf25602484dbf850a55de0b26a91c9e128dc2d3e797e390130b65c84a53d92297

data/chatterbot.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.extensions << 'ext/mkrf_conf.rb'
   
   s.add_runtime_dependency(%q<oauth>, ["~> 0.4.7"])
-  s.add_runtime_dependency(%q<twitter>, ["~> 6.1.0"])
+  s.add_runtime_dependency(%q<twitter>, ["~> 6.2.0"])
   s.add_runtime_dependency(%q<launchy>, [">= 2.4.2"])
   s.add_runtime_dependency(%q<colorize>, [">= 0.7.3"])
 

data/lib/chatterbot/dsl.rb

@@ -14,6 +14,10 @@ module Chatterbot
     #
     # search twitter for the specified terms, then pass any matches to
     # the block.
+    # NOTE: by default, search terms are wrapped in quotes so the
+    # Twitter API will return tweets that include your exact query.
+    # You can disable this by passing exact:false as an option
+    #
     # @param args [Hash] options. these will be passed directly to
     # Twitter via the twitter gem. You can see the possible arguments
     # at http://www.rubydoc.info/gems/twitter/Twitter/REST/Search#search-instance_method

data/lib/chatterbot/search.rb

@@ -24,25 +24,47 @@ module Chatterbot
       @skip_retweets = false
     end
 
-
+    
     #
     # check if this is a retweet that we want to skip
     #
     def skippable_retweet?(t)
       @skip_retweets && t.retweeted_status?
     end
+
+    def wrap_search_query(q)
+      if q =~ / /
+        ['"', q.gsub(/^"/, '').gsub(/"$/, ''), '"'].join("")
+      else
+        q
+      end
+    end
     
     # internal search code
     def search(queries, opts = {}, &block)
       debug "check for tweets since #{since_id}"
       
       max_tweets = opts.delete(:limit) || MAX_SEARCH_TWEETS
+      exact_match = if opts.key?(:exact)
+                      opts.delete(:exact)
+                    else
+                      true
+                    end
+        
       
       if queries.is_a?(String)
-        queries = [queries]
+        queries = [
+          queries
+        ]
       end
 
-      query = queries.join(" OR ")
+      query = queries.map { |q|
+        if exact_match == true
+          q = wrap_search_query(q)
+        end
+
+        q
+      }.join(" OR ")
       
       #
       # search twitter
@@ -50,6 +72,7 @@ module Chatterbot
 
       debug "search: #{query} #{default_opts.merge(opts)}"
       @current_tweet = nil
+
       client.search( query, default_opts.merge(opts) ).take(max_tweets).each { |s|
         update_since_id(s)
         debug s.text

data/lib/chatterbot/version.rb

@@ -1,3 +1,3 @@
 module Chatterbot
-  VERSION = "2.0.4"
+  VERSION = "2.0.5"
 end

data/spec/search_spec.rb

@@ -7,7 +7,6 @@ describe "Chatterbot::Search" do
     bot.search("foo")
   end
  
-
   it "calls update_since_id" do
     bot = test_bot
     
@@ -32,6 +31,46 @@ describe "Chatterbot::Search" do
     bot.search(["foo", "bar"])
   end
 
+  it "encloses search queries in quotes" do
+    bot = test_bot
+
+    allow(bot).to receive(:client).and_return(fake_search(100, 1))
+    expect(bot.client).to receive(:search).
+                           with("\"foo bar baz\"", {
+                                  :result_type=>"recent",
+                                  :since_id => 1,
+                                  :since_id_reply => 1
+                                })
+    
+    bot.search("foo bar baz")
+  end
+
+  it "doesn't enclose search queries in quotes if not exact" do
+    bot = test_bot
+
+    allow(bot).to receive(:client).and_return(fake_search(100, 1))
+    expect(bot.client).to receive(:search).
+                           with("foo bar baz", {
+                                  :result_type=>"recent",
+                                  :since_id => 1,
+                                  :since_id_reply => 1
+                                })
+    
+    bot.search("foo bar baz", exact:false)
+  end
+  
+  it "passes along since_id" do
+    bot = test_bot
+    allow(bot).to receive(:since_id).and_return(123)
+    allow(bot).to receive(:since_id_reply).and_return(456)
+    
+    allow(bot).to receive(:client).and_return(fake_search(100, 1))
+    expect(bot.client).to receive(:search).with("foo", {:since_id => 123, :result_type => "recent", :since_id_reply => 456})
+
+    bot.search("foo")
+  end
+
+  
   it "accepts extra params" do
     bot = test_bot
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chatterbot
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Colin Mitchell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-16 00:00:00.000000000 Z
+date: 2018-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.2.0
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement