flamethrower 0.1.0 → 0.2.0

data/lib/flamethrower/dispatcher.rb

@@ -57,7 +57,7 @@ module Flamethrower
 
     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
+        channel.to_campfire.send_topic(message.parameters.last) if message.parameters.size > 1
         server.send_topic(channel)
       end
     end
@@ -80,22 +80,26 @@ module Flamethrower
         room = channel.to_campfire
         channel.users << server.current_user
         room.join
-        room.fetch_room_info
-        room.start_thread
-        server.send_topic(channel)
-        server.send_userlist(channel)
+        room.start
+      end
+    end
+
+    def handle_who(message)
+      find_channel_or_error(message.parameters.first) do |channel|
+        server.send_who(channel)
       end
     end
 
     def handle_part(message)
       find_channel_or_error(message.parameters.first) do |channel|
         room = channel.to_campfire
-        room.kill_thread!
+        room.stop
+        server.send_part(server.current_user, channel)
       end
     end
 
     def handle_quit(message)
-      server.irc_channels.each {|c| c.to_campfire.kill_thread!}
+      server.irc_channels.each {|c| c.to_campfire.stop}
     end
   end
 end

data/lib/flamethrower/irc/codes.rb

@@ -5,6 +5,8 @@ module Flamethrower
       RPL_MOTD = 372
       RPL_ENDOFMOTD = 376
       RPL_TOPIC = 332
+      RPL_WHOREPLY = 352
+      RPL_ENDOFWHO = 315
       RPL_NAMEREPLY = 353
       RPL_ENDOFNAMES = 366
       RPL_CHANNELMODEIS = 324

data/lib/flamethrower/irc/commands.rb

@@ -33,6 +33,19 @@ module Flamethrower
         end
       end
 
+      def send_rename(from, to)
+        send_message ":#{from} NICK #{to}"
+      end
+
+      def send_who(channel)
+        send_messages do |messages|
+          channel.users.each do |user|
+            messages << reply(RPL_WHOREPLY, "#{channel.name} #{user.nickname} #{user.hostname} localhost #{user.nickname} H :0 #{user.nickname}")
+          end
+          messages << reply(RPL_ENDOFWHO, "#{channel.name} :/End of /WHO list")
+        end
+      end
+
       def send_channel_mode(channel)
         send_message reply(RPL_CHANNELMODEIS, "#{channel.name} #{channel.mode}")
       end
@@ -45,6 +58,10 @@ module Flamethrower
         send_message reply(RPL_UMODEIS, @current_user.mode)
       end
 
+      def send_part(user, channel)
+        send_message ":#{user.to_s} PART #{channel.name}"
+      end
+
       def reply(code, message)
         ":#{@current_user.hostname} #{code} #{@current_user.nickname} #{message}"
       end

data/lib/flamethrower/server.rb

@@ -13,7 +13,7 @@ module Flamethrower
     def after_connect
       send_motd
       populate_irc_channels
-      send_channel_list
+      populate_my_user
     end
 
     def send_message(msg)
@@ -36,7 +36,11 @@ module Flamethrower
     end
 
     def populate_irc_channels
-      @irc_channels = campfire_connection.rooms.map(&:to_irc)
+      campfire_connection.fetch_rooms
+    end
+
+    def populate_my_user
+      campfire_connection.fetch_my_user
     end
 
   end

data/lib/flamethrower/server/event_server.rb

@@ -7,6 +7,18 @@ module Flamethrower
     def unbind
       @server.connections.delete(self)
     end
+
+    def stop
+      irc_channels.map do |channel|
+        channel.to_campfire.stop
+      end
+    end
+
+    def streams_alive?
+      irc_channels.any? do |channel|
+        channel.to_campfire.alive?
+      end
+    end
   end
 
   class EventServer
@@ -34,34 +46,33 @@ module Flamethrower
     def stop
       FLAMETHROWER_LOGGER.info("Killing room threads")
       @connections.each do |connection|
-        connection.irc_channels.map do |channel|
-          channel.to_campfire.kill_thread!
-        end
+        connection.stop
+        connection.close_connection
       end
       EventMachine.stop_server(@signature)
