flamethrower 0.3.0 → 0.3.2

data/lib/flamethrower/{server.rb → connection.rb}

@@ -1,5 +1,5 @@
 module Flamethrower
-  module Server
+  module Connection
     include Flamethrower::Irc::Commands
 
     attr_accessor :campfire_connection, :current_user, :dispatcher, :irc_channels
@@ -11,6 +11,7 @@ module Flamethrower
     end
 
     def after_connect
+      send_welcome
       send_motd
       populate_irc_channels
       populate_my_user
@@ -23,10 +24,10 @@ module Flamethrower
     end
 
     def receive_data(msg)
-      messages = msg.split("\r\n")
-      messages.each do |message|
-        dispatcher.handle_message(Flamethrower::Irc::Message.new(message))
+      @data ||= ::BufferedTokenizer.new("\r\n")
+      @data.extract(msg).each do |message|
         ::FLAMETHROWER_LOGGER.debug "<< #{message}"
+        dispatcher.handle_message(Flamethrower::Irc::Message.new(message))
       end
     end
 

data/lib/flamethrower/dispatcher.rb

@@ -1,9 +1,9 @@
 module Flamethrower
   class Dispatcher
-    attr_reader :server
+    attr_reader :connection
 
-    def initialize(server)
-      @server = server
+    def initialize(connection)
+      @connection = connection
     end
     
     def handle_message(message)
@@ -14,11 +14,11 @@ module Flamethrower
     private
 
     def find_channel_or_error(name, error=Flamethrower::Irc::Codes::ERR_BADCHANNELKEY)
-      channel = server.irc_channels.detect {|channel| channel.name == name}
+      channel = connection.irc_channels.detect {|channel| channel.name == name}
       if channel && block_given?
         yield(channel)
       else
-        server.send_message(server.error(error))
+        connection.send_message(connection.error(error))
       end
     end
 
@@ -33,44 +33,44 @@ module Flamethrower
 
     def handle_ping(message)
       hostname = message.parameters.first
-      server.send_pong(hostname)
+      connection.send_pong(hostname)
     end
 
     def handle_user(message)
       username, hostname, servername, realname = message.parameters
-      server.current_user.username = username unless server.current_user.username
-      server.current_user.hostname = hostname unless server.current_user.hostname
-      server.current_user.servername = servername unless server.current_user.servername
-      server.current_user.realname = realname unless server.current_user.realname
-      if server.current_user.nick_set? && server.current_user.user_set?
-        server.after_connect
+      connection.current_user.username ||= username
+      connection.current_user.hostname ||= hostname
+      connection.current_user.servername ||= servername
+      connection.current_user.realname ||= realname
+      if connection.current_user.nick_set? && connection.current_user.user_set?
+        connection.after_connect
       end
     end
 
     def handle_nick(message)
       nickname = message.parameters.first
-      server.current_user.nickname = nickname
-      if server.current_user.nick_set? && server.current_user.user_set?
-        server.after_connect
+      connection.current_user.nickname = nickname
+      if connection.current_user.nick_set? && connection.current_user.user_set?
+        connection.after_connect
       end
     end
 
     def handle_topic(message)
       find_channel_or_error(message.parameters.first) do |channel|
         channel.to_campfire.send_topic(message.parameters.last) if message.parameters.size > 1
-        server.send_topic(channel)
+        connection.send_topic(channel)
       end
     end
 
     def handle_mode(message)
       first_param = message.parameters.first
       error = Flamethrower::Irc::Codes::ERR_UNKNOWNCOMMAND
-      if first_param == server.current_user.nickname
-        server.send_user_mode
+      if first_param == connection.current_user.nickname
+        connection.send_user_mode
         return
       else
         find_channel_or_error(first_param, error) do |channel|
-          server.send_channel_mode(channel)
+          connection.send_channel_mode(channel)
         end
       end
     end
@@ -78,26 +78,27 @@ module Flamethrower
     def handle_join(message)
       find_channel_or_error(message.parameters.first) do |channel|
         room = channel.to_campfire
-        channel.users << server.current_user
+        channel.users << connection.current_user
         room.join
         room.start
+        connection.send_join(connection.current_user, channel)
       end
     end
 
     def handle_away(message)
       away_message = message.parameters.first
-      if away_message.empty?
-        server.current_user.away_message = nil
-        server.send_unaway
+      if !away_message || away_message.empty?
+        connection.current_user.away_message = nil
+        connection.send_unaway
       else
