firering 1.0.1 → 1.0.2

data/Rakefile

@@ -84,6 +84,7 @@ end
 #
 #############################################################################
 
+desc "release gem"
 task :release => :build do
   unless `git branch` =~ /^\* master$/
     puts "You must be on the master branch to release!"

data/bin/campf-notify

@@ -12,7 +12,7 @@ if subdomain.to_s =~ /^\s*$/ || token.to_s =~ /^\s*$/ || room_name.to_s =~ /^\s*
   puts "Icon path #{icon_path} is incorrect" unless icon_path && File.exists?(icon_path)
   puts "Room name #{room_name} is missing"   unless room_name =~ /\S/
   puts
-  puts "The following environment variables are needed: "
+  puts "The following environment variables will be used: "
   puts
   puts "CAMPFIRE_SUBDOMAIN: #{subdomain || 'missing!'}"
   puts "CAMPFIRE_TOKEN:     #{token || 'missing!'}"

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.1'
-  s.date              = '2010-08-16'
+  s.version           = '1.0.2'
+  s.date              = '2010-10-01'
   s.rubyforge_project = 'firering'
 
   s.summary     = "Campfire API interface powered by EventMachine and Yajl."

data/lib/firering/connection.rb

@@ -12,8 +12,10 @@ module Firering
     attr_accessor :token
     attr_accessor :login
 
+    attr_reader :performed_retries
+
     def initialize(host, streaming_host = "https://streaming.campfirenow.com")
-      @retry_delay, @redirects, @max_retries = 2, 1, 2
+      @retry_delay, @redirects, @max_retries, @performed_retries = 2, 1, 2, 0
       self.host, self.streaming_host = host, streaming_host
       yield self if block_given?
     end
@@ -30,6 +32,10 @@ module Firering
       @streaming_host = Addressable::URI.parse(host)
     end
 
+    def subdomain
+      host.host.split(".").first
+    end
+
     def auth_headers
       token ? {'authorization' => [token, "X"] } : {'authorization' => [login, password] }
     end
@@ -56,7 +62,7 @@ module Firering
       end
 
       http.callback {
-        @performed_retries = 0
+        reset_retries_counter
         if callback
           data = Yajl::Parser.parse(http.response, :symbolize_keys => true) rescue Hash.new
           callback.call(data, http)
@@ -82,7 +88,15 @@ module Firering
       logger.info("performing streaming request to #{uri.to_s}")
       http = EventMachine::HttpRequest.new(uri).get(parameters)
 
-      http.stream { |chunk| parser << chunk; @performed_retries= 0 }
+      http.stream do |chunk|
+        begin
+          parser << chunk; reset_retries_counter
+        rescue Yajl::ParseError
+          perform_retry(http) do
+            stream(room_id, &callback)
+          end
+        end
+      end
 
       # Campfire servers will try to hold the streaming connections open indefinitely.
       # However, API clients must be able to handle occasional timeouts or
@@ -97,19 +111,42 @@ module Firering
       http
     end
 
+    def max_retries_reached?
+      @performed_retries && @performed_retries >= @max_retries
+    end
+
     def perform_retry(http, &callback)
-      if EventMachine.reactor_running? && (@performed_retries.nil? || @performed_retries < @max_retries)
-        logger.error("http error #{http.error}. Trying again in #{retry_delay} seconds...")
-        EventMachine::add_timer(retry_delay) do
-          @performed_retries = (@performed_retries || 0) + 1
-          logger.info("Reconnecting...")
-          callback.call
+      if EventMachine.reactor_running?
+
+        if max_retries_reached?
+          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
+            callback.call
+          end
         end
+
       else
         logger.error("The event machine loop is not running")
         raise Firering::Connection::HTTPError.new(http)
       end
     end
+    private :perform_retry
+
+    def reset_retries_counter
+      @performed_retries = 0
+    end
+    private :reset_retries_counter
+
+    def increase_retries_counter
+      @performed_retries = (@performed_retries || 0) + 1
+    end
+    private :increase_retries_counter
 
     class HTTPError < RuntimeError
       attr_reader :http

data/lib/firering.rb

@@ -5,7 +5,7 @@ require 'yajl'
 require 'em-http'
 
 module Firering
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 
   class Error < StandardError; end
 

data/spec/firering/connection_spec.rb

@@ -16,10 +16,46 @@ describe Firering::Connection do
       conn.stream(304355) do |message|
         message.should be_an_instance_of(Firering::Message)
       end
+
       EM.add_timer(1) do
         EM.stop
       end
     }
   end
 