-      die_safely
+      EventMachine.add_periodic_timer(0.2) { die_safely }
     end
 
+    private
+
     def die_safely
       FLAMETHROWER_LOGGER.info("Waiting for streams and connections to die")
-      if streams_alive? && connections_alive?
-        EventMachine.add_periodic_timer(1) { die_safely }
+      if any_streams_alive? || any_connections_alive?
+        return
       else
         FLAMETHROWER_LOGGER.info("Done.")
         EventMachine.stop
       end
     end
 
-    def streams_alive?
+    def any_streams_alive?
       @connections.any? do |connection|
-        connection.irc_channels.any? do |channel|
-          channel.to_campfire.alive?
-        end
+        connection.streams_alive?
       end
     end
 
-    def connections_alive?
-      @connections.size <= 0
+    def any_connections_alive?
+      @connections.size > 0
     end
   end
 end

data/spec/fixtures/paste_message.json

@@ -1 +1 @@
-{"room_id":73541,"created_at":"2010/12/14 20:48:30 +0000","body":"Line one\\n\\tpoint one\\n\\tpoint two\\npoint three","id":289383470,"user_id":703609,"type":"PasteMessage"}
+{"room_id":73541,"created_at":"2010/12/14 20:48:30 +0000","body":"Line one\n\tpoint one\n\tpoint two\npoint three","id":289383470,"user_id":703609,"type":"PasteMessage"}

data/spec/spec_helper.rb

@@ -2,11 +2,12 @@ $:.unshift File.join(File.dirname(__FILE__), "../lib")
 
 require 'flamethrower'
 require 'server/mock_server'
+require 'webmock/rspec'
 require 'json'
-require 'fakeweb'
 require 'time'
 
-::FLAMETHROWER_LOGGER = Logger.new("/dev/null") unless Object.const_defined?("FLAMETHROWER_LOGGER")
+#::FLAMETHROWER_LOGGER = Logger.new("/dev/null") unless Object.const_defined?("FLAMETHROWER_LOGGER")
+::FLAMETHROWER_LOGGER = Logger.new("/Users/blake/test.log") unless Object.const_defined?("FLAMETHROWER_LOGGER")
 
 def json_fixture(name)
   file = File.join(File.dirname(__FILE__), "fixtures/#{name}.json")

data/spec/unit/campfire/connection_spec.rb

@@ -4,30 +4,56 @@ describe Flamethrower::Campfire::Connection do
   before do
     @server = Flamethrower::MockServer.new
     @connection = @server.campfire_connection
-    FakeWeb.allow_net_connect = false
+  end
+
+  describe "#fetch_my_user" do
+    it "retrieves my user and stores it on the 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"
+    end
+
+    it "renames your current user to the new current user" do
+      @server.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 }
+    end
   end
 
   describe "#rooms" do
     it "retrieves a list of rooms from JSON" do
-      FakeWeb.register_uri(:get, "https://mytoken:x@mydomain.campfirenow.com/rooms.json", :body => json_fixture("rooms"), :status => ["200", "OK"])
-      room = @connection.rooms.first
+      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
       room.number.should == 347348
       room.name.should == "Room 1"
       room.topic.should == "some topic"
     end
 
     it "makes the http request with a token in basic auth" do
-      FakeWeb.register_uri(:get, "https://mytoken:x@mydomain.campfirenow.com/rooms.json", :body => json_fixture("rooms"), :status => ["200", "OK"])
-      @connection.rooms
-      FakeWeb.last_request['authorization'].should == "Basic #{Base64::encode64("#{@connection.token}:x").chomp}"
+      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 }
+      assert_requested(:get, "https://mydomain.campfirenow.com/rooms.json") {|req| req.headers['Authorization'].should == ["mytoken", "x"]}
     end
 
     it "returns empty set if not a successful response" do
-      FakeWeb.register_uri(:get, "https://mytoken:x@mydomain.campfirenow.com/rooms.json", :status => ["400", "Bad Request"])
-      @connection.rooms.should == []
+      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 == []
     end
 
-    it "sends a motd error message if unable to fetch room list" do
+    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 == []