-        server.current_user.away_message = away_message
-        server.send_nowaway
+        connection.current_user.away_message = away_message
+        connection.send_nowaway
       end
     end
 
     def handle_who(message)
       find_channel_or_error(message.parameters.first) do |channel|
-        server.send_who(channel)
+        connection.send_who(channel)
       end
     end
 
@@ -105,12 +106,12 @@ module Flamethrower
       find_channel_or_error(message.parameters.first) do |channel|
         room = channel.to_campfire
         room.stop
-        server.send_part(server.current_user, channel)
+        connection.send_part(connection.current_user, channel)
       end
     end
 
     def handle_quit(message)
-      server.irc_channels.each {|c| c.to_campfire.stop}
+      connection.irc_channels.each {|c| c.to_campfire.stop}
     end
   end
 end

data/lib/flamethrower/irc/codes.rb

@@ -1,6 +1,7 @@
 module Flamethrower
   module Irc
     module Codes
+      RPL_WLCM = '001'
       RPL_UMODEIS = 221
       RPL_UNAWAY = 305
       RPL_NOWAWAY = 306

data/lib/flamethrower/irc/commands.rb

@@ -3,10 +3,13 @@ module Flamethrower
     module Commands
       include Flamethrower::Irc::Codes
 
+      def send_welcome
+        send_message reply(RPL_WLCM, ":Welcome to Flamethrower")
+      end
+
       def send_motd
         send_messages do |messages|
           messages << reply(RPL_MOTDSTART, ":MOTD")
-          messages << reply(RPL_MOTD, ":Welcome to Flamethrower")
           messages << reply(RPL_MOTD, ":Fetching channel list from campfire...")
         end
       end
@@ -66,6 +69,10 @@ module Flamethrower
         send_message reply(RPL_UMODEIS, @current_user.mode)
       end
 
+      def send_join(user, channel)
+        send_message ":#{user.to_s} JOIN #{channel.name}"
+      end
+
       def send_part(user, channel)
         send_message ":#{user.to_s} PART #{channel.name}"
       end

data/lib/flamethrower/server/event_server.rb

@@ -1,6 +1,6 @@
 module Flamethrower
   class EventConnection < EventMachine::Connection
-    include Flamethrower::Server
+    include Flamethrower::Connection
 
     attr_accessor :server
 
@@ -22,13 +22,19 @@ module Flamethrower
   end
 
   class EventServer
-    attr_reader :host, :port, :campfire_connection, :connections
+    attr_reader :host, :port, :ascii_conversion, :campfire_connection, :connections
+    ASCII_DEFAULTS = {
+      'enabled' => true
+    }
 
-    def initialize(host, port, domain, token)
-      @host = host || "0.0.0.0"
-      @port = port || 6667
-      @domain = domain
-      @token = token
+    def initialize(options = {})
+      @host = options['host'] || "0.0.0.0"
+      @port = options['port'] || 6667
+      @domain = options['domain']
+      @token = options['token']
+      @ascii_conversion = options['ascii_conversion'] ?
+        ASCII_DEFAULTS.merge(options['ascii_conversion']) :
+        ASCII_DEFAULTS
       @connections = []
     end
 

data/lib/flamethrower/server/{mock_server.rb → mock_connection.rb}

@@ -1,6 +1,6 @@
 module Flamethrower
-  class MockServer
-    include Flamethrower::Server
+  class MockConnection
+    include Flamethrower::Connection
 
     def send_data(msg)
     end
@@ -9,5 +9,9 @@ module Flamethrower
       Flamethrower::Campfire::Connection.new("mydomain", "mytoken", self)
     end
 
+    def server
+      Flamethrower::EventServer.new
+    end
+
   end
 end

data/spec/fixtures/recent_messages.json

