robut 0.3.0 → 0.4.0

data/test/unit/plugin/say_test.rb

@@ -5,7 +5,8 @@ class Robut::Plugin::SayTest < Test::Unit::TestCase
 
   def setup
     @connection = Robut::ConnectionMock.new
-    @plugin = Robut::Plugin::Say.new(@connection)
+    @presence = Robut::PresenceMock.new(@connection)
+    @plugin = Robut::Plugin::Say.new(@presence)
     @plugin.instance_eval do
       # Stub out system
       def system(c); system_calls << c; end
@@ -15,13 +16,13 @@ class Robut::Plugin::SayTest < Test::Unit::TestCase
 
   def test_says_stuff
     @plugin.handle(Time.now, "@john", "@robut say stuff")
-    assert_equal [], @plugin.connection.replies # shouldn't reply to the chat room
+    assert_equal [], @plugin.reply_to.replies # shouldn't reply to the chat room
     assert_equal ["say stuff"], @plugin.system_calls
   end
   
   def test_doesnt_say_stuff
     @plugin.handle(Time.now, "@john", "@robut ok don't say stuff")
-    assert_equal [], @plugin.connection.replies
+    assert_equal [], @plugin.reply_to.replies
     assert_equal [], @plugin.system_calls
   end
   

data/test/unit/plugin/weather_test.rb

@@ -7,7 +7,8 @@ class Robut::Plugin::WeatherTest < Test::Unit::TestCase
 
   def setup
     @connection = Robut::ConnectionMock.new
-    @plugin = Robut::Plugin::Weather.new(@connection)
+    @presence = Robut::PresenceMock.new(@connection)
+    @plugin = Robut::Plugin::Weather.new(@presence)
   end
 
   def teardown
@@ -16,15 +17,15 @@ class Robut::Plugin::WeatherTest < Test::Unit::TestCase
 
   def test_handle_no_weather
     @plugin.handle(Time.now, "John", "lunch?")
-    assert_equal( [], @plugin.connection.replies )
+    assert_equal( [], @plugin.reply_to.replies )
 
     @plugin.handle(Time.now, "John", "?")
-    assert_equal( [], @plugin.connection.replies )
+    assert_equal( [], @plugin.reply_to.replies )
   end
 
   def test_handle_no_location_no_default
     @plugin.handle(Time.now, "John", "weather?")
-    assert_equal( ["I don't have a default location!"], @plugin.connection.replies )
+    assert_equal( ["I don't have a default location!"], @plugin.reply_to.replies )
   end
 
   def test_handle_no_location_default_set
@@ -32,19 +33,19 @@ class Robut::Plugin::WeatherTest < Test::Unit::TestCase
     stub_request(:any, "http://www.google.com/ig/api?weather=Seattle").to_return(:body => File.open(File.expand_path("../../../fixtures/seattle.xml", __FILE__), "r").read)
 
     @plugin.handle(Time.now, "John", "weather?")
-    assert_equal( ["Weather for Seattle, WA: Mostly Cloudy, 58F"], @plugin.connection.replies )
+    assert_equal( ["Weather for Seattle, WA: Mostly Cloudy, 58F"], @plugin.reply_to.replies )
   end
 
   def test_handle_location
     stub_request(:any, "http://www.google.com/ig/api?weather=tacoma").to_return(:body => File.open(File.expand_path("../../../fixtures/tacoma.xml", __FILE__), "r").read)
 
     @plugin.handle(Time.now, "John", "tacoma weather?")
-    assert_equal( ["Weather for Tacoma, WA: Cloudy, 60F"], @plugin.connection.replies )
+    assert_equal( ["Weather for Tacoma, WA: Cloudy, 60F"], @plugin.reply_to.replies )
   end
 
   def test_no_question_mark
     @plugin.handle(Time.now, "John", "seattle weather")
-    assert_equal( [], @plugin.connection.replies )
+    assert_equal( [], @plugin.reply_to.replies )
   end
 
   def test_handle_day
@@ -52,7 +53,7 @@ class Robut::Plugin::WeatherTest < Test::Unit::TestCase
 
     pretend_now_is(2011,"may",23,17) do
       @plugin.handle(Time.now, "John", "Seattle weather tuesday?")
-      assert_equal( ["Forecast for Seattle, WA on Tue: Partly Cloudy, High: 67F, Low: 51F"], @plugin.connection.replies )
+      assert_equal( ["Forecast for Seattle, WA on Tue: Partly Cloudy, High: 67F, Low: 51F"], @plugin.reply_to.replies )
     end
   end
 
@@ -61,7 +62,7 @@ class Robut::Plugin::WeatherTest < Test::Unit::TestCase
 
     pretend_now_is(2011,"may",23,17) do
       @plugin.handle(Time.now, "John", "Seattle weather tomorrow?")
-      assert_equal( ["Forecast for Seattle, WA on Tue: Partly Cloudy, High: 67F, Low: 51F"], @plugin.connection.replies )
+      assert_equal( ["Forecast for Seattle, WA on Tue: Partly Cloudy, High: 67F, Low: 51F"], @plugin.reply_to.replies )
     end
   end
 
@@ -70,31 +71,31 @@ class Robut::Plugin::WeatherTest < Test::Unit::TestCase
 
     pretend_now_is(2011,"may",23,17) do
       @plugin.handle(Time.now, "John", "Seattle weather today?")
-      assert_equal( ["Forecast for Seattle, WA on Mon: Partly Cloudy, High: 59F, Low: 48F"], @plugin.connection.replies )
+      assert_equal( ["Forecast for Seattle, WA on Mon: Partly Cloudy, High: 59F, Low: 48F"], @plugin.reply_to.replies )
     end
   end
 
   def test_handle_multi_word_location
     stub_request(:any, "http://www.google.com/ig/api?weather=Las%20Vegas").to_return(:body => File.open(File.expand_path("../../../fixtures/las_vegas.xml", __FILE__), "r").read)
     @plugin.handle(Time.now, "John", "Las Vegas weather?")
-    assert_equal( ["Weather for Las Vegas, NV: Mostly Cloudy, 83F"], @plugin.connection.replies )
+    assert_equal( ["Weather for Las Vegas, NV: Mostly Cloudy, 83F"], @plugin.reply_to.replies )
   end
 
   def test_handle_location_with_comma
     stub_request(:any, "http://www.google.com/ig/api?weather=Las%20Vegas,%20NV").to_return(:body => File.open(File.expand_path("../../../fixtures/las_vegas.xml", __FILE__), "r").read)
     @plugin.handle(Time.now, "John", "Las Vegas, NV weather?")
-    assert_equal( ["Weather for Las Vegas, NV: Mostly Cloudy, 83F"], @plugin.connection.replies )
+    assert_equal( ["Weather for Las Vegas, NV: Mostly Cloudy, 83F"], @plugin.reply_to.replies )
   end
 
   def test_handle_bad_location
     stub_request(:any, "http://www.google.com/ig/api?weather=asdf").to_return(:body => File.open(File.expand_path("../../../fixtures/bad_location.xml", __FILE__), "r").read)
     @plugin.handle(Time.now, "John", "asdf weather?")
-    assert_equal( ["I don't recognize the location: \"asdf\""], @plugin.connection.replies )
+    assert_equal( ["I don't recognize the location: \"asdf\""], @plugin.reply_to.replies )
   end
 
   def test_handle_bad_date
     @plugin.handle(Time.now, "John", "Seattle weather asdf?")
-    assert_equal( ["I don't recognize the date: \"asdf\""], @plugin.connection.replies )
+    assert_equal( ["I don't recognize the date: \"asdf\""], @plugin.reply_to.replies )
   end
 
 end

data/test/unit/plugin_test.rb

@@ -4,10 +4,55 @@ class Robut::PluginTest < Test::Unit::TestCase
 
   class HandrolledStubPlugin
     include Robut::Plugin