data/spec/unit/campfire/message_spec.rb

@@ -67,7 +67,11 @@ describe Flamethrower::Campfire::Message do
       message = Flamethrower::Campfire::Message.new(json)
       message.user = @campfire_user
       message.room = @room
-      message.to_irc.to_s.should == ":#{@irc_user.to_s} PRIVMSG #{@channel.name} :Line one\\n\\tpoint one\\n\\tpoint two\\npoint three"
+      expected = ":#{@irc_user.to_s} PRIVMSG #{@channel.name} :Line one\r\n"
+      expected << ":#{@irc_user.to_s} PRIVMSG #{@channel.name} :\tpoint one\r\n"
+      expected << ":#{@irc_user.to_s} PRIVMSG #{@channel.name} :\tpoint two\r\n"
+      expected << ":#{@irc_user.to_s} PRIVMSG #{@channel.name} :point three"
+      message.to_irc.to_s.should == expected
     end
   end
 

data/spec/unit/campfire/room_spec.rb

@@ -2,7 +2,9 @@ require File.join(File.dirname(__FILE__), "../../spec_helper")
 
 describe Flamethrower::Campfire::Room do
   before do
+    @server = Flamethrower::MockServer.new
     @room = Flamethrower::Campfire::Room.new("mydomain", "mytoken", "id" => 347348, "topic" => "some topic", "name" => "some name")
+    @room.server = @server
     @user = Flamethrower::Campfire::User.new('name' => "bob", 'id' => 489198)
     @user2 = Flamethrower::Campfire::User.new('name' => "bill", 'id' => 123456)
   end
@@ -30,64 +32,82 @@ describe Flamethrower::Campfire::Room do
 
   describe "#send_topic!" do
     it "sets the topic when the campfire API returns 200" do
-      FakeWeb.register_uri(:put, "https://mytoken:x@mydomain.campfirenow.com/room/347348.json", :body => json_fixture("room_update"), :status => ["200", "OK"])
-      @room.send_topic!("some updated topic")
+      stub_request(:put, "https://mydomain.campfirenow.com/room/347348.json").
+        with(:headers => {'Authorization'=>['mytoken', 'x'], 'Content-Type'=>'application/json'}).
+        to_return(:status => 200, :body => json_fixture("room_update"))
+      EM.run_block { @room.send_topic("some updated topic") }
       @room.topic.should == "some updated topic"
     end
 
     it "keeps the previous topic when the campfire API returns non 200" do
-      FakeWeb.register_uri(:put, "https://mytoken:x@mydomain.campfirenow.com/room/347348.json", :body => json_fixture("room_update"), :status => ["400", "Bad Request"])
+      stub_request(:put, "https://mydomain.campfirenow.com/room/347348.json").
+        with(:headers => {'Authorization'=>['mytoken', 'x'], 'Content-Type'=>'application/json'}).
+        to_return(:status => 400, :body => json_fixture("room_update"))
       @room.instance_variable_set("@topic", "some old topic")
-      @room.send_topic!("some updated topic")
+      EM.run_block { @room.send_topic("some updated topic") }
       @room.topic.should == "some old topic"
     end
   end
 
   describe "#fetch_room_info" do
     before do
-      FakeWeb.register_uri(:get, "https://mytoken:x@mydomain.campfirenow.com/room/347348.json", :body => json_fixture("room"), :status => ["200", "OK"])
+      stub_request(:get, "https://mydomain.campfirenow.com/room/347348.json").
+        with(:headers => {'Authorization'=>['mytoken', 'x']}).
+        to_return(:status => 200, :body => json_fixture("room"))
     end
 
     it "retrieves a list of users and stores them as user objects" do
-      @room.fetch_room_info
+      EM.run_block { @room.fetch_room_info }
       @room.users.all? {|u| u.is_a?(Flamethrower::Campfire::User)}.should be_true
     end
 
+    it "doesn't send the room join info if the room has already been joined" do
+      @room.instance_variable_set("@room_info_sent", true)
+      @room.should_not_receive(:send_info)
+      EM.run_block { @room.fetch_room_info }
+    end
+
     it "makes the http request with a token in basic auth" do