@@ -0,0 +1 @@
+{"messages":[{"type":"KickMessage","room_id":347348,"created_at":"2011/05/02 04:30:15 +0000","id":344873939,"body":null,"user_id":899091},{"type":"TimestampMessage","room_id":347348,"created_at":"2011/05/02 17:45:00 +0000","id":345107174,"body":null,"user_id":null},{"type":"EnterMessage","room_id":347348,"created_at":"2011/05/02 17:45:17 +0000","id":345107175,"body":null,"user_id":734581},{"type":"EnterMessage","room_id":347348,"created_at":"2011/05/02 17:45:58 +0000","id":345107527,"body":null,"user_id":899091},{"type":"TextMessage","room_id":347348,"created_at":"2011/05/02 17:46:33 +0000","id":345107811,"body":"http://www.berkeleytwpschools.com/bts/Potter/Classroom%20Web%20Pages/Library/Links%20of%20the%20Month/___zumuhead.html_files/sad-eyes-dog-puppy-clip-art-thumb3033696.jpg","user_id":899091},{"type":"TimestampMessage","room_id":347348,"created_at":"2011/05/02 18:00:00 +0000","id":345116388,"body":null,"user_id":null},{"type":"KickMessage","room_id":347348,"created_at":"2011/05/02 18:00:27 +0000","id":345116389,"body":null,"user_id":734581},{"type":"KickMessage","room_id":347348,"created_at":"2011/05/02 18:00:27 +0000","id":345116395,"body":null,"user_id":899091},{"type":"TimestampMessage","room_id":347348,"created_at":"2011/05/09 04:00:00 +0000","id":347880310,"body":null,"user_id":null},{"type":"EnterMessage","room_id":347348,"created_at":"2011/05/09 04:01:34 +0000","id":347880311,"body":null,"user_id":734581}]}

data/spec/fixtures/streaming_image_message.json

@@ -0,0 +1 @@
+{"room_id":73541,"created_at":"2010/12/14 20:09:23 +0000","body":"http://example.com/kitties.jpg","id":289361911,"user_id":489198,"type":"TextMessage"}

data/spec/fixtures/tweet_message.json

@@ -0,0 +1 @@
+{"room_id":73541,"created_at":"2011/01/26 16:34:46 +0000","body":"--- \n:author_username: jeresig\n:author_avatar_url: http://a1.twimg.com/profile_images/1181631474/john_normal.jpg\n:message: \"A hilarious video pops up after you unsubscribe from Groupon emails: http://j.mp/hpes49 Punish the developer!\"\n:id: 30293022537162752\n","id":304070140,"user_id":703609,"type":"TweetMessage"}

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 $:.unshift File.join(File.dirname(__FILE__), "../lib")
 
 require 'flamethrower'
-require 'server/mock_server'
+require 'server/mock_connection'
 require 'webmock/rspec'
 require 'json'
 require 'time'

data/spec/unit/campfire/connection_spec.rb

@@ -2,26 +2,26 @@ require File.join(File.dirname(__FILE__), "../../spec_helper")
 
 describe Flamethrower::Campfire::Connection do
   before do
-    @server = Flamethrower::MockServer.new
-    @connection = @server.campfire_connection
+    @connection = Flamethrower::MockConnection.new
+    @campfire_connection = @connection.campfire_connection
   end
 
   describe "#fetch_my_user" do
-    it "retrieves my user and stores it on the connection" do
+    it "retrieves my user and stores it on the campfire_connection" do
       stub_request(:get, "https://mydomain.campfirenow.com/users/me.json").
         with(:headers => {'Authorization'=>['mytoken', 'x']}).
         to_return(:status => 200, :body => json_fixture("user"))
-      EM.run_block { @connection.fetch_my_user }
-      @server.current_user.nickname.should == "blake"
+      EM.run_block { @campfire_connection.fetch_my_user }
+      @connection.current_user.nickname.should == "blake"
     end
 
     it "renames your current user to the new current user" do
-      @server.current_user = Flamethrower::Irc::User.new(:nickname => "bob")
+      @connection.current_user = Flamethrower::Irc::User.new(:nickname => "bob")
       stub_request(:get, "https://mydomain.campfirenow.com/users/me.json").
         with(:headers => {'Authorization'=>['mytoken', 'x']}).
         to_return(:status => 200, :body => json_fixture("user"))
-      @server.should_receive(:send_message).with(":bob NICK blake")
-      EM.run_block { @connection.fetch_my_user }
+      @connection.should_receive(:send_message).with(":bob NICK blake")
+      EM.run_block { @campfire_connection.fetch_my_user }
     end
   end
 
@@ -30,8 +30,8 @@ describe Flamethrower::Campfire::Connection do
       stub_request(:get, "https://mydomain.campfirenow.com/rooms.json").
         with(:headers => {'Authorization'=>['mytoken', 'x']}).
         to_return(:status => 200, :body => json_fixture("rooms"))
-      EM.run_block { @connection.fetch_rooms }
-      room = @server.irc_channels.first.to_campfire
+      EM.run_block { @campfire_connection.fetch_rooms }
+      room = @connection.irc_channels.first.to_campfire
       room.number.should == 347348
       room.name.should == "Room 1"
       room.topic.should == "some topic"