+
+    match /^message sent to robut with anchor (\w+)/, :sent_to_me => true do |word|
+      reply word
+    end
+
+    match /^another message sent to robut with anchor (\w+)/, :sent_to_me => true do |word|
+      reply word
+    end
+
+    desc "stop matcher - stop matching messages"
+    match /stop matcher/ do
+      true
+    end
+
+    match /stop matcher b/ do
+      reply "fail."
+    end
   end
 
   def setup
-    @plugin = HandrolledStubPlugin.new(Robut::ConnectionMock.new)
+    @plugin = HandrolledStubPlugin.new(
+      Robut::PresenceMock.new(
+        Robut::ConnectionMock
+      )
+    )
+  end
+
+  def test_sent_to_me_match
+    @plugin.handle(Time.now, "@john", "@robut message sent to robut with anchor pass")
+    assert_equal ["pass"], @plugin.reply_to.replies
+  end
+
+  def test_match_other_message_sent_to_me
+    @plugin.handle(Time.now, "@john", "@robut another message sent to robut with anchor pass")
+    assert_equal ["pass"], @plugin.reply_to.replies
+  end
+
+  def test_no_match_if_not_sent_to_me
+    @plugin.handle(Time.now, "@john", "message sent to robut with anchor pass")
+    assert_equal [], @plugin.reply_to.replies
+  end
+
+  def test_returning_true_stops_matching
+    @plugin.handle(Time.now, "@john", "stop matcher b")
+    assert_equal [], @plugin.reply_to.replies
+  end
+
+  def test_set_description
+    assert_equal ["stop matcher - stop matching messages"], @plugin.usage
   end
 
   def test_sent_to_me?
@@ -27,4 +72,20 @@ class Robut::PluginTest < Test::Unit::TestCase
     assert_equal "do this @robut", @plugin.without_nick("do this @robut")
   end
 
+  def test_sent_to_me_without_mention_configuration_option
+    setup_connection_without_mention_name
+    assert @plugin.sent_to_me?("@RobutTRobot hello there"), "sent_to_me? should match the standard HipChat mention format"
+    assert !@plugin.sent_to_me?("@Robut hello there"), "sent_to_me? should not match @robut if we don't have a mention name set"
+  end
+
+  private
+
+  def setup_connection_without_mention_name
+    @plugin = HandrolledStubPlugin.new(
+      Robut::PresenceMock.new(
+        Robut::ConnectionMock.new(OpenStruct.new(:nick => 'Robut t. Robot'))
+      )
+    )
+  end
+
 end

data/test/unit/room_test.rb

@@ -0,0 +1,51 @@
+require 'test_helper'
+require 'robut/plugin/echo'
+
+class MucMock
+  attr_accessor :messages, :room
+
+  def initialize
+    @messages = []
+    @room = ''
+  end
+
+  def join(room)
+    @room = room
+  end
+
+  def send(message)
+    @messages << message
+  end
+
+  def on_message(*args, &block)
+    if block_given?
+      @message_block = block
+    else
+      @message_block.call(args)
+    end
+  end
+end
+
+class RoomTest < Test::Unit::TestCase
+  def setup
+    Robut::Plugin.plugins = [Robut::Plugin::Echo]
+    connection = Robut::ConnectionMock.new(OpenStruct.new(:nick => 'Dodo'))
+    @room = Robut::Room.new(connection, 'fake_room')
+  end
+
+  def test_room_receives_correct_message
+    message = 'Huzzah!'
+    @room.muc = MucMock.new
+    @room.join
+
+    @room.muc.on_message(Time.now, "Art Vandelay", "@dodo echo #{message}")
+    assert_equal @room.muc.messages.first.body, message
+  end
+
+  def test_joining_the_right_room
+    @room.muc = MucMock.new
+    @room.join
+
+    assert_equal @room.muc.room, "#{@room.name}/#{@room.connection.config.nick}"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: robut
 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-09-23 00:00:00.000000000Z