-      @room.fetch_room_info
-      FakeWeb.last_request['authorization'].should == "Basic #{Base64::encode64("#{@room.token}:x").chomp}"
+      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
   end
 
   describe "#fetch_users" do
     it "makes a call to the campfire api to fetch user information" do
-      FakeWeb.register_uri(:get, "https://mytoken:x@mydomain.campfirenow.com/users/734581.json", :body => json_fixture("user"), :status => ["200", "OK"])
+      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")))
-      @room.fetch_users
+      EM.run_block { @room.fetch_users }
       @room.users.map(&:name).should == ["blake"]
     end
 
     it "fetches using the 'user_id' field if a streaming message" do
-      FakeWeb.register_uri(:get, "https://mytoken:x@mydomain.campfirenow.com/users/734581.json", :body => json_fixture("user"), :status => ["200", "OK"])
+      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")
-      @room.fetch_users
+      @room.should_receive(:campfire_get).with("/users/734581.json").and_return(mock(:post, :callback => nil))
+      EM.run_block { @room.fetch_users }
     end
 
     context "successfully get user info" do
       it "enqueues an EnterMessage into @inbound_messages for displaying in irc" do
-        FakeWeb.register_uri(:get, "https://mytoken:x@mydomain.campfirenow.com/users/734581.json", :body => json_fixture("user"), :status => ["200", "OK"])
+        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")))
-        @room.fetch_users
+        EM.run_block { @room.fetch_users }
         message = @room.inbound_messages.pop.user.number.should == 734581
       end
     end
 
     context "fails to get user info" do
       it "doesn't enqueue an EnterMessage" do
-        FakeWeb.register_uri(:get, "https://mytoken:x@mydomain.campfirenow.com/users/734581.json", :status => ["400", "Bad Request"])
+        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")))
-        @room.fetch_users
+        EM.run_block { @room.fetch_users }
         message = @room.inbound_messages.size.should == 0
       end
     end
@@ -95,13 +115,19 @@ describe Flamethrower::Campfire::Room do
 
   describe "#join" do
     it "returns true when posting to the room join call succeeds" do
-      FakeWeb.register_uri(:post, "https://mytoken:x@mydomain.campfirenow.com/room/347348/join.json", :status => ["200", "OK"])
-      @room.join.should == true
+      stub_request(:post, "https://mydomain.campfirenow.com/room/347348/join.json").
+        with(:headers => {'Authorization'=>['mytoken', 'x'], 'Content-Type'=>'application/json'}).
+        to_return(:status => 200)
+      EM.run_block { @room.join }
+      @room.joined.should be_true
     end
 
     it "returns false when posting to the room join call fails" do
-      FakeWeb.register_uri(:post, "https://mytoken:x@mydomain.campfirenow.com/room/347348/join.json", :status => ["400", "Bad Request"])
-      @room.join.should == false
+      stub_request(:post, "https://mydomain.campfirenow.com/room/347348/join.json").
+        with(:headers => {'Authorization'=>['mytoken', 'x'], 'Content-Type'=>'application/json'}).
+        to_return(:status => 400)
+      EM.run_block { @room.join }
+      @room.joined.should be_false
     end
   end
 
@@ -199,59 +225,56 @@ describe Flamethrower::Campfire::Room do
 
   describe "#post_messages" do
     it "pops the message off the queue and posts it to the campfire api" do
-      FakeWeb.register_uri(:post, "https://mytoken:x@mydomain.campfirenow.com/room/347348/speak.json", :body => json_fixture("speak_message"), :status => ["201", "Created"])
+     stub_request(:post, "https://mydomain.campfirenow.com/room/347348/speak.json").
+       with(:headers => {'Authorization'=>['mytoken', 'x'], 'Content-Type'=>'application/json'}).
+       to_return(:status => 200, :body => json_fixture("speak_message"))
       message = Flamethrower::Campfire::Message.new('type' => 'TextMessage', 'body' => 'Hello there', 'user' => @user, 'room' => @room)
       @room.outbound_messages << message