@@ -41,7 +41,7 @@ describe Flamethrower::Campfire::Connection do
       stub_request(:get, "https://mydomain.campfirenow.com/rooms.json").
              with(:headers => {'Authorization'=>['mytoken', 'x']}).
              to_return(:status => 200, :body => json_fixture("rooms"))
-      EM.run_block { @connection.fetch_rooms }
+      EM.run_block { @campfire_connection.fetch_rooms }
       assert_requested(:get, "https://mydomain.campfirenow.com/rooms.json") {|req| req.headers['Authorization'].should == ["mytoken", "x"]}
     end
 
@@ -49,14 +49,17 @@ describe Flamethrower::Campfire::Connection do
       stub_request(:get, "https://mydomain.campfirenow.com/rooms.json").
              with(:headers => {'Authorization'=>['mytoken', 'x']}).
              to_return(:status => 400)
-      EM.run_block { @connection.fetch_rooms }
-      @server.irc_channels.should == []
+      EM.run_block { @campfire_connection.fetch_rooms }
+      @connection.irc_channels.should == []
     end
 
-    xit "sends a motd error message if unable to fetch room list" do
-      @connection.should_receive(:campfire_get).and_raise(SocketError) 
-      @server.should_receive(:send_message).with(@server.reply(Flamethrower::Irc::Codes::RPL_MOTD, ":ERROR: Unable to fetch room list! Check your connection?"))
-      @connection.rooms.should == []
+    it "sends a motd error message if unable to fetch room list" do
+      stub_request(:get, "https://mydomain.campfirenow.com/rooms.json").
+             with(:headers => {'Authorization'=>['mytoken', 'x']}).
+             to_timeout
+      @connection.should_receive(:send_message).with(@connection.reply(Flamethrower::Irc::Codes::RPL_MOTD, ":ERROR: Unable to make API call GET /rooms.json. Check your connection?"))
+      EM.run_block { @campfire_connection.fetch_rooms }
+      @connection.irc_channels.should == []
     end
   end
 

data/spec/unit/campfire/message_spec.rb

@@ -75,6 +75,72 @@ describe Flamethrower::Campfire::Message do
     end
   end
 
+  describe "#image_urls" do
+    it "returns a standalone image url" do
+      @message.body = "http://example.com/kitties.jpg"
+      @message.image_urls.should == ["http://example.com/kitties.jpg"]
+    end
+
+    it "supports jpeg" do
+      @message.body = "http://example.com/kitties.jpeg"
+      @message.image_urls.should == ["http://example.com/kitties.jpeg"]
+    end
+
+    it "supports gif" do
+      @message.body = "http://example.com/kitties.gif"
+      @message.image_urls.should == ["http://example.com/kitties.gif"]
+    end
+
+    it "supports png" do
+      @message.body = "http://example.com/kitties.png"
+      @message.image_urls.should == ["http://example.com/kitties.png"]
+    end
+
+    it "supports multiple images" do
+      @message.body = "http://example.com/kitties.png http://blah.com/duppy-pogs.png"
+      @message.image_urls.should == ["http://example.com/kitties.png", "http://blah.com/duppy-pogs.png"]
+    end
+
+    it "supports interleaved urls with messages" do
+      @message.body = "check this out: http://example.com/kitties.png"
+      @message.image_urls.should == ["http://example.com/kitties.png"]
+    end
+
+    it "supports upcased image extensions" do
+      @message.body = "check this out: http://example.com/kitties.PNG"
+      @message.image_urls.should == ["http://example.com/kitties.PNG"]
+    end
+
+    it "supports https image links" do
+      @message.body = "check this out: https://example.com/kitties.png"
+      @message.image_urls.should == ["https://example.com/kitties.png"]
+    end
+  end
+
+  describe "#has_images?" do
+    it "returns true if there are images present in the body" do
+      @message.body = "look ma! kitties! http://example.com/kitties.jpg"
+      @message.should have_images
+    end
+
+    it "returns false if there are no images present in the body" do
+      @message.body = "i love lamp, i really do"
+      @message.should_not have_images
+    end
+  end
+
+  describe "#needs_conversion?" do
+    it "returns true if the image hasn't been converted yet" do
+      @message.body = "look ma! kitties! http://example.com/kitties.jpg"
+      @message.should be_needs_image_conversion
+    end
+
+    it "returns false if the image has already been converted" do
+      @message.set_ascii_image("LOLCATS ASCII HERE!")
+      @message.should_not be_needs_image_conversion
+    end
+  end
+
   describe "#mark_delivered!" do
     it "sets the status to delivered" do
       @message.status.should_not == "delivered"

