flamethrower 0.1.0 → 0.2.0

data/spec/unit/dispatcher_spec.rb

@@ -68,15 +68,25 @@ describe Flamethrower::Dispatcher do
 
     context "setting the channel topic" do
       it "sets the channel topic to the specified topic" do
-        FakeWeb.register_uri(:put, "https://mytoken:x@mydomain.campfirenow.com/room/347348.json", :body => json_fixture("room_update"), :status => ["200", "OK"])
+       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"))
         message = Flamethrower::Irc::Message.new("TOPIC #flamethrower :some awesome topic")
         @dispatcher.server.should_receive(:send_topic).with(@channel)
-        @dispatcher.handle_message(message)
+        EM.run_block { @dispatcher.handle_message(message) }
         @channel.topic.should == "some awesome topic"
       end
     end
   end
 
+  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.handle_message(message)
+    end
+  end
+
   describe "#mode" do
     before do
       @user = Flamethrower::Irc::User.new :username => "user", :nickname => "nick", :hostname => "host", :realname => "realname", :servername => "servername"
@@ -147,13 +157,23 @@ describe Flamethrower::Dispatcher do
 
   describe "#part" do
     it "stops the thread of the room being parted from" do
-      @room.instance_variable_set("@thread_running", true)
+      EventMachine.stub(:cancel_timer)
+      @room.instance_variable_set("@room_alive", true)
       @room.should be_alive
       message = Flamethrower::Irc::Message.new("PART #flamethrower")
       @dispatcher.handle_message(message)
       @room.should_not be_alive
     end
 
+    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
+      message = Flamethrower::Irc::Message.new("PART #flamethrower")
+      @server.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
@@ -164,8 +184,14 @@ describe Flamethrower::Dispatcher do
   end
 
   describe "#quit" do
-    it "kills all the room threads on quit" do
-      @room.instance_variable_set("@thread_running", true)
+    it "kills all the eventmachine timers on quit" do
+      polling_timer = mock(:polling_timer)
+      periodic_timer = mock(:periodic_timer)
+      EventMachine.should_receive(:cancel_timer).with(polling_timer)
+      EventMachine.should_receive(:cancel_timer).with(periodic_timer)
+      @room.instance_variable_set("@room_alive", true)
+      @room.instance_variable_set("@polling_timer", polling_timer)
+      @room.instance_variable_set("@periodic_timer", periodic_timer)
       @room.should be_alive
       message = Flamethrower::Irc::Message.new("QUIT :leaving")
       @dispatcher.handle_message(message)
@@ -175,17 +201,11 @@ describe Flamethrower::Dispatcher do
 
   describe "#join" do
     before do
+      @room.stub(:start)
       @room.stub(:fetch_room_info)
       @room.stub(:join)
     end
 
-    it "responds with a topic and userlist if sent a join" do
-      message = Flamethrower::Irc::Message.new("JOIN #flamethrower\r\n")
-      @server.should_receive(:send_topic).with(@channel)
-      @server.should_receive(:send_userlist)
-      @dispatcher.handle_message(message)
-    end
-
     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
@@ -194,12 +214,6 @@ describe Flamethrower::Dispatcher do
       @channel.users.should include(user)
     end
 
-    it "fetches the room information on join" do
-      message = Flamethrower::Irc::Message.new("JOIN #flamethrower\r\n")
-      @room.should_receive(:fetch_room_info)
-      @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

data/spec/unit/irc/channel_spec.rb

@@ -2,7 +2,9 @@ require File.join(File.dirname(__FILE__), "../../spec_helper")
 
 describe Flamethrower::Irc::Channel do
   before do
+    @server = Flamethrower::MockServer.new
     @room = Flamethrower::Campfire::Room.new("mydomain", "mytoken", {'name' => "flamethrower"})
+    @room.server = @server
     @channel = Flamethrower::Irc::Channel.new("#flamethrower", @room)
     @campfire_user = Flamethrower::Campfire::User.new('name' => "bob", 'id' => 734581)
     @irc_user = @campfire_user.to_irc
@@ -35,9 +37,10 @@ describe Flamethrower::Irc::Channel do
 
   describe "#irc_messages" do
     it "returns the irc messages to be sent to the client" do
-      message = Flamethrower::Campfire::Message.new('body' => 'Hello there', 'user' => @campfire_user, 'room' => @room, 'type' => 'TextMessage')
+      @other_user = Flamethrower::Campfire::User.new('name' => "tom", 'id' => 7123)
+      message = Flamethrower::Campfire::Message.new('body' => 'Hello there', 'user' => @other_user, 'room' => @room, 'type' => 'TextMessage')
       @room.inbound_messages << message
-      @channel.retrieve_irc_messages.map(&:to_s).should == [":#{@irc_user.to_s} PRIVMSG #{@channel.name} :Hello there"]
+      @channel.retrieve_irc_messages.map(&:to_s).should == [":#{@other_user.to_irc.to_s} PRIVMSG #{@channel.name} :Hello there"]
     end
 
     it "doesn't send TimeStamp messages" do
@@ -51,10 +54,10 @@ describe Flamethrower::Irc::Channel do
       @channel.retrieve_irc_messages.should be_empty
     end
 
-    xit "doesn't send the message if the source is the current user" do
+    it "doesn't send the message if the source is the current user" do
       message = Flamethrower::Campfire::Message.new('body' => 'Hello there', 'user' => @campfire_user, 'room' => @room, 'type' => 'TextMessage')
       @room.inbound_messages << message
-      @room.campfire_user = @current_user
+      @server.current_user = @campfire_user.to_irc
       @channel.retrieve_irc_messages.map(&:to_s).should be_empty
     end
   end

data/spec/unit/server_spec.rb

@@ -47,18 +47,28 @@ describe Flamethrower::Server do
   end
 
   context "#after_connect" do
+    before do
+      stub_request(:get, "https://mydomain.campfirenow.com/rooms.json").
+        with(:headers => {'Authorization'=>['mytoken', 'x']}).
+        to_return(:status => 200, :body => json_fixture("rooms"))
+    end
+
     it "sends motd" do
+      @server.stub(:populate_irc_channels)
+      @server.stub(:populate_my_user)
       @server.should_receive(:send_motd)
       @server.after_connect
     end
 
     it "populates the channel list" do
+      @server.stub(:populate_my_user)
       @server.should_receive(:populate_irc_channels)
       @server.after_connect
     end
 
-    it "sends the channel list" do
-      @server.should_receive(:send_channel_list)
+    it "populates the currently logged in user" do
+      @server.stub(:populate_irc_channels)
+      @server.should_receive(:populate_my_user)
       @server.after_connect
     end
   end
@@ -106,16 +116,19 @@ describe Flamethrower::Server do
       ]
     end
 
-    it "sends the campfire users in the userlist" do
-      room = Flamethrower::Campfire::Room.new('mydomain', 'mytoken')
-      channel = Flamethrower::Irc::Channel.new("#flamethrower", room)
-      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_userlist(channel).should == [
-        ":host 353 nick = #flamethrower :@nick Bob_Jones Bill_Myer",
-        ":host 366 nick #flamethrower :/End of /NAMES list"
-      ]
+    describe "#send_who" do
+      it "sends the campfire users in the userlist" do
+        room = Flamethrower::Campfire::Room.new('mydomain', 'mytoken')
+        channel = Flamethrower::Irc::Channel.new("#flamethrower", room)
+        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 == [
+          ":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"
+        ]
+      end
     end
 
     describe "#send_channel_list" do
@@ -153,8 +166,11 @@ describe Flamethrower::Server do
 
     describe "#populate_irc_channels" do
       it "populates the server irc_channels from the associated campfire channels" do
-        FakeWeb.register_uri(:get, "https://mytoken:x@mydomain.campfirenow.com/rooms.json", :body => json_fixture("rooms"), :status => ["200", "OK"])
-        @server.populate_irc_channels
+        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 { @server.populate_irc_channels }
         @server.irc_channels.count.should == 1
         @server.irc_channels.first.name.should == "#room_1"
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flamethrower
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Blake Smith
@@ -15,13 +15,69 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-12 00:00:00 -06:00
+date: 2011-01-17 00:00:00 -06:00
 default_executable: flamethrower
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: twitter-stream
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: em-http-request
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: eventmachine
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -33,11 +89,11 @@ dependencies:
         - 10
         version: 0.12.10
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -47,11 +103,25 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: em-http-request
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: twitter-stream
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -61,7 +131,7 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id008
 description: Flamethrower gives you the power to use your awesome irc client to talk in your campfire rooms.
 email: blakesmith0@gmail.com
 executables: 
@@ -71,7 +141,6 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- .gitignore
 - .rspec
 - Gemfile
 - Gemfile.lock
@@ -127,8 +196,8 @@ homepage: http://github.com/blakesmith/flamethrower
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/.gitignore

@@ -1,4 +0,0 @@
-*.swp
-*.swo
-*.swn
-*.gem