-      @room.post_messages
+      EM.run_block { @room.post_messages }
       @room.outbound_messages.size.should == 0
     end
 
     it "adds the message to the failed_messages array if it fails to post to the campfire API" do
-      FakeWeb.register_uri(:post, "https://mytoken:x@mydomain.campfirenow.com/room/347348/speak.json", :status => ["400", "Bad Request"])
+      stub_request(:post, "https://mydomain.campfirenow.com/room/347348/speak.json").
+        with(:headers => {'Authorization'=>['mytoken', 'x'], 'Content-Type'=>'application/json'}).
+        to_return(:status => 400, :body => json_fixture("speak_message"))
+      
       message = Flamethrower::Campfire::Message.new('type' => 'TextMessage', 'body' => 'Hello there', 'user' => @user, 'room' => @room)
       @room.outbound_messages << message
-      @room.post_messages
+      EM.run_block { @room.post_messages }
       @room.outbound_messages.size.should == 0
       @room.failed_messages.size.should == 1
     end
 
     it "marks the message as failed when not able to deliver" do
-      FakeWeb.register_uri(:post, "https://mytoken:x@mydomain.campfirenow.com/room/347348/speak.json", :status => ["400", "Bad Request"])
+     stub_request(:post, "https://mydomain.campfirenow.com/room/347348/speak.json").
+       with(:headers => {'Authorization'=>['mytoken', 'x'], 'Content-Type'=>'application/json'}).
+       to_return(:status => 400, :body => json_fixture("speak_message"))
+      
       message = Flamethrower::Campfire::Message.new('type' => 'TextMessage', 'body' => 'Hello there', 'user' => @user, 'room' => @room)
       @room.outbound_messages << message
-      @room.post_messages
+      EM.run_block { @room.post_messages }
       message.status.should == "failed"
     end
 
     it "marks the message as delivered if successfully posted to campfire" do
-      FakeWeb.register_uri(:post, "https://mytoken:x@mydomain.campfirenow.com/room/347348/speak.json", :body => json_fixture("speak_message"), :status => ["201", "Created"])
+     stub_request(:post, "https://mydomain.campfirenow.com/room/347348/speak.json").
+       with(:headers => {'Authorization'=>['mytoken', 'x'], 'Content-Type'=>'application/json'}).
+       to_return(:status => 201, :body => json_fixture("speak_message"))
+      
       message = Flamethrower::Campfire::Message.new('type' => 'TextMessage', 'body' => 'Hello there', 'user' => @user, 'room' => @room)
       @room.outbound_messages << message
-      @room.post_messages
+      EM.run_block { @room.post_messages }
       message.status.should == "delivered"
     end
 
     it "sends the right json" do
-      FakeWeb.register_uri(:post, "https://mytoken:x@mydomain.campfirenow.com/room/347348/speak.json", :body => json_fixture("speak_message"), :status => ["201", "Created"])
+      stub_request(:post, "https://mytoken:x@mydomain.campfirenow.com/room/347348/speak.json").to_return(:body => json_fixture("speak_message"), :status => 201)
       message = Flamethrower::Campfire::Message.new('type' => 'TextMessage', 'body' => 'Hello there', 'user' => @user, 'room' => @room)
       @room.outbound_messages << message
       expected_json = {"message"=>{"body"=>"Hello there", "type"=>"TextMessage"}}.to_json
-      @room.should_receive(:campfire_post).with("/room/#{@room.number}/speak.json", expected_json)
-      @room.post_messages
-    end
-  end
-
-  describe "#retrieve_messages" do
-    it "returns all the messages in the message buffer" do
-      @room.inbound_messages << "one"
-      @room.inbound_messages << "two"
-      @room.retrieve_messages.should == ["one", "two"]
-    end
-
-    it "pops the messages from the messages array" do
-      @room.inbound_messages << "one"
-      @room.retrieve_messages.should == ["one"]
-      @room.inbound_messages.size.should == 0
+      @room.should_receive(:campfire_post).with("/room/#{@room.number}/speak.json", expected_json).and_return(mock(:post, :callback => nil))
+      EM.run_block { @room.post_messages }
     end
   end