chatterbot 2.0.0.pre → 2.1.0

data/spec/spec_helper.rb

@@ -2,10 +2,7 @@
 require 'simplecov'
 SimpleCov.start
 
-require 'bundler/setup'
-Bundler.require
-
-require "twitter"
+require "chatterbot"
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.

data/spec/tweet_spec.rb

@@ -11,29 +11,48 @@ describe "Chatterbot::Tweet" do
       @bot.tweet "tweet test!"
     end
 
-    it "calls client.update with the right values" do
-      bot = test_bot
+    context "when authenticated" do
+      let(:bot) { test_bot }
+      before(:each) do
+        expect(bot).to receive(:require_login).and_return(true)
+        allow(bot).to receive(:client).and_return(double(Twitter::Client))
+      end
+      
+      it "calls client.update with the right values" do
+        allow(bot).to receive(:debug_mode?).and_return(false)
 
-      expect(bot).to receive(:require_login).and_return(true)
-      allow(bot).to receive(:client).and_return(double(Twitter::Client))
+        test_str = "test!"
+        expect(bot.client).to receive(:update).with(test_str, {})
+        bot.tweet test_str
+      end
 
-      allow(bot).to receive(:debug_mode?).and_return(false)
+      it "calls client.update_with_media if media file is specified" do
+        allow(bot).to receive(:debug_mode?).and_return(false)
 
-      test_str = "test!"
-      expect(bot.client).to receive(:update).with(test_str, {})
-      bot.tweet test_str
-    end
+        test_str = "test!"
+        path = File.join(File.dirname(__FILE__), "fixtures", "update_with_media.png")
+        media = File.new(path)
+        expect(bot.client).to receive(:update_with_media).with(test_str, media, {})
+        bot.tweet test_str, media:media
+      end
 
-    it "doesn't tweet when debug_mode? is set" do
-      bot = test_bot
-      
-      expect(bot).to receive(:require_login).and_return(true)
-      allow(bot).to receive(:client).and_return(double(Twitter::Client))
+      it "calls client.update_with_media if media file path is specified" do
+        allow(bot).to receive(:debug_mode?).and_return(false)
 
-      allow(bot).to receive(:debug_mode?).and_return(true)
+        test_str = "test!"
+        path = File.join(File.dirname(__FILE__), "fixtures", "update_with_media.png")
 
-      expect(bot.client).not_to receive(:update)
-      bot.tweet "no tweet!"
+        expect(bot.client).to receive(:update_with_media).with(test_str, an_instance_of(File), {})
+        bot.tweet test_str, media:path
+      end
+
+      
+      it "doesn't tweet when debug_mode? is set" do
+        allow(bot).to receive(:debug_mode?).and_return(true)
+
+        expect(bot.client).not_to receive(:update)
+        bot.tweet "no tweet!"
+      end
     end
   end
 
@@ -41,36 +60,54 @@ describe "Chatterbot::Tweet" do
     it "calls require_login when replying" do
       bot = test_bot
       expect(bot).to receive(:require_login).and_return(false)
-      bot.reply "reply test!", {"id" => 100}
+      bot.reply "reply test!", fake_tweet(100)
     end
 
-    it "calls client.update with the right values" do
-      bot = test_bot
-      expect(bot).to receive(:require_login).and_return(true)
-      allow(bot).to receive(:client).and_return(double(Twitter::Client))
+    context "when authenticated" do
+      let(:bot) { test_bot }
+      before(:each) do
+        expect(bot).to receive(:require_login).and_return(true)
+        allow(bot).to receive(:client).and_return(double(Twitter::Client))
+      end
 
-      allow(bot).to receive(:debug_mode?).and_return(false)
+      
+      it "calls client.update with the right values" do
+        allow(bot).to receive(:debug_mode?).and_return(false)
 
-      test_str = "test!"
+        test_str = "test!"
 
-      s = {
-        :id => 100
-      }
-      expect(bot.client).to receive(:update).with(test_str, {:in_reply_to_status_id => 100})
-      bot.reply test_str, s
-    end
+        expect(bot.client).to receive(:update).with(test_str, {:in_reply_to_status_id => 100})
+        bot.reply test_str, fake_tweet(100, 100)
+      end
 
+      it "calls client.update_with_media if media file is specified" do
+        allow(bot).to receive(:debug_mode?).and_return(false)
 
-    it "doesn't reply when debug_mode? is set" do
-      bot = test_bot
-      expect(bot).to receive(:require_login).and_return(true)
-      allow(bot).to receive(:client).and_return(double(Twitter::Client))
+        test_str = "test!"
+        path = File.join(File.dirname(__FILE__), "fixtures", "update_with_media.png")
+        media = File.new(path)
+
+        expect(bot.client).to receive(:update_with_media).with(test_str, media, {:in_reply_to_status_id => 100})
+        bot.reply test_str, fake_tweet(100, 100), media:media
+      end
 