+date: 2012-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xmpp4r
-  requirement: &70105702412820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,12 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70105702412820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 description: A simple plugin-enabled HipChat bot
 email:
 - justin@uberweiss.org
@@ -31,6 +36,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - README.rdoc
 - Rakefile
@@ -43,28 +49,22 @@ files:
 - lib/robut/plugin/alias.rb
 - lib/robut/plugin/calc.rb
 - lib/robut/plugin/echo.rb
+- lib/robut/plugin/google_images.rb
 - lib/robut/plugin/help.rb
 - lib/robut/plugin/later.rb
 - lib/robut/plugin/lunch.rb
 - lib/robut/plugin/meme.rb
+- lib/robut/plugin/pick.rb
 - lib/robut/plugin/ping.rb
-- lib/robut/plugin/rdio.rb
-- lib/robut/plugin/rdio/public/css/rdio.css
-- lib/robut/plugin/rdio/public/css/style.css
-- lib/robut/plugin/rdio/public/css/style_after.css
-- lib/robut/plugin/rdio/public/images/background.png
-- lib/robut/plugin/rdio/public/images/no-album.png
-- lib/robut/plugin/rdio/public/index.html
-- lib/robut/plugin/rdio/public/js/libs/dd_belatedpng.js
-- lib/robut/plugin/rdio/public/js/libs/jquery-1.5.1.min.js
-- lib/robut/plugin/rdio/public/js/libs/modernizr-1.7.min.js
-- lib/robut/plugin/rdio/public/js/rdio.js
-- lib/robut/plugin/rdio/public/js/script.js
-- lib/robut/plugin/rdio/server.rb
+- lib/robut/plugin/quips.rb
 - lib/robut/plugin/say.rb
 - lib/robut/plugin/sayings.rb
+- lib/robut/plugin/stock.rb
 - lib/robut/plugin/twss.rb
 - lib/robut/plugin/weather.rb
+- lib/robut/pm.rb
+- lib/robut/presence.rb
+- lib/robut/room.rb
 - lib/robut/storage.rb
 - lib/robut/storage/base.rb
 - lib/robut/storage/hash_store.rb
@@ -76,6 +76,7 @@ files:
 - test/fixtures/seattle.xml
 - test/fixtures/tacoma.xml
 - test/mocks/connection_mock.rb
+- test/mocks/presence_mock.rb
 - test/simplecov_helper.rb
 - test/test_helper.rb
 - test/unit/connection_test.rb
@@ -84,10 +85,13 @@ files:
 - test/unit/plugin/help_test.rb
 - test/unit/plugin/later_test.rb
 - test/unit/plugin/lunch_test.rb
+- test/unit/plugin/pick_test.rb
 - test/unit/plugin/ping_test.rb
+- test/unit/plugin/quips_test.rb
 - test/unit/plugin/say_test.rb
 - test/unit/plugin/weather_test.rb
 - test/unit/plugin_test.rb
+- test/unit/room_test.rb
 - test/unit/storage/hash_store_test.rb
 - test/unit/storage/yaml_store_test.rb
 - test/unit/storage/yaml_test.yml
@@ -105,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1156497835208409562
+      hash: 2804599532514623618
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -114,10 +118,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1156497835208409562
+      hash: 2804599532514623618
 requirements: []
 rubyforge_project: robut
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A simple plugin-enabled HipChat bot
@@ -127,6 +131,7 @@ test_files:
 - test/fixtures/seattle.xml
 - test/fixtures/tacoma.xml
 - test/mocks/connection_mock.rb
+- test/mocks/presence_mock.rb
 - test/simplecov_helper.rb
 - test/test_helper.rb
 - test/unit/connection_test.rb
@@ -135,10 +140,13 @@ test_files:
 - test/unit/plugin/help_test.rb
 - test/unit/plugin/later_test.rb
 - test/unit/plugin/lunch_test.rb
+- test/unit/plugin/pick_test.rb
 - test/unit/plugin/ping_test.rb
