firering 0.1.0 → 0.1.1

data/firering.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'firering'
-  s.version           = '0.1.0'
-  s.date              = '2010-05-30'
+  s.version           = '0.1.1'
+  s.date              = '2010-08-08'
   s.rubyforge_project = 'firering'
 
   s.summary     = "Campfire API interface powered by EventMachine and Yajl."
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = %w[README.rdoc LICENSE]
 
   s.add_dependency('eventmachine', [">= 0.12.10"])
-  s.add_dependency('em-http-request', [">= 0.2.7"])
+  s.add_dependency('em-http-request', [">= 0.2.10"])
   s.add_dependency('yajl-ruby', [">= 0.7.6"])
 
   s.add_development_dependency('rspec', [">= 1.3.0"])

data/lib/firering/http.rb

@@ -2,9 +2,10 @@ module Firering
   module HTTP
     extend self
 
-    attr_accessor :host
+    attr_accessor :host, :retry_delay
 
     HTTP.host = "campfirenow.com"
+    HTTP.retry_delay = 2
 
     # helper to perform an http request following redirects
     def http(method, path, data = nil, user = Firering.token, password = "X", &block)
@@ -22,7 +23,16 @@ module Firering
       http = EventMachine::HttpRequest.new(url).send method, parameters
 
       http.errback do
-        raise Firering::Error, "#{http.errors}\n#{url}, #{method}, #{parameters.inspect}\n#{http.response_header.status}\n#{http.response}"
+        if EventMachine.reactor_running?
+          puts "Error: #{http.error}. Trying again in #{HTTP.retry_delay} seconds..."
+
+          EventMachine::add_timer(HTTP.retry_delay) do
+            puts "reconnecting"
+            http(method, path, data, user, password, &block)
+          end
+        else
+          raise Firering::Error, "#{http.error}\n#{url}, #{method}, #{parameters.inspect}\n#{http.response_header.status}\n#{http.response}"
+        end
       end
 
       http.callback do
@@ -32,7 +42,7 @@ module Firering
         when "302"
           http(method, http.response_header["Location"], user, password, &block) # follow redirects
         else
-          raise Firering::Error, "#{http.errors}\n#{url}, #{method}, #{parameters.inspect}\n#{http.response_header.status}\n#{http.response}"
+          raise Firering::Error, "#{http.error}\n#{url}, #{method}, #{parameters.inspect}\n#{http.response_header.status}\n#{http.response}"
         end
       end
 

data/lib/firering/streaming.rb

@@ -34,7 +34,7 @@ module Firering
       # few seconds before trying to reconnect.  Formats
       http.errback do
         if EventMachine.reactor_running?
-          puts "Error: #{http.errors}. Reconnecting in #{Streaming.reconnect_delay} seconds..."
+          puts "Error: #{http.error}. Reconnecting in #{Streaming.reconnect_delay} seconds..."
 
           EventMachine::add_timer(Streaming.reconnect_delay) do
             puts "reconnecting"

data/lib/firering.rb

@@ -4,7 +4,7 @@ require 'em-http'
 require 'date'
 
 module Firering
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 
   class Error < StandardError; end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: firering
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Emmanuel Oga
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-30 00:00:00 -03:00
+date: 2010-08-08 00:00:00 -03:00
 default_executable: campf-notify
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 59
         segments: 
         - 0
         - 12
@@ -35,23 +38,27 @@ dependencies:
   name: em-http-request
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         - 2
-        - 7
-        version: 0.2.7
+        - 10
+        version: 0.2.10
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: yajl-ruby
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 0
         - 7
@@ -63,9 +70,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 3
@@ -77,9 +86,11 @@ dependencies:
   name: sinatra
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
@@ -167,23 +178,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: firering
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 2
 summary: Campfire API interface powered by EventMachine and Yajl.