-      allow(bot).to receive(:debug_mode?).and_return(true)
+      it "calls client.update_with_media if media file path is specified" do
+        allow(bot).to receive(:debug_mode?).and_return(false)
 
-      expect(bot.client).not_to receive(:update)
-      bot.reply "no reply test!", {:id => 100}
+        test_str = "test!"
+        path = File.join(File.dirname(__FILE__), "fixtures", "update_with_media.png")
+
+        expect(bot.client).to receive(:update_with_media).with(test_str, an_instance_of(File), {:in_reply_to_status_id => 100})
+        bot.reply test_str, fake_tweet(100, 100), media:path
+      end
+
+      it "doesn't reply when debug_mode? is set" do
+        allow(bot).to receive(:debug_mode?).and_return(true)
+
+        expect(bot.client).not_to receive(:update_with_media)
+        bot.reply "no reply test!", fake_tweet(100)
+      end
     end
   end
-
+  
 end

data/templates/skeleton.txt

@@ -21,6 +21,23 @@ require 'chatterbot/dsl'
 #
 
 
+#
+# These lines here are just to make sure you edit this file before
+# trying to run your bot. You can safely remove them once you've
+# looked through this file.
+#
+puts "========================"
+puts "========================"
+puts "========================"
+puts "\n\n\n"
+
+puts "Hey there! You should open %{name}.rb and take a look before running this script."
+
+puts "\n\n\n"
+exit
+
+
+
 #
 # Placing your security credentials right in a script like this is
 # handy, but potentially dangerous, especially if your code is
@@ -77,14 +94,6 @@ exclude bad_words
 # will be rejected
 only_interact_with_followers
 
-#
-# Specifying 'streaming true' will cause Chatterbot to use Twitter's
-# Streaming API. Your bot will run constantly, listening for tweets.
-# Alternatively, you can run your bot as a cron/scheduled job. In that
-# case, do not use this line. Every time you run your bot, it will
-# execute once, and then exit.
-#
-streaming true
 
 #
 # Here's the fun stuff!
@@ -100,19 +109,19 @@ streaming true
 # Still here? Hopefully it's because you're going to do something cool
 # with the data that doesn't bother other people. Hooray!
 #
-search "chatterbot" do |tweet|
-  # here's the content of a tweet
-  puts tweets.text
-end
+#search "chatterbot" do |tweet|
+#  # here's the content of a tweet
+#  puts tweets.text
+#end
 
 #
 # this block responds to mentions of your bot
 #
-replies do |tweet|
-  # Any time you put the #USER# token in a tweet, Chatterbot will
-  # replace it with the handle of the user you are interacting with
-  reply "Yes #USER#, you are very kind to say that!", tweet
-end
+#replies do |tweet|
+#  # Any time you put the #USER# token in a tweet, Chatterbot will
+#  # replace it with the handle of the user you are interacting with
+#  reply "Yes #USER#, you are very kind to say that!", tweet
+#end
 
 #
 # this block handles incoming Direct Messages. if you want to do
@@ -131,43 +140,4 @@ end
 # home_timeline do |tweet|
 #  puts tweet.inspect
 # end
-
-#
-# Use this block if you want to be notified about new followers of
-# your bot. You might do this to follow the user back.
-#
-# NOTE: This block only works with the Streaming API. If you use it,
-# chatterbot will assume you want to use streaming and will
-# automatically activate it for you.
-#
-# followed do |user|
-#  puts user.inspect
-# end
-
-#
-# Use this block if you want to be notified when one of your tweets is
-# favorited. The object passed in will be a Twitter::Streaming::Event
-# @see http://www.rubydoc.info/gems/twitter/Twitter/Streaming/Event
-#
-# NOTE: This block only works with the Streaming API. If you use it,
-# chatterbot will assume you want to use streaming and will
-# automatically activate it for you.
-#
-# favorited do |event|
-#  puts event.inspect
-# end
-
-#
-# Use this block if you want to be notified of deleted tweets from
-# your bots home timeline. The object passed in will be a
-# Twitter::Streaming::DeletedTweet
-# @see http://www.rubydoc.info/gems/twitter/Twitter/Streaming/DeletedTweet
-#
-# NOTE: This block only works with the Streaming API. If you use it,
-# chatterbot will assume you want to use streaming and will
-# automatically activate it for you.
-#
-#deleted do |tweet|
-#
-#end
   

metadata

@@ -1,57 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: chatterbot
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre
+  version: 2.1.0
 platform: ruby
 authors:
 - Colin Mitchell
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-08-01 00:00:00.000000000 Z
+date: 2021-05-01 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: oauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.7
+        version: 0.5.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.7
+        version: 0.5.6
 - !ruby/object:Gem::Dependency
   name: twitter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.14.0
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.14.0
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
@@ -81,141 +67,101 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.7.3
 - !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: rspec-mocks
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.2
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: observr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 description: A ruby framework for writing bots that run on Twitter. Comes with a simple
   DSL for easy coding.
 email: colin@muffinlabs.com
 executables:
 - chatterbot-register