data/spec/unit/campfire/room_spec.rb

@@ -2,9 +2,9 @@ require File.join(File.dirname(__FILE__), "../../spec_helper")
 
 describe Flamethrower::Campfire::Room do
   before do
-    @server = Flamethrower::MockServer.new
+    @connection = Flamethrower::MockConnection.new
     @room = Flamethrower::Campfire::Room.new("mydomain", "mytoken", "id" => 347348, "topic" => "some topic", "name" => "some name")
-    @room.server = @server
+    @room.connection = @connection
     @user = Flamethrower::Campfire::User.new('name' => "bob", 'id' => 489198)
     @user2 = Flamethrower::Campfire::User.new('name' => "bill", 'id' => 123456)
   end
@@ -30,6 +30,38 @@ describe Flamethrower::Campfire::Room do
     end
   end
 
+  describe "#on_reconnect" do
+    it "writes to the log that it reconnected" do
+      message = "Reconnected to some name stream"
+      ::FLAMETHROWER_LOGGER.should_receive(:debug).with(message)
+
+      @room.on_reconnect
+    end
+  end
+
+  describe "#on_max_reconnects" do
+    before do
+      @room.instance_variable_set("@stream", mock(:stream))
+    end
+
+    it "writes to the log that it has failed to reconnect" do
+      @room.stub(:setup_reconnect)
+      message = "Failed to reconnect to some name, restarting room in 20 seconds"
+      ::FLAMETHROWER_LOGGER.should_receive(:debug).with(message)
+
+      @room.on_max_reconnects
+    end
+  end
+
+  describe "#on_error" do
+    it "writes to the log that there was an error" do
+      message = "There was an error connecting to some name stream"
+      ::FLAMETHROWER_LOGGER.should_receive(:debug).with(message)
+
+      @room.on_error
+    end
+  end
+
   describe "#send_topic!" do
     it "sets the topic when the campfire API returns 200" do
       stub_request(:put, "https://mydomain.campfirenow.com/room/347348.json").
@@ -47,6 +79,40 @@ describe Flamethrower::Campfire::Room do
       EM.run_block { @room.send_topic("some updated topic") }
       @room.topic.should == "some old topic"
     end
+
+    it "sends a motd error message if the send_topic call times out" do
+      stub_request(:put, "https://mydomain.campfirenow.com/room/347348.json").
+        with(:headers => {'Authorization'=>['mytoken', 'x'], 'Content-Type'=>'application/json'}).
+        to_timeout
+      @connection.should_receive(:send_message).with(@connection.reply(Flamethrower::Irc::Codes::RPL_MOTD, ":ERROR: Unable to make API call PUT /room/347348.json. Check your connection?"))
+      @room.instance_variable_set("@topic", "some old topic")
+      EM.run_block { @room.send_topic("some updated topic") }
+      @room.topic.should == "some old topic"
+    end
+  end
+
+  describe "#stop" do
+    it "should stop the stream" do
+      EventMachine.stub(:cancel_timer)
+      @room.instance_variable_set("@stream", mock(:stream, :stop => nil))
+      @room.stream.should_receive(:stop)
+      @room.stop
+    end
+
+    it "should cancel the timers" do
+      timer = mock(:timer)
+      @room.instance_variable_set("@polling_timer", timer)
+      @room.instance_variable_set("@periodic_timer", timer)
+      EventMachine.should_receive(:cancel_timer).with(timer).twice
+      @room.stop
+    end
+
+    it "should flip all the appropriate stop booleans" do
+      EventMachine.stub(:cancel_timer)
+      @room.stop
+      @room.should_not be_alive
+      @room.instance_variable_get("@room_info_set").should be_false
+    end
   end
 
   describe "#fetch_room_info" do
@@ -54,6 +120,7 @@ describe Flamethrower::Campfire::Room do
       stub_request(:get, "https://mydomain.campfirenow.com/room/347348.json").
         with(:headers => {'Authorization'=>['mytoken', 'x']}).
         to_return(:status => 200, :body => json_fixture("room"))
+      @room.stub(:fetch_recent_messages)
     end
 
     it "retrieves a list of users and stores them as user objects" do
@@ -71,6 +138,31 @@ describe Flamethrower::Campfire::Room do
       EM.run_block { @room.fetch_room_info }
       assert_requested(:get, "https://mydomain.campfirenow.com/room/347348.json") {|req| req.headers['Authorization'].should == ["mytoken", "x"]}
     end
