firering 1.0.5 → 1.0.6

data/README.rdoc

@@ -80,7 +80,9 @@ For more details take a look at spec/fixtures/load_server.rb file.
 
 == Contributors
 
-* indirect (Andre Arko), https://github.com/EmmanuelOga/firering/pull/1 and https://github.com/EmmanuelOga/firering/pull/2/files
+* indirect (Andre Arko), https://github.com/EmmanuelOga/firering/pull/1 ,
+                         https://github.com/EmmanuelOga/firering/pull/2 ,
+                         https://github.com/EmmanuelOga/firering/pull/3
 
 == Copyright
 

data/firering.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'firering'
-  s.version           = '1.0.5'
-  s.date              = '2011-02-25'
+  s.version           = '1.0.6'
+  s.date              = '2011-03-01'
   s.rubyforge_project = 'firering'
 
   s.summary     = "Campfire API interface powered by eventmachine em-http-request and yajl-ruby."

data/lib/firering/connection.rb

@@ -107,6 +107,16 @@ module Firering
       # disruptions. Upon unexpected disconnection, API clients should wait for a
       # few seconds before trying to reconnect.
       http.errback do
+        logger.error("http error #{http.error}. Trying again in #{retry_delay} seconds...")
+        perform_retry(http) do
+          room.stream(&callback)
+        end
+      end
+
+      # Campfire will _also_ actively close the connection. Correctly. Presumably,
+      # this only happens when they deploy, but it does actually happen.
+      http.callback do
+        logger.error("http connection closed. Trying again in #{retry_delay} seconds...")
         perform_retry(http) do
           room.stream(&callback)
         end
@@ -126,8 +136,6 @@ module Firering
           logger.error("Firering performed #{performed_retries} but did not get any answer. Increase Firering::Connection.max_retries or check your internet connection.")
           raise Firering::Connection::HTTPError.new(http)
         else
-          logger.error("http error #{http.error}. Trying again in #{retry_delay} seconds...")
-
           EventMachine::add_timer(retry_delay) do
             logger.info("Reconnecting...")
             increase_retries_counter

data/lib/firering.rb

@@ -5,7 +5,7 @@ require 'yajl'
 require 'em-http'
 
 module Firering
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
 
   Error = Class.new(StandardError)
 

data/spec/firering/connection_spec.rb

@@ -41,7 +41,7 @@ describe Firering::Connection do
   end
 
   it "raises an exception if the connection drops and performed enough retries" do
-    conn.retry_delay = 1
+    conn.retry_delay = 0
     make_fixture_server_fail_times(conn.max_retries + 1)
     messages = []
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: firering
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 1
   - 0
-  - 5
-  version: 1.0.5
+  - 6
+  version: 1.0.6
 platform: ruby
 authors: 
 - Emmanuel Oga
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-25 00:00:00 -03:00
+date: 2011-03-01 00:00:00 -03:00
 default_executable: campf-notify
 dependencies: 
 - !ruby/object:Gem::Dependency