camper_van 0.0.4 → 0.0.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    camper_van (0.0.3)
+    camper_van (0.0.5)
       eventmachine (~> 0.12.10)
       firering (~> 1.2.0)
       logging (~> 1.5.1)

data/lib/camper_van/channel.rb

@@ -86,6 +86,7 @@ module CamperVan
     # connections: allowing them to time out rather than leaving explicitly.
     def part
       client.user_reply :part, channel
+      # FIXME this doesn't work. Not even on next_tick. EM/em-http-request bug?
       stream.close_connection if stream
       # room.leave # let the timeout do it rather than being explicit!
     end
@@ -242,8 +243,10 @@ module CamperVan
 
     # Stream messages from campfire and map them to IRC commands for the
     # connected client.
+    #
+    # Only starts the stream once.
     def stream_campfire_to_channel
-      @stream = room.stream do |message|
+      @stream ||= room.stream do |message|
         map_message_to_irc message
       end
     end
@@ -309,11 +312,11 @@ module CamperVan
           lines = message.body.split("\n")
 
           lines[0..2].each do |line|
-            client.campfire_reply :privmsg, name, channel, "> " + line
+            client.campfire_reply :privmsg, name, channel, ":> " + line
           end
 
           if lines.size > 3
-            client.campfire_reply :privmsg, name, channel, "> more: " +
+            client.campfire_reply :privmsg, name, channel, ":> more: " +
               "https://#{client.subdomain}.campfirenow.com/room/#{room.id}/paste/#{message.id}"
           end
 
@@ -349,7 +352,7 @@ module CamperVan
             else
               body = message.body
             end
-            client.campfire_reply :privmsg, name, channel, body
+            client.campfire_reply :privmsg, name, channel, ":" + body
           end
 
         when "TopicChange"

data/lib/camper_van/ircd.rb

@@ -187,6 +187,11 @@ module CamperVan
 
     handle :part do |args|
       name = args.first
+      # FIXME parting a channel should remove the channel from channels, except
+      # that there's a bug with EM that won't disconnect the streaming request.
+      # Because of that, leave the channel in the list, and assume the irc
+      # client attached to this IRCD will ignore messages from channels it's not
+      # currently in.
       if channel = channels[name]
         channel.part
       else
@@ -326,7 +331,7 @@ module CamperVan
     def join_channel(name)
       campfire.rooms do |rooms|
         if room = rooms.detect { |r| "#" + irc_name(r.name) == name }
-          channel = Channel.new(name, self, room)
+          channel = channels[name] || Channel.new(name, self, room)
           if channel.join
             channels[name] = channel
           end

data/lib/camper_van/version.rb

@@ -1,3 +1,3 @@
 module CamperVan
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/camper_van/channel_spec.rb

@@ -21,6 +21,7 @@ describe CamperVan::Channel do
   class TestRoom
     attr_reader :locked, :full, :topic, :membership_limit
     attr_reader :sent
+    attr_reader :stream_count
 
     attr_writer :users, :topic, :locked, :full, :open_to_guests
     attr_writer :stream
@@ -29,6 +30,7 @@ describe CamperVan::Channel do
       @users = []
       @sent = []
       @membership_limit = 12
+      @stream_count = 0
     end
 
     def id
@@ -62,10 +64,11 @@ describe CamperVan::Channel do
     end
 
     def stream
+      @stream_count += 1
       if @messages
         @messages.each { |m| yield m }
       end
-      return @stream
+      @stream ||= "message stream" # must be truthy
     end
   end
 
@@ -106,6 +109,12 @@ describe CamperVan::Channel do
       @channel.join
       @client.sent[2].must_equal ":camper_van 353 nathan = #test :nathan bob joe"
     end
+
+    it "does not stream messages from the room on a second join" do
+      @channel.join
+      @channel.join
+      @room.stream_count.must_equal 1
+    end
   end
 
   describe "#part" do
@@ -311,8 +320,8 @@ describe CamperVan::Channel do
     end
 
     it "sends a privmsg with the message when a user says something" do
-      @channel.map_message_to_irc msg("Text", :body => "hello")
-      @client.sent.last.must_match ":joe!joe@campfire PRIVMSG #test hello"
+      @channel.map_message_to_irc msg("Text", :body => "hello there")
+      @client.sent.last.must_match ":joe!joe@campfire PRIVMSG #test :hello there"
     end
 
     it "sends a privmsg with the pasted url and the first line when a user pastes something" do
@@ -346,7 +355,7 @@ describe CamperVan::Channel do
       ]
       @channel.list_users
       @channel.map_message_to_irc msg("Text", :body => "Bob Fred")
-      @client.sent.last.must_match %r(PRIVMSG #test bob_fred)
+      @client.sent.last.must_match %r(PRIVMSG #test :bob_fred)
     end
 
     it "converts leading names plus punctuation to nicks" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: camper_van
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-13 00:00:00.000000000 Z
+date: 2012-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -148,6 +148,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4196066118135228285
 requirements: []
 rubyforge_project: camper_van
 rubygems_version: 1.8.24