+
+    it "calls fetch_recent_messages if the room_info_set is false" do
+      @room.instance_variable_set("@room_info_sent", false)
+      @room.should_receive(:fetch_recent_messages)
+      EM.run_block { @room.fetch_room_info }
+    end
+
+    it "doesn't call fetch_recent_messages if the room_info_sent = true" do
+      @room.instance_variable_set("@room_info_sent", true)
+      @room.should_not_receive(:fetch_recent_messages)
+      EM.run_block { @room.fetch_room_info }
+    end
+  end
+
+  describe "#fetch_recent_messages" do
+    before do
+      stub_request(:get, "https://mydomain.campfirenow.com/room/347348/recent.json?limit=10").
+        with(:headers => {'Authorization'=>['mytoken', 'x']}).
+        to_return(:status => 200, :body => json_fixture("recent_messages"))
+    end
+
+    it "retrieves the most recent 10 messages and sends them to the inbound message queue" do
+      EM.run_block { @room.fetch_recent_messages }
+      @room.instance_variable_get("@users_to_fetch").size.should == 7
+    end
   end
 
   describe "#resolve renames" do
@@ -87,12 +179,48 @@ describe Flamethrower::Campfire::Room do
       bob2.name = "Bob Hope"
       new_users = [blake2, bob2, bill]
 
-      @room.server.should_receive(:send_rename).with("blake", "Blake_Smith")
-      @room.server.should_receive(:send_rename).with("bob", "Bob_Hope")
+      @room.connection.should_receive(:send_rename).with("blake", "Blake_Smith")
+      @room.connection.should_receive(:send_rename).with("bob", "Bob_Hope")
+      @room.resolve_renames(old_users, new_users)
+    end
+
+    it "doesn't rename if old_users has a user that new_users doesn't" do
+      blake = Flamethrower::Campfire::User.new('id' => 1, 'name' => 'blake')
+      bob = Flamethrower::Campfire::User.new('id' => 2, 'name' => 'bob')
+      bill = Flamethrower::Campfire::User.new('id' => 3, 'name' => 'bill')
+      old_users = [blake, bob, bill]
+      new_users = [blake, bob]
+
+      @room.connection.should_not_receive(:send_rename)
       @room.resolve_renames(old_users, new_users)
     end
   end
 
+  describe "#fetch_images" do
+    it "makes a call to the image ascii service to convert the image" do
+      stub_request(:get, "http://skeeter.blakesmith.me/?image_url=http://example.com/kitties.jpg&width=80").
+        to_return(:status => 200, :body => "LOLCAT ASCII ART HERE!")
+      @message = Flamethrower::Campfire::Message.new(JSON.parse(json_fixture("streaming_image_message")))
+      @room.instance_variable_get("@images_to_fetch") << @message
+      EM.run_block { @room.fetch_images }
+      expected_body = "http://example.com/kitties.jpg\n"
+      expected_body << "LOLCAT ASCII ART HERE!"
+      @message.body.should == expected_body
+    end
+
+    context "when the image get call fails" do
+      it "marks the message as failed and puts it into the failed messages" do
+        stub_request(:get, "http://skeeter.blakesmith.me/?image_url=http://example.com/kitties.jpg&width=80").
+          to_return(:status => 400, :body => "An error has occured")
+        @message = Flamethrower::Campfire::Message.new(JSON.parse(json_fixture("streaming_image_message")))
+        @message.user = mock('user')
+        @room.instance_variable_get("@images_to_fetch") << @message
+        EM.run_block { @room.fetch_images }
+        @room.instance_variable_get("@failed_messages").size.should == 1
+      end
+    end
+  end
+
   describe "#fetch_users" do
     it "makes a call to the campfire api to fetch user information" do
       stub_request(:get, "https://mydomain.campfirenow.com/users/734581.json").
@@ -104,9 +232,8 @@ describe Flamethrower::Campfire::Room do
     end
 
     it "fetches using the 'user_id' field if a streaming message" do
-      stub_request(:get, "https://mytoken:x@mydomain.campfirenow.com/users/734581.json").to_return(:body => json_fixture("user"), :status => 200)
       @room.instance_variable_get("@users_to_fetch") << Flamethrower::Campfire::Message.new(JSON.parse(json_fixture("enter_message")))
-      @room.should_receive(:campfire_get).with("/users/734581.json").and_return(mock(:post, :callback => nil))
+      @room.should_receive(:campfire_get).with("/users/734581.json").and_return(mock(:get, :callback => nil))
       EM.run_block { @room.fetch_users }
     end
 
