em-campfire 1.1.0 → 1.1.1

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://secure.travis-ci.org/wjessop/em-campfire.png?branch=master)](https://travis-ci.org/wjessop/em-campfire)
+
 em-campfire is a library for interacting with the [Campfire](http://campfirenow.com/) chat application. It was extracted from the [Scamp](https://github.com/wjessop/Scamp) v1 bot framework.
 
 ## Installation
@@ -53,7 +55,8 @@ EM.run {
     :verbose => true,
     :logger => Logger::Syslog.new('process_name', Syslog::LOG_PID | Syslog::LOG_CONS),
     :cache => custom_cache_object,
-    :ignore_self => true
+    :ignore_self => true,
+    :ignore_timestamps => true
   )
 
   # more code
@@ -78,6 +81,10 @@ The cache object should conform to the get/set API of the [redis-rb](https://git
 
 em-campfire receives messages that it posted on it's streaming connections. By default it processes these just as it would any other message. set :ignore_self to true to make it ignore messages it sends.
 
+#### :ignore_timestamps
+
+Campfire sends periodic timestamp messages. They're useless for most applications, so set this option and they will be totally ignored.
+
 ## Requirements
 
 I've tested it in Ruby >= 1.9.3.

data/lib/em-campfire/rooms.rb

@@ -23,7 +23,7 @@ module EventMachine
       def stream(room_id)
         json_parser = Yajl::Parser.new :symbolize_keys => true
         json_parser.on_parse_complete = method(:process_message)
-        
+
         url = "https://streaming.campfirenow.com/room/#{room_id}/live.json"
         # Timeout per https://github.com/igrigorik/em-http-request/wiki/Redirects-and-Timeouts
         http = EventMachine::HttpRequest.new(url, :connect_timeout => 20, :inactivity_timeout => 0).get :head => {'authorization' => [api_key, 'X']}
@@ -44,6 +44,7 @@ module EventMachine
             json_parser << chunk
           rescue Yajl::ParseError => e
             logger.error "Couldn't parse json data for room 123, data was #{chunk}, error was: #{e}"
+            EM.next_tick {stream(room_id)}
           end
         end
       end

data/lib/em-campfire/version.rb

@@ -1,5 +1,5 @@
 module EventMachine
   class Campfire
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

data/spec/lib/rooms_spec.rb

@@ -31,7 +31,7 @@ describe EventMachine::Campfire::Rooms do
       join_stub = stub_join_room_request(123)
       object = mock()
       object.expects(:ping).with("foo")
-          
+
       EM.run_block {
         @adaptor.join(123) {|room_id| object.ping("foo") }
       }
@@ -90,7 +90,7 @@ describe EventMachine::Campfire::Rooms do
       stream_stub.should have_been_requested.twice
     end
   end
-  
+
   describe "fetching metadata" do
     describe "for individual rooms" do
       it "should fetch room data" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-campfire
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-03 00:00:00.000000000 Z
+date: 2013-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -185,7 +185,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 734765957230943654
+      hash: 3592014490074001869
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 734765957230943654
+      hash: 3592014490074001869
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24