scamp 1.0.0 → 1.0.1

data/lib/scamp/rooms.rb

@@ -99,7 +99,13 @@ class Scamp
       http = EventMachine::HttpRequest.new(url, :connect_timeout => 20, :inactivity_timeout => 0).get :head => {'authorization' => [api_key, 'X']}
       http.errback { logger.error "Couldn't stream room #{room_id} at url #{url}" }
       http.callback { logger.info "Disconnected from #{url}"; rooms_to_join << room_id}
-      http.stream {|chunk| json_parser << chunk }
+      http.stream do |chunk| 
+        begin
+          json_parser << chunk  
+        rescue Yajl::ParseError => e
+          logger.error "Couldn't parse room data for room #{room_id} with url #{url}, http response data was #{chunk[0..50]}..."
+        end
+      end
     end
 
     def room_id_from_room_name(room_name)

data/lib/scamp/version.rb

@@ -1,3 +1,3 @@
 class Scamp
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/lib/scamp_spec.rb

@@ -662,10 +662,23 @@ describe Scamp do
         }
         logger_output.should =~ /ERROR.*Couldn't connect to #{@room_url} to fetch room data for room 123/
       end
-      
+
       it "should stream a room"
+
+      it "should handle response errors streaming a room" do
+        mock_logger
+        bot = a Scamp
+        
+        EM.run_block {
+          stub_request(:get, @stream_url).
+            with(:headers => {'Authorization'=>[@valid_params[:api_key], 'X']}).
+            to_return(:status => 201, :body => 'foobarbaz', :headers => {})
+            lambda { bot.send(:stream, 123) }.should_not raise_error
+        }
+        logger_output.should =~ /ERROR.*Couldn't parse room data for room 123 with url #{@stream_url}, http response data was foobarbaz.../
+      end
+
       it "should handle HTTP errors streaming a room"
-      it "should handle network errors streaming a room"
     end
     
     context "message operations" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scamp
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-09 00:00:00.000000000Z
+date: 2012-01-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70092491483860 !ruby/object:Gem::Requirement
+  requirement: &2151961800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0.beta.4
   type: :runtime
   prerelease: false
-  version_requirements: *70092491483860
+  version_requirements: *2151961800
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70092491483340 !ruby/object:Gem::Requirement
+  requirement: &2151961120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.8.3
   type: :runtime
   prerelease: false
-  version_requirements: *70092491483340
+  version_requirements: *2151961120
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70092491482760 !ruby/object:Gem::Requirement
+  requirement: &2151959580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0.beta.4
   type: :runtime
   prerelease: false
-  version_requirements: *70092491482760
+  version_requirements: *2151959580
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70092491482300 !ruby/object:Gem::Requirement
+  requirement: &2151959120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70092491482300
+  version_requirements: *2151959120
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70092491481840 !ruby/object:Gem::Requirement
+  requirement: &2151958640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70092491481840
+  version_requirements: *2151958640
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70092491481380 !ruby/object:Gem::Requirement
+  requirement: &2151958160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *70092491481380
+  version_requirements: *2151958160
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70092491480920 !ruby/object:Gem::Requirement
+  requirement: &2151957680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: 1.7.6
   type: :development
   prerelease: false
-  version_requirements: *70092491480920
+  version_requirements: *2151957680
 description: Eventmachine based Campfire bot framework
 email:
 - will@willj.net