@@ -115,7 +242,9 @@ describe Flamethrower::Campfire::Room do
         stub_request(:get, "https://mydomain.campfirenow.com/users/734581.json").
           with(:headers => {'Authorization'=>['mytoken', 'x']}).
           to_return(:status => 200, :body => json_fixture("user"))
-        @room.instance_variable_get("@users_to_fetch") << Flamethrower::Campfire::Message.new(JSON.parse(json_fixture("enter_message")))
+        json = JSON.parse(json_fixture('enter_message'))
+        json['direction'] = 'inbound'
+        @room.instance_variable_get("@users_to_fetch") << Flamethrower::Campfire::Message.new(json)
         EM.run_block { @room.fetch_users }
         message = @room.inbound_messages.pop.user.number.should == 734581
       end
@@ -130,6 +259,15 @@ describe Flamethrower::Campfire::Room do
         EM.run_block { @room.fetch_users }
         message = @room.inbound_messages.size.should == 0
       end
+
+      it "marks the message as failed and puts it into failed messages" do
+        stub_request(:get, "https://mydomain.campfirenow.com/users/734581.json").
+          with(:headers => {'Authorization'=>['mytoken', 'x']}).
+          to_return(:status => 400, :body => json_fixture("user"))
+        @room.instance_variable_get("@users_to_fetch") << Flamethrower::Campfire::Message.new(JSON.parse(json_fixture("enter_message")))
+        EM.run_block { @room.fetch_users }
+        message = @room.instance_variable_get("@failed_messages").size.should == 1
+      end
     end
   end
 
@@ -149,18 +287,37 @@ describe Flamethrower::Campfire::Room do
       EM.run_block { @room.join }
       @room.joined.should be_false
     end
+
+    it "sends a motd error message if the join call times out" do
+      stub_request(:post, "https://mydomain.campfirenow.com/room/347348/join.json").
+        with(:headers => {'Authorization'=>['mytoken', 'x'], 'Content-Type'=>'application/json'}).
+        to_timeout
+      @connection.should_receive(:send_message).with(@connection.reply(Flamethrower::Irc::Codes::RPL_MOTD, ":ERROR: Unable to make API call POST /room/347348/join.json. Check your connection?"))
+      EM.run_block { @room.join }
+      @room.joined.should be_false
+    end
   end
 
   describe "#connect" do
     it "initializes the twitter jsonstream with the right options" do
-      Twitter::JSONStream.should_receive(:connect).with(:path => "/room/347348/live.json", :host => "streaming.campfirenow.com", :auth => "mytoken:x")
+      stream = mock(:stream, :on_reconnect => nil, :on_error => nil, :on_max_reconnects => nil)
+      Twitter::JSONStream.should_receive(:connect).with(:path => "/room/347348/live.json", :host => "streaming.campfirenow.com", :auth => "mytoken:x").and_return(stream)
+      @room.connect
+    end
+
+    it "sets up the stream callbacks" do
+      stream = mock(:stream, :on_reconnect => nil, :on_error => nil, :on_max_reconnects => nil)
+      Twitter::JSONStream.should_receive(:connect).with(:path => "/room/347348/live.json", :host => "streaming.campfirenow.com", :auth => "mytoken:x").and_return(stream)
+
+      @room.should_receive(:setup_stream_callbacks)
       @room.connect
     end
   end
 
   describe "#fetch_messages" do
     before do
-      Twitter::JSONStream.stub(:connect).and_return("stream")
+      stream = mock(:stream, :on_reconnect => nil, :on_error => nil, :on_max_reconnects => nil)
+      Twitter::JSONStream.stub(:connect).and_return(stream)
       @item = json_fixture("streaming_message")
       @room.users << @user
       @room.connect
@@ -188,6 +345,11 @@ describe Flamethrower::Campfire::Room do
       @room.inbound_messages.pop.room.should == @room
     end
 
+    it "marks the message as inbound" do
+      @room.fetch_messages
+      @room.inbound_messages.pop.should be_inbound
+    end
+
     it "discards timestamp messages altogether" do
       item = json_fixture("timestamp_message")
       @room.stream.stub(:each_item).and_yield(item)
@@ -202,23 +364,46 @@ describe Flamethrower::Campfire::Room do
       @room.stream.stub(:each_item).and_yield(enter_message.to_json)
       @room.fetch_messages
       @room.instance_variable_get("@users_to_fetch").size.should == 1
