camper_van 0.0.14 → 0.0.15

data/Gemfile

@@ -7,6 +7,5 @@ gemspec
 # for local mac development only
 group :development do
   gem "rb-fsevent", :require => false
-  gem "growl", :require => false
   gem "guard-minitest"
 end

data/camper_van.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/zerowidth/camper_van"
   s.summary     = %q{An IRC to Campfire bridge}
   s.description = %q{An IRC to Campfire bridge for IRC-based access to campfire chatrooms}
+  s.license     = "MIT"
 
   s.rubyforge_project = "camper_van"
 

data/lib/camper_van/channel.rb

@@ -78,19 +78,13 @@ module CamperVan
 
     # Public: "leaves" a campfire room, per the PART irc command.
     # Confirms with the connected client to PART the channel.
-    #
-    # Does not actually leave the campfire room, just closes out the campfire
-    # connections, so the server can idle the connection out. This behavior
-    # was chosen so periodic joins/parts wouldn't spam the campfire rooms
-    # unnecessarily, and also to reflect how Propane et. al. treat open
-    # connections: allowing them to time out rather than leaving explicitly.
     def part
       client.user_reply :part, channel
       if stream
-        stream.close if stream.respond_to?('close') # EM/em-http-request gem is installed and uses .close
-        stream.close_connection if stream.respond_to?('close_connection')
+        stream.close if stream.respond_to?(:close) # EM/em-http-request gem is installed and uses .close
+        stream.close_connection if stream.respond_to?(:close_connection)
       end
-      # room.leave # let the timeout do it rather than being explicit!
+      room.leave
     end
 
     # Public: replies to a WHO command with a list of users for a campfire room,

data/lib/camper_van/version.rb

@@ -1,3 +1,3 @@
 module CamperVan
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

data/spec/camper_van/channel_spec.rb

@@ -22,6 +22,7 @@ describe CamperVan::Channel do
     attr_reader :locked, :full, :topic, :membership_limit
     attr_reader :sent
     attr_reader :stream_count
+    attr_reader :left
 
     attr_writer :users, :topic, :locked, :full, :open_to_guests
     attr_writer :stream
@@ -52,6 +53,10 @@ describe CamperVan::Channel do
       yield
     end
 
+    def leave
+      @left = true
+    end
+
     def users
       yield @users if block_given?
       @users
@@ -144,12 +149,38 @@ describe CamperVan::Channel do
     end
 
     it "closes the connection on the stream" do
-      @room.stream = MiniTest::Mock.new
-      @room.stream.expect(:close_connection, nil)
+      stream = Class.new do
+        attr_reader :closed
+        def close_connection
+          @closed = true
+        end
+      end
+
+      @room.stream = stream.new
+      @channel.stream_campfire_to_channel # sets up stream
+      @channel.part
+
+      assert @room.stream.closed
+    end
+
+    it "closes the em-http connection if present" do
+      stream = Class.new do
+        attr_reader :closed
+        def close # em-http defines this
+          @closed = true
+        end
+      end
+
+      @room.stream = stream.new
       @channel.stream_campfire_to_channel # sets up stream
       @channel.part
 
-      @room.stream.verify
+      assert @room.stream.closed
+    end
+
+    it "leaves the channel" do
+      @channel.part
+      assert @room.left
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: camper_van
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-25 00:00:00.000000000 Z
+date: 2013-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -131,7 +131,8 @@ files:
 - spec/camper_van/user_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/zerowidth/camper_van
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -150,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1361000359402008572
+      hash: 2139526513697469635
 requirements: []
 rubyforge_project: camper_van
 rubygems_version: 1.8.23