+  it "performs connection retries if the connection drops" do
+    conn.retry_delay = 1
+    make_fixture_server_fail_times(conn.max_retries)
+    messages = []
+
+    EM.run {
+      conn.stream(304355) do |message|
+        messages << message
+      end
+      EM.add_timer(conn.max_retries * conn.retry_delay + 1) do
+        EM.stop
+      end
+    }
+
+    messages.should_not be_empty
+  end
+
+  it "raises an exception if the connection drops and performed enough retries" do
+    conn.retry_delay = 1
+    make_fixture_server_fail_times(conn.max_retries + 1)
+    messages = []
+
+    begin
+      EM.run {
+        conn.stream(304355) { |message| messages << message }
+
+        EM.add_timer(conn.max_retries * conn.retry_delay + 1) { EM.stop }
+      }
+    rescue Firering::Connection::HTTPError
+    ensure
+      EM.stop if EventMachine.reactor_running?
+    end
+
+    messages.should be_empty
+  end
 end

data/spec/fixtures/load_server.rb

@@ -5,21 +5,72 @@ class MyLogger < Logger
 end
 
 class FixtureServer < Struct.new(:logger)
+
+  def initialize(*args)
+    super
+    @fails = 0
+  end
+
   def call(env)
     req = Rack::Request.new(env)
     res = Rack::Response.new
-    res.write read_fixture(req)
+
+    if adjusted_fails?(req)
+      res.write("OK")
+    else
+      if @fails > 0
+        log_hi("I was requested to fail, fails left: #{ @fails }")
+        @fails -= 1
+        res.write("")
+        res.status = 404
+      else
+        log_hi("Trying to open fixture")
+        res.write read_fixture(req)
+      end
+    end
+
     res.finish
   end
 
+  def adjusted_fails?(req)
+    if req.path =~ /fail\/(\d+)/
+      log_hi("I was requested to fail next #{ @fails = $1.to_i } requests")
+      true
+    elsif req.path =~ /fail\/reset/
+      @fails = 0
+      log_hi("Fail count reset, next requests should not fail (unless a fixture is missing)")
+      true
+    else
+      false
+    end
+  end
+
+  def log(msg)
+    logger.info("  FIXTURES: #{msg}")
+  end
+
+  def log_hi(msg)
+    log("/" * 80) ; log(msg) ; log("/" * 80)
+  end
+
   def read_fixture(req)
     return "It Works!" if req.path == "" || req.path == "/"
-    fixture = ([req.request_method.to_s.downcase] + req.path.split("/")).join("_").squeeze("_").gsub(/\d+/, "ID")
-    path = File.expand_path(File.join(File.dirname(__FILE__), "json", fixture))
-    logger.info("opening fixture: #{path}, #{File.file?(path)}")
-    output = File.file?(path) ? File.read(path) : "FIXTURE NOT FOUND #{path}"
-    logger.info("\n\n#{output}\n")
-    output
+
+    path = fixture_path(req)
+
+    if File.file?(path)
+      log("Fixture found: #{path}")
+      File.read(path).tap { |output| logger.info("\n\n#{output}\n") }
+    else
+      log("Fixture not found: #{path}")
+      "FIXTURE NOT FOUND #{path}"
+    end
+  end
+
+  def fixture_path(req)
+    name_parts = [req.request_method.to_s.downcase] + req.path.split("/")
+    name = name_parts.join("_").squeeze("_").gsub(/\d+/, "ID")
+    File.expand_path(File.join(File.dirname(__FILE__), "json", name))
   end
 end
 
@@ -56,3 +107,11 @@ def start_fixtures_server(port)
 
   pid
 end
+
+def make_fixture_server_fail_times(times)
+  open(URI("http://localhost:#{$specs_port}/fail/#{times}"))
+end
+
+def reset_fixture_server_fails
+  make_fixture_server_fail_times("reset")
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: firering
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Emmanuel Oga
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-16 00:00:00 -03:00
+date: 2010-10-01 00:00:00 -03:00
 default_executable: campf-notify
 dependencies: 
 - !ruby/object:Gem::Dependency