+      @room.instance_variable_get("@inbound_messages").size.should == 0
+    end
+
+    it "puts messages that have an image url in the into the images_to_fetch queue" do
+      image_message = json_fixture("streaming_image_message")
+      @room.stream.stub(:each_item).and_yield(image_message)
+      @room.fetch_messages
+      @room.instance_variable_get("@inbound_messages").size.should == 0
+      @room.instance_variable_get("@images_to_fetch").size.should == 1
+    end
+
+    it "doesn't make the call to the image ascii service if the option is disabled" do
+      @room.connection.server.ascii_conversion['enabled'] = false
+      image_message = json_fixture("streaming_image_message")
+      @room.stream.stub(:each_item).and_yield(image_message)
+      @room.fetch_messages
+      @room.instance_variable_get("@users_to_fetch").size.should == 0
+      @room.instance_variable_get("@images_to_fetch").size.should == 0
+      @room.instance_variable_get("@inbound_messages").size.should == 1
     end
   end
 
   describe "#say" do
     it "queues a campfire message given a message body" do
-      message = Flamethrower::Campfire::Message.new('body' => 'Hello there', 'user' => @user, 'room' => @room)
       @room.say('Hello there')
       popped_message = @room.outbound_messages.pop
       popped_message.body.should == 'Hello there'
     end
 
     it "takes an optional message type" do
-      message = Flamethrower::Campfire::Message.new('type' => 'TextMessage', 'body' => 'Hello there', 'user' => @user, 'room' => @room)
       @room.say('Hello there', 'TextMessage')
       popped_message = @room.outbound_messages.pop
       popped_message.message_type.should == 'TextMessage'
     end
+
+    it "marks the message as an outbound message" do
+      @room.say('Hello there', 'TextMessage')
+      popped_message = @room.outbound_messages.pop
+      popped_message.should be_outbound
+    end
   end
 
   describe "#translate_nicknames" do
@@ -240,25 +425,47 @@ describe Flamethrower::Campfire::Room do
   end
 
   describe "#requeue_failed_messages" do
-    it "queues a message whos retry_at is greater than now" do
+    it "queues an outbound message whos retry_at is greater than now" do
       Time.stub(:now).and_return(Time.parse("9:00AM"))
-      message = Flamethrower::Campfire::Message.new('type' => 'TextMessage', 'body' => 'Hello there', 'user' => @user, 'room' => @room)
+      message = Flamethrower::Campfire::Message.new('type' => 'TextMessage', 'body' => 'Hello there', 'user' => @user, 'room' => @room, 'direction' => 'outbound')
       message.retry_at = Time.parse("9:00:01AM")
+      message.status = "failed"
       @room.failed_messages << message
       @room.requeue_failed_messages
       @room.outbound_messages.size.should == 1
       @room.failed_messages.size.should == 0
     end
 
+    it "queues an inbound message whos retry_at is greater than now" do
+      Time.stub(:now).and_return(Time.parse("9:00AM"))
+      message = Flamethrower::Campfire::Message.new('type' => 'TextMessage', 'body' => 'Hello there', 'user' => @user, 'room' => @room, 'direction' => 'inbound')
+      message.retry_at = Time.parse("9:00:01AM")
+      message.status = "failed"
+      @room.failed_messages << message
+      @room.requeue_failed_messages
+      @room.inbound_messages.size.should == 1
+      @room.failed_messages.size.should == 0
+    end
+
     it "doesn't queue a message whos retry_at is less than now" do
       Time.stub(:now).and_return(Time.parse("9:00AM"))
-      message = Flamethrower::Campfire::Message.new('type' => 'TextMessage', 'body' => 'Hello there', 'user' => @user, 'room' => @room)
+      message = Flamethrower::Campfire::Message.new('type' => 'TextMessage', 'body' => 'Hello there', 'user' => @user, 'room' => @room, 'direction' => 'outbound')
       message.retry_at = Time.parse("8:59AM")
+      message.status = "failed"
       @room.failed_messages << message
       @room.requeue_failed_messages
       @room.outbound_messages.size.should == 0
       @room.failed_messages.size.should == 1
     end
+
+    it "marks the message as pending when it requeues" do
+      Time.stub(:now).and_return(Time.parse("9:00AM"))
+      message = Flamethrower::Campfire::Message.new('type' => 'TextMessage', 'body' => 'Hello there', 'user' => @user, 'room' => @room, 'direction' => 'inbound')
+      message.mark_failed!
+      @room.failed_messages << message
+      @room.requeue_failed_messages
+      message.should be_pending
+    end
   end
 
   describe "#post_messages" do