+- test/unit/plugin/quips_test.rb
 - test/unit/plugin/say_test.rb
 - test/unit/plugin/weather_test.rb
 - test/unit/plugin_test.rb
+- test/unit/room_test.rb
 - test/unit/storage/hash_store_test.rb
 - test/unit/storage/yaml_store_test.rb
 - test/unit/storage/yaml_test.yml

data/lib/robut/plugin/rdio.rb

@@ -1,96 +0,0 @@
-require 'rdio'
-require 'robut/plugin/rdio/server'
-
-# A plugin that hooks into Rdio, allowing you to queue songs from
-# HipChat. +key+ and +secret+ must be set before we can deal with any
-# Rdio commands. Additionally, you must call +start_server+ in your
-# Chatfile to start the Rdio web server.
-class Robut::Plugin::Rdio
-  include Robut::Plugin
-
-  class << self
-    # Your Rdio API Key
-    attr_accessor :key
-
-    # Your Rdio API app secret
-    attr_accessor :secret
-
-    # The port the Rdio web player will run on. Defaults to 4567.
-    attr_accessor :port
-
-    # The host the Rdio web player will run on. Defaults to localhost.
-    attr_accessor :host
-
-    # The playback token for +domain+. If you're accessing Rdio on
-    # localhost, you shouldn't need to change this. Otherwise,
-    # download the rdio-python plugin:
-    #
-    #   https://github.com/rdio/rdio-python
-    #
-    # and generate a new token for your domain:
-    #
-    #   ./rdio-call --consumer-key=YOUR_CONSUMER_KEY --consumer-secret=YOUR_CONSUMER_SECRET getPlaybackToken domain=YOUR_DOMAIN
-    attr_accessor :token
-
-    # The domain associated with +token+. Defaults to localhost.
-    attr_accessor :domain
-  end
-
-  # Starts a Robut::Plugin::Rdio::Server server for communicating with
-  # the actual Rdio web player. You must call this in the Chatfile if
-  # you plan on using this gem.
-  def self.start_server
-    @server = Thread.new { Server.run! :host => (host || "localhost"), :port => (port || 4567) }
-    Server.token = self.token || "GAlNi78J_____zlyYWs5ZG02N2pkaHlhcWsyOWJtYjkyN2xvY2FsaG9zdEbwl7EHvbylWSWFWYMZwfc="
-    Server.domain = self.domain || "localhost"
-  end
-
-  # Returns a description of how to use this plugin
-  def usage
-    [
-      "#{at_nick} play <song> - queues <song> for playing",
-      "#{at_nick} play album <album> - queues <album> for playing",
-      "#{at_nick} play track <track> - queues <track> for playing"
-    ]
-  end
-
-  # Queues songs into the Rdio web player. @nick play search query
-  # will queue the first search result matching 'search query' into
-  # the web player. It can be an artist, album, or song.
-  def handle(time, sender_nick, message)
-    words = words(message)
-    if sent_to_me?(message) && words.first == 'play'
-      results = search(words)
-      result = results.first
-      if result
-        Server.queue << result.key
-        name = result.name
-        name = "#{result.artist_name} - #{name}" if result.respond_to?(:artist_name) && result.artist_name
-        reply("Playing #{name}")
-      else
-        reply("I couldn't find #{query_string} on Rdio.")
-      end
-    end
-  end
-
-  private
-
-  # Searches Rdio for sources matching +words+. If the first word is
-  # 'track', it only searches tracks, same for 'album'. Otherwise,
-  # matches both albums and tracks.
-  def search(words)
-    api = ::Rdio::Api.new(self.class.key, self.class.secret)
-
-    if words[1] == "album"
-      query_string = words[2..-1].join(' ')
-      results = api.search(query_string, "Album")
-    elsif words[1] == "track"
-      query_string = words[2..-1].join(' ')
-      results = api.search(query_string, "Track")
-    else
-      query_string = words[1..-1].join(' ')
-      results = api.search(query_string, "Album,Track")
-    end
-  end
-
-end