-extensions: []
+extensions:
+- ext/mkrf_conf.rb
 extra_rdoc_files: []
 files:
-- ".document"
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.markdown
 - Rakefile
 - bin/chatterbot-register
 - chatterbot.gemspec
+- docs/Gemfile
+- docs/README.md
+- docs/_config.yml
+- docs/_includes/footer.html
+- docs/_includes/header.html
+- docs/_includes/navigation.html
+- docs/_layouts/default.html
+- docs/_layouts/page.html
+- docs/_posts/.gitkeep
+- docs/_site/Gemfile
+- docs/_site/advanced.html
+- docs/_site/configuration.html
+- docs/_site/contributing.html
+- docs/_site/css/main.css
+- docs/_site/css/syntax.css
+- docs/_site/deploying.html
+- docs/_site/examples.html
+- docs/_site/features.html
+- docs/_site/images/01-create-application.png
+- docs/_site/images/02-application-permissions.png
+- docs/_site/images/03-mobile-number.png
+- docs/_site/images/04-access-token.png
+- docs/_site/index.html
+- docs/_site/javascripts/main.js
+- docs/_site/other-tools.html
+- docs/_site/params.json
+- docs/_site/rdoc.html
+- docs/_site/setup.html
+- docs/_site/stylesheets/pygment_trac.css
+- docs/_site/stylesheets/stylesheet.css
+- docs/_site/tut.html
+- docs/_site/twitter-docs.html
+- docs/_site/walkthrough.html
+- docs/advanced.md
+- docs/basics.md
+- docs/bin/jekyll-page
+- docs/configuration.md
+- docs/contributing.md
+- docs/css/main.css
+- docs/css/syntax.css
+- docs/deploying.md
+- docs/examples.md
+- docs/features.md
+- docs/images/01-create-application.png
+- docs/images/02-application-permissions.png
+- docs/images/03-mobile-number.png
+- docs/images/04-access-token.png
+- docs/index.md
+- docs/javascripts/main.js
+- docs/other-tools.md
+- docs/params.json
+- docs/rdoc.md
+- docs/setup.md
+- docs/stylesheets/pygment_trac.css
+- docs/stylesheets/stylesheet.css
+- docs/tips.md
+- docs/tut.md
+- docs/twitter-docs.md
+- docs/walkthrough.md
 - examples/class_bot.rb
 - examples/config.yml.example
 - examples/dsl_test.rb
 - examples/echoes_bot.rb
 - examples/search_bot.rb
-- examples/streaming_bot.rb
-- examples/tweet_logger.rb
+- ext/mkrf_conf.rb
 - lib/chatterbot.rb
 - lib/chatterbot/blocklist.rb
 - lib/chatterbot/bot.rb
@@ -236,7 +182,6 @@ files:
 - lib/chatterbot/safelist.rb
 - lib/chatterbot/search.rb
 - lib/chatterbot/skeleton.rb
-- lib/chatterbot/streaming.rb
 - lib/chatterbot/tweet.rb
 - lib/chatterbot/ui.rb
 - lib/chatterbot/utils.rb
@@ -249,6 +194,7 @@ files:
 - spec/direct_messages_spec.rb
 - spec/dsl_spec.rb
 - spec/favorite_spec.rb
+- spec/fixtures/update_with_media.png
 - spec/followers_spec.rb
 - spec/handler_spec.rb
 - spec/helpers_spec.rb
@@ -260,7 +206,6 @@ files:
 - spec/search_spec.rb
 - spec/skeleton_spec.rb
 - spec/spec_helper.rb
-- spec/streaming_spec.rb
 - spec/tweet_spec.rb
 - spec/utils_spec.rb
 - spec/whitelist_spec.rb
@@ -270,7 +215,7 @@ homepage: http://github.com/muffinista/chatterbot
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -281,13 +226,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: chatterbot
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: A ruby framework for writing Twitter bots
 test_files:
@@ -299,6 +243,7 @@ test_files:
 - spec/direct_messages_spec.rb
 - spec/dsl_spec.rb
 - spec/favorite_spec.rb
+- spec/fixtures/update_with_media.png
 - spec/followers_spec.rb
 - spec/handler_spec.rb
 - spec/helpers_spec.rb
@@ -310,8 +255,6 @@ test_files:
 - spec/search_spec.rb
 - spec/skeleton_spec.rb
 - spec/spec_helper.rb
-- spec/streaming_spec.rb
 - spec/tweet_spec.rb
 - spec/utils_spec.rb
 - spec/whitelist_spec.rb
-has_rdoc: