flamethrower 0.3.0 → 0.3.2

data/spec/unit/{server_spec.rb → connection_spec.rb}

@@ -1,36 +1,36 @@
 require File.join(File.dirname(__FILE__), "../spec_helper")
 
-describe Flamethrower::Server do
+describe Flamethrower::Connection do
   before do
-    @server = Flamethrower::MockServer.new
-    @server.stub!(:send_data)
+    @connection = Flamethrower::MockConnection.new
+    @connection.stub!(:send_data)
     @user = Flamethrower::Irc::User.new :username => 'user', :nickname => 'nick', :hostname => 'host', :realname => 'realname'
-    @server.current_user = @user
+    @connection.current_user = @user
   end
 
   describe "#send_message" do
     it "sends the message to the client" do
       message = "message"
-      @server.should_receive(:send_message).with("message")
-      @server.send_message(message)
+      @connection.should_receive(:send_message).with("message")
+      @connection.send_message(message)
     end
 
     it "should send the data across the wire" do
       message = "message"
-      @server.should_receive(:send_data).with("message\r\n")
-      @server.send_message(message)
+      @connection.should_receive(:send_data).with("message\r\n")
+      @connection.send_message(message)
     end
   end
 
   describe "#send_messages" do
     it "sends a list of messages to the client" do
-      @server.should_receive(:send_message).exactly(2).times
-      @server.send_messages("one", "two")
+      @connection.should_receive(:send_message).exactly(2).times
+      @connection.send_messages("one", "two")
     end
 
     it "yields to the block to allow more messages" do
-      @server.should_receive(:send_message).exactly(3).times
-      @server.send_messages("one", "two") do |messages|
+      @connection.should_receive(:send_message).exactly(3).times
+      @connection.send_messages("one", "two") do |messages|
         messages << "three"
       end
     end
@@ -41,8 +41,8 @@ describe Flamethrower::Server do
       incoming = "COMMAND params"
       msg = Flamethrower::Irc::Message.new(incoming)
       Flamethrower::Irc::Message.should_receive(:new).with(incoming).and_return(msg)
-      @server.dispatcher.should_receive(:handle_message).with(msg)
-      @server.receive_data(incoming)
+      @connection.dispatcher.should_receive(:handle_message).with(msg)
+      @connection.receive_data("#{incoming}\r\n")
     end
   end
 
@@ -53,64 +53,74 @@ describe Flamethrower::Server do
         to_return(:status => 200, :body => json_fixture("rooms"))
     end
 
+    it "sends welcome" do
+      @connection.stub(:populate_irc_channels)
+      @connection.stub(:populate_my_user)
+      @connection.should_receive(:send_welcome)
+      @connection.after_connect
+    end
+
     it "sends motd" do
-      @server.stub(:populate_irc_channels)
-      @server.stub(:populate_my_user)
-      @server.should_receive(:send_motd)
-      @server.after_connect
+      @connection.stub(:populate_irc_channels)
+      @connection.stub(:populate_my_user)
+      @connection.should_receive(:send_motd)
+      @connection.after_connect
     end
 
     it "populates the channel list" do
-      @server.stub(:populate_my_user)
-      @server.should_receive(:populate_irc_channels)
-      @server.after_connect
+      @connection.stub(:populate_my_user)
+      @connection.should_receive(:populate_irc_channels)
+      @connection.after_connect
     end
 
     it "populates the currently logged in user" do
-      @server.stub(:populate_irc_channels)
-      @server.should_receive(:populate_my_user)
-      @server.after_connect
+      @connection.stub(:populate_irc_channels)
+      @connection.should_receive(:populate_my_user)
+      @connection.after_connect
     end
   end
 
   describe "irc_channels" do
-    it "stores the list of irc_channels on the server" do
+    it "stores the list of irc_channels on the connection" do
       channel = Flamethrower::Irc::Channel.new("#flamethrower")
-      @server.irc_channels << channel
-      @server.irc_channels.should include(channel)
+      @connection.irc_channels << channel
+      @connection.irc_channels.should include(channel)
     end
   end
 
   describe "IRCcommands" do
+    it "should have a first message" do
+      @connection.send_welcome.should == ":host 001 nick :Welcome to Flamethrower"
+    end
+
     it "should have the correct MOTD format" do
-      @server.send_motd.should == [
+      @connection.send_motd.should == [
         ":host 375 nick :MOTD",
-        ":host 372 nick :Welcome to Flamethrower",
         ":host 372 nick :Fetching channel list from campfire..."
       ]
     end
 
     it "should send the channel mode" do
       channel = Flamethrower::Irc::Channel.new("#flamethrower")
-      @server.send_channel_mode(channel).should == ":host 324 nick #flamethrower +t"
+      @connection.send_channel_mode(channel).should == ":host 324 nick #flamethrower +t"
     end
 
     it "should send the current user mode" do
-      @server.send_user_mode.should == ":host 221 nick +i"
+      @connection.send_user_mode.should == ":host 221 nick +i"
     end
 
     it "should have the correct TOPIC format" do
       room = Flamethrower::Campfire::Room.new("mydomain", "mytoken", "id" => 347348, "name" => "room 1")
       channel = Flamethrower::Irc::Channel.new("#flamethrower", room)
       channel.topic = "A topic"
-      @server.send_topic(channel).should == ":host 332 nick #flamethrower :A topic"
+      @connection.send_topic(channel).should == ":host 332 nick #flamethrower :A topic"
     end
 
     it "should have the correct USERLIST format" do
       room = Flamethrower::Campfire::Room.new('mydomain', 'mytoken')
       channel = Flamethrower::Irc::Channel.new("#flamethrower", room)
       channel.users << Flamethrower::Irc::User.new(:nickname => 'bob', :username => 'bob')
-      @server.send_userlist(channel).should == [
+      @connection.send_userlist(channel).should == [
         ":host 353 nick = #flamethrower :@nick bob",
         ":host 366 nick #flamethrower :/End of /NAMES list"
       ]
@@ -123,7 +133,7 @@ describe Flamethrower::Server do
         user1 = Flamethrower::Campfire::User.new('id' => 1234, 'name' => 'Bob Jones')
         user2 = Flamethrower::Campfire::User.new('id' => 4321, 'name' => 'Bill Myer')
         room.users = [user1, user2]
-        @server.send_who(channel).should == [
+        @connection.send_who(channel).should == [
           ":host 352 nick #flamethrower Bob_Jones campfirenow.com localhost Bob_Jones H :0 Bob_Jones",
           ":host 352 nick #flamethrower Bill_Myer campfirenow.com localhost Bill_Myer H :0 Bill_Myer",
           ":host 315 nick #flamethrower :/End of /WHO list"
@@ -139,8 +149,8 @@ describe Flamethrower::Server do
         channel.topic = "Flamethrower topic"
         channel2 = Flamethrower::Irc::Channel.new("#room_1", room2)
         channel2.topic = "Room 1 topic"
-        @server.irc_channels = [channel, channel2]
-        @server.send_channel_list.should == [
+        @connection.irc_channels = [channel, channel2]
+        @connection.send_channel_list.should == [
           ":host 372 nick :Active channels:",
           ":host 372 nick :#flamethrower - Flamethrower topic",
           ":host 372 nick :#room_1 - Room 1 topic",
@@ -154,8 +164,8 @@ describe Flamethrower::Server do
         channel = Flamethrower::Irc::Channel.new("#flamethrower", room)
         channel2 = Flamethrower::Irc::Channel.new("#room_1", room2)
         channel.topic = channel2.topic = ""
-        @server.irc_channels = [channel, channel2]
-        @server.send_channel_list.should == [
+        @connection.irc_channels = [channel, channel2]
+        @connection.send_channel_list.should == [
           ":host 372 nick :Active channels:",
           ":host 372 nick :#flamethrower - No topic",
           ":host 372 nick :#room_1 - No topic",
@@ -170,9 +180,9 @@ describe Flamethrower::Server do
           with(:headers => {'Authorization'=>['mytoken', 'x']}).
           to_return(:status => 200, :body => json_fixture("rooms"))
         
-        EM.run_block { @server.populate_irc_channels }
-        @server.irc_channels.count.should == 1
-        @server.irc_channels.first.name.should == "#room_1"
+        EM.run_block { @connection.populate_irc_channels }
+        @connection.irc_channels.count.should == 1
+        @connection.irc_channels.first.name.should == "#room_1"
       end
     end
   end

data/spec/unit/dispatcher_spec.rb

@@ -2,13 +2,13 @@ require File.join(File.dirname(__FILE__), "../spec_helper")
 
 describe Flamethrower::Dispatcher do
   before do
-    @server = Flamethrower::MockServer.new(:log => Logger.new("/dev/null"))
+    @connection = Flamethrower::MockConnection.new(:log => Logger.new("/dev/null"))
     @room = Flamethrower::Campfire::Room.new('mydomain', 'mytoken', {'name' => 'a room', 'id' => 347348})
     @room.instance_variable_set("@stream", mock(:twitter_stream, :stop => nil))
     @channel = Flamethrower::Irc::Channel.new("#flamethrower", @room)
     @user = Flamethrower::Irc::User.new :username => "user", :nickname => "nick", :hostname => "host", :realname => "realname", :servername => "servername"
-    @server.irc_channels << @channel
-    @dispatcher = Flamethrower::Dispatcher.new(@server)
+    @connection.irc_channels << @channel
+    @dispatcher = Flamethrower::Dispatcher.new(@connection)
   end
 
   describe "#handle_message" do
@@ -29,10 +29,10 @@ describe Flamethrower::Dispatcher do
     it "sets the current session's user to the specified user" do
       message = Flamethrower::Irc::Message.new("USER guest tolmoon tolsun :Ronnie Reagan\r\n")
       @dispatcher.handle_message(message)
-      @dispatcher.server.current_user.username.should == "guest"
-      @dispatcher.server.current_user.hostname.should == "tolmoon"
-      @dispatcher.server.current_user.servername.should == "tolsun"
-      @dispatcher.server.current_user.realname.should == "Ronnie Reagan"
+      @dispatcher.connection.current_user.username.should == "guest"
+      @dispatcher.connection.current_user.hostname.should == "tolmoon"
+      @dispatcher.connection.current_user.servername.should == "tolsun"
+      @dispatcher.connection.current_user.realname.should == "Ronnie Reagan"
     end
 
     it "not set a second user request if a first has already been recieved" do
@@ -40,49 +40,58 @@ describe Flamethrower::Dispatcher do
       message2 = Flamethrower::Irc::Message.new("USER guest2 tolmoon2 tolsun2 :Ronnie Reagan2\r\n")
       @dispatcher.handle_message(message)
       @dispatcher.handle_message(message2)
-      @dispatcher.server.current_user.username.should == "guest"
-      @dispatcher.server.current_user.hostname.should == "tolmoon"
-      @dispatcher.server.current_user.servername.should == "tolsun"
-      @dispatcher.server.current_user.realname.should == "Ronnie Reagan"
+      @dispatcher.connection.current_user.username.should == "guest"
+      @dispatcher.connection.current_user.hostname.should == "tolmoon"
+      @dispatcher.connection.current_user.servername.should == "tolsun"
+      @dispatcher.connection.current_user.realname.should == "Ronnie Reagan"
     end
   end
 
   describe "#away" do
     it "respond with RPL_NOWAWAY when the user specifies an away message" do
-      @server.current_user = @user
+      @connection.current_user = @user
       message = Flamethrower::Irc::Message.new("AWAY :I'm away")
-      @dispatcher.server.should_receive(:send_message).with(":#{@user.hostname} 306 #{@user.nickname} :You have been marked as being away")
+      @dispatcher.connection.should_receive(:send_message).with(":#{@user.hostname} 306 #{@user.nickname} :You have been marked as being away")
       @dispatcher.handle_message(message)
-      @server.current_user.away_message.should == "I'm away"
+      @connection.current_user.away_message.should == "I'm away"
     end
 
     it "respond with RPL_UNAWAY when the user doesn't specify an away message" do
-      @server.current_user = @user
-      @server.current_user.away_message = "Currently away"
+      @connection.current_user = @user
+      @connection.current_user.away_message = "Currently away"
       message = Flamethrower::Irc::Message.new("AWAY :")
-      @dispatcher.server.should_receive(:send_message).with(":#{@user.hostname} 305 #{@user.nickname} :You are no longer marked as being away")
+      @dispatcher.connection.should_receive(:send_message).with(":#{@user.hostname} 305 #{@user.nickname} :You are no longer marked as being away")
       @dispatcher.handle_message(message)
-      @server.current_user.away_message.should == nil
+      @connection.current_user.away_message.should == nil
+    end
+
+    it "response with RPL_UNAWAY when the away message has no colon" do
+      @connection.current_user = @user
+      @connection.current_user.away_message = "Currently away"
+      message = Flamethrower::Irc::Message.new("AWAY")
+      @dispatcher.connection.should_receive(:send_message).with(":#{@user.hostname} 305 #{@user.nickname} :You are no longer marked as being away")
+      @dispatcher.handle_message(message)
+      @connection.current_user.away_message.should == nil
     end
   end
 
   describe "#topic" do
     before do
       @user = Flamethrower::Irc::User.new :username => "user", :nickname => "nick", :hostname => "host", :realname => "realname", :servername => "servername"
-      @server.current_user = @user
+      @connection.current_user = @user
     end
 
     context "retrieving the channel topic" do
       it "should display the channel topic" do
         message = Flamethrower::Irc::Message.new("TOPIC #flamethrower")
-        @dispatcher.server.should_receive(:send_topic).with(@channel)
+        @dispatcher.connection.should_receive(:send_topic).with(@channel)
         @dispatcher.handle_message(message)
       end
 
       it "responds with an error if the channel can't be found" do
         message = Flamethrower::Irc::Message.new("TOPIC #bogus")
-        @dispatcher.server.should_not_receive(:send_topic)
-        @dispatcher.server.should_receive(:send_message).with(":#{@user.hostname} 475")
+        @dispatcher.connection.should_not_receive(:send_topic)
+        @dispatcher.connection.should_receive(:send_message).with(":#{@user.hostname} 475")
         @dispatcher.handle_message(message)
       end
     end
@@ -93,7 +102,7 @@ describe Flamethrower::Dispatcher do
          with(:headers => {'Authorization'=>['mytoken', 'x'], 'Content-Type'=>'application/json'}).
          to_return(:status => 200, :body => json_fixture("room_update"))
         message = Flamethrower::Irc::Message.new("TOPIC #flamethrower :some awesome topic")
-        @dispatcher.server.should_receive(:send_topic).with(@channel)
+        @dispatcher.connection.should_receive(:send_topic).with(@channel)
         EM.run_block { @dispatcher.handle_message(message) }
         @channel.topic.should == "some awesome topic"
       end
@@ -103,7 +112,7 @@ describe Flamethrower::Dispatcher do
   describe "#who" do
     it "responds with a who list" do
       message = Flamethrower::Irc::Message.new("WHO #flamethrower\r\n")
-      @dispatcher.server.should_receive(:send_who).with(@channel)
+      @dispatcher.connection.should_receive(:send_who).with(@channel)
       @dispatcher.handle_message(message)
     end
   end
@@ -111,25 +120,25 @@ describe Flamethrower::Dispatcher do
   describe "#mode" do
     before do
       @user = Flamethrower::Irc::User.new :username => "user", :nickname => "nick", :hostname => "host", :realname => "realname", :servername => "servername"
-      @server.current_user = @user
+      @connection.current_user = @user
     end
 
     context "channel mode" do
       it "responds to mode with a static channel mode" do
         message = Flamethrower::Irc::Message.new("MODE #flamethrower\r\n")
-        @dispatcher.server.should_receive(:send_channel_mode).with(@channel)
+        @dispatcher.connection.should_receive(:send_channel_mode).with(@channel)
         @dispatcher.handle_message(message)
       end
 
       it "responds with the user mode if the mode isn't for a channel" do
         message = Flamethrower::Irc::Message.new("MODE #{@user.nickname} +i\r\n")
-        @dispatcher.server.should_receive(:send_user_mode)
+        @dispatcher.connection.should_receive(:send_user_mode)
         @dispatcher.handle_message(message)
       end
 
       it "responds with unknown command if the mode is neither a server nor the current user" do
         message = Flamethrower::Irc::Message.new("MODE foo\r\n")
-        @dispatcher.server.should_receive(:send_message).with(":#{@user.hostname} 421")
+        @dispatcher.connection.should_receive(:send_message).with(":#{@user.hostname} 421")
         @dispatcher.handle_message(message)
       end
     end
@@ -139,7 +148,7 @@ describe Flamethrower::Dispatcher do
     it "sets the current session's user nickname to the specified nick" do
       message = Flamethrower::Irc::Message.new("NICK WiZ\r\n")
       @dispatcher.handle_message(message)
-      @dispatcher.server.current_user.nickname.should == "WiZ"
+      @dispatcher.connection.current_user.nickname.should == "WiZ"
     end
   end
 
@@ -149,7 +158,7 @@ describe Flamethrower::Dispatcher do
         message = Flamethrower::Irc::Message.new("PRIVMSG #test :Hello.\r\n")
         room = Flamethrower::Campfire::Room.new("mydomain", "mytoken", {'name' => "test"})
         irc_channel = room.to_irc
-        @dispatcher.server.irc_channels << irc_channel
+        @dispatcher.connection.irc_channels << irc_channel
         @dispatcher.handle_message(message)
         room.outbound_messages.size.should == 1
       end
@@ -158,7 +167,7 @@ describe Flamethrower::Dispatcher do
         message = Flamethrower::Irc::Message.new("PRIVMSG #test :Hello.\r\n")
         room = Flamethrower::Campfire::Room.new("mydomain", "mytoken", {'name' => "test"})
         irc_channel = room.to_irc
-        @dispatcher.server.irc_channels << irc_channel
+        @dispatcher.connection.irc_channels << irc_channel
         @dispatcher.handle_message(message)
         campfire_message = room.outbound_messages.pop
         campfire_message.body.should == "Hello."
@@ -171,7 +180,7 @@ describe Flamethrower::Dispatcher do
   describe "#ping" do
     it "responds with pong of the same ping parameters" do
       message = Flamethrower::Irc::Message.new("PING :something\r\n")
-      @server.should_receive(:send_message).with("PONG :something")
+      @connection.should_receive(:send_message).with("PONG :something")
       @dispatcher.handle_message(message)
     end
   end
@@ -189,17 +198,17 @@ describe Flamethrower::Dispatcher do
     it "sends a part message with your current user's name" do
       EventMachine.stub(:cancel_timer)
       user = Flamethrower::Irc::User.new :username => "user", :nickname => "nick", :hostname => "host", :realname => "realname", :servername => "servername"
-      @server.current_user = user
+      @connection.current_user = user
       message = Flamethrower::Irc::Message.new("PART #flamethrower")
-      @server.should_receive(:send_message).with(":#{user.to_s} PART #flamethrower")
+      @connection.should_receive(:send_message).with(":#{user.to_s} PART #flamethrower")
       @dispatcher.handle_message(message)
     end
 
     it "responds with ERR_BADCHANNELKEY a channel that doesn't exist" do
       user = Flamethrower::Irc::User.new :username => "user", :nickname => "nick", :hostname => "host", :realname => "realname", :servername => "servername"
-      @server.current_user = user
+      @connection.current_user = user
       message = Flamethrower::Irc::Message.new("PART #foobar")
-      @server.should_receive(:send_message).with(":#{user.hostname} 475")
+      @connection.should_receive(:send_message).with(":#{user.hostname} 475")
       @dispatcher.handle_message(message)
     end
   end
@@ -229,7 +238,7 @@ describe Flamethrower::Dispatcher do
 
     it "adds the current user to the channel" do
       user = Flamethrower::Irc::User.new :username => "user", :nickname => "nick", :hostname => "host", :realname => "realname", :servername => "servername"
-      @server.current_user = user
+      @connection.current_user = user
       message = Flamethrower::Irc::Message.new("JOIN #flamethrower\r\n")
       @dispatcher.handle_message(message)
       @channel.users.should include(user)
@@ -237,11 +246,20 @@ describe Flamethrower::Dispatcher do
 
     it "responds with ERR_BADCHANNELKEY a channel that doesn't exist" do
       user = Flamethrower::Irc::User.new :username => "user", :nickname => "nick", :hostname => "host", :realname => "realname", :servername => "servername"
-      @server.current_user = user
+      @connection.current_user = user
       message = Flamethrower::Irc::Message.new("JOIN #foobar\r\n")
-      @server.should_receive(:send_message).with(":#{user.hostname} 475")
-      @server.should_not_receive(:send_topic)
-      @server.should_not_receive(:send_userlist)
+      @connection.should_receive(:send_message).with(":#{user.hostname} 475")
+      @connection.should_not_receive(:send_topic)
+      @connection.should_not_receive(:send_userlist)
+      @dispatcher.handle_message(message)
+    end
+
+    it "sends a join message with your current user's name" do
+      EventMachine.stub(:cancel_timer)
+      user = Flamethrower::Irc::User.new :username => "user", :nickname => "nick", :hostname => "host", :realname => "realname", :servername => "servername"
+      @connection.current_user = user
+      message = Flamethrower::Irc::Message.new("JOIN #flamethrower")
+      @connection.should_receive(:send_message).with(":#{user.to_s} JOIN #flamethrower")
       @dispatcher.handle_message(message)
     end
 
@@ -260,13 +278,13 @@ describe Flamethrower::Dispatcher do
 
     describe "nick sent first" do
       it "sends the motd, join" do
-        @dispatcher.server.should_receive(:after_connect)
+        @dispatcher.connection.should_receive(:after_connect)
         @dispatcher.handle_message(@nick_message)
         @dispatcher.handle_message(@user_message)
       end
 
       it "doesn't send after_connect if only the nick has been sent" do
-        @dispatcher.server.should_not_receive(:after_connect)
+        @dispatcher.connection.should_not_receive(:after_connect)
         @dispatcher.handle_message(@nick_message)
       end
 
@@ -274,13 +292,13 @@ describe Flamethrower::Dispatcher do
 
     describe "user sent first" do
       it "sends the motd" do
-        @dispatcher.server.should_receive(:after_connect)
+        @dispatcher.connection.should_receive(:after_connect)
         @dispatcher.handle_message(@user_message)
         @dispatcher.handle_message(@nick_message)
       end
 
       it "doesn't send after_connect if only the nick has been sent" do
-        @dispatcher.server.should_not_receive(:after_connect)
+        @dispatcher.connection.should_not_receive(:after_connect)
         @dispatcher.handle_message(@user_message)
       end