em-campfire 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf1a5b37a9168bc545a846cf3711eac88cab638c
-  data.tar.gz: 3e63b30df129cd68330ef71bf54d8e1f87610a70
+  metadata.gz: 03387cbabb71c147c753b0fc2173f288d8ccde49
+  data.tar.gz: 125625355cfed4fdf51fd03c60d2d8f0062724a7
 SHA512:
-  metadata.gz: 9d43e8055e0ae06c7a499f7d6afbe24c9b9948f87a87943c45d86beee10001ff5c0623258929c2009b58e41efbc5270135473e77ad1799f6f4c4e7d6c97eb5fa
-  data.tar.gz: b0c9e65911c33c4d9a20766df5b46449088437ab6f2c948e25ef9444f4db003edb267567d04b8e5831e0d4f5953201af4481a3c30e00871c1d34c28c24c6e7d5
+  metadata.gz: 9c70174af33d488f9d431e2d72557fa6fbaf5740af40848e4f1b06b7350075d4ddd94bcba65dd53cc3eaf82acf1acf21952a63775907982d7d2306b9a9e346a6
+  data.tar.gz: 9e2fe6b01ec3d682c19434a6818abc94b92bff3e0dee1c25eaa3f80d0ca87ccc978ef635669be402bb4f0a7f426cfe824b72f20cbea47ad01251e7843a5cf3e8

data/lib/em-campfire/rooms.rb

@@ -11,9 +11,11 @@ module EventMachine
         http.errback { logger.error "Error joining room: #{room_id}" }
         http.callback {
           if http.response_header.status == 200
-            logger.info "Joined room #{room_id} successfully"
+            EM.defer {logger.info "Joined room #{room_id} successfully"}
             joined_rooms[room_id] = true
-            yield(room_id) if block_given?
+            if block_given?
+              EM.next_tick { yield(room_id) }
+            end
           else
             logger.error "Error joining room: #{room_id}"
           end
@@ -26,12 +28,15 @@ module EventMachine
 
         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 => 4).get :head => {'authorization' => [api_key, 'X'], 'user-agent' => user_agent}
+        http = EventMachine::HttpRequest.new(url, :connect_timeout => 30, :inactivity_timeout => 8).get :head => {'authorization' => [api_key, 'X'], 'user-agent' => user_agent}
         http.errback {
           logger.error "Couldn't stream room #{room_id} at url #{url}, error was #{http.error}"
-          EM.next_tick {stream(room_id)}
+          EventMachine::Timer.new(5) {
+            EM.next_tick{stream(room_id)}
+          }
         }
         http.callback {
+          puts http.response_header.status
           if http.response_header.status == 200
             logger.info "Disconnected from #{url}"
           else
@@ -40,12 +45,26 @@ module EventMachine
           EM.next_tick {stream(room_id)}
         }
         http.stream do |chunk|
-          logger.debug "Got keepalive" if chunk == " "
-          begin
-            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)}
+          if http.response_header.status == 401
+            http.close
+
+            join(room_id) {
+              EventMachine::Timer.new(5) {
+                EM.next_tick { stream(room_id) }
+              }
+            }
+          elsif http.response_header.status == 200
+            logger.debug "Got keepalive" if chunk == " "
+            begin
+              json_parser << chunk
+            rescue Yajl::ParseError => e
+              logger.error "Couldn't parse json data for room 123, data was #{chunk}, error was: #{e}"
+              http.close
+              logger.error "Closed connection"
+              EM.next_tick {stream(room_id)}
+            end
+          else
+            raise RuntimeError, "Got status #{http.response_header.status} while connecting to #{url}"
           end
         end
       end

data/lib/em-campfire/version.rb

@@ -1,5 +1,5 @@
 module EventMachine
   class Campfire
-    VERSION = "1.2.3"
+    VERSION = "1.2.4"
   end
 end

data/spec/lib/em-campfire_spec.rb

@@ -1,20 +1,20 @@
 require "spec_helper"
 
 describe EventMachine::Campfire do
-  
+
   before :each do
     @self_data_request_stub = stub_self_data_request
   end
-    
+
   describe "#initialize" do
     it "should work with valid params" do
       EM.run_block { a(EM::Campfire).should be_a(EM::Campfire) }
     end
-    
+
     it "should raise when given an option it doesn't understand" do
       lambda { EM::Campfire.new(valid_params.merge({:fred => "estaire"}))}.should raise_error(ArgumentError, ":fred is not a valid option")
     end
-    
+
     it "should require essential parameters" do
       lambda { EM::Campfire.new }.should raise_error(ArgumentError, "You must pass an API key")
       lambda { EM::Campfire.new(:api_key => "foo") }.should raise_error(ArgumentError, "You must pass a subdomain")
@@ -25,37 +25,37 @@ describe EventMachine::Campfire do
       @self_data_request_stub.should have_been_requested
     end
   end
-  
+
   describe "#verbose" do
     it "should default to false" do
-      EM.run_block { a(EM::Campfire).verbose.should be_false }
+      EM.run_block { a(EM::Campfire).verbose.should be_falsey }
     end
-    
+
     it "should be overridable at initialization" do
-      EM.run_block { a(EM::Campfire, :verbose => true).verbose.should be_true }
+      EM.run_block { a(EM::Campfire, :verbose => true).verbose.should be true }
     end
   end
-  
+
   describe "#logger" do
     context "default logger" do
       before { EM.run_block { @adaptor = a EM::Campfire } }
-      
+
       it { @adaptor.logger.should be_a(Logger) }
       it { @adaptor.logger.level.should be == Logger::INFO }
     end
-    
+
     context "default logger in verbose mode" do
       before { EM.run_block { @adaptor = a EM::Campfire, :verbose => true } }
-      
+
       it { @adaptor.logger.level.should be == Logger::DEBUG }
     end
-    
+
     context "overriding default" do
       before do
         @custom_logger = Logger.new("/dev/null")
         EM.run_block { @adaptor = a EM::Campfire, :logger => @custom_logger }
       end
-      
+
       it { @adaptor.logger.should be == @custom_logger }
     end
   end
@@ -92,7 +92,7 @@ describe EventMachine::Campfire do
     end
 
     it "should be overridable at initialization" do
-      EM.run_block { a(EM::Campfire, :ignore_timestamps => true).ignore_timestamps?.should be_true }
+      EM.run_block { a(EM::Campfire, :ignore_timestamps => true).ignore_timestamps?.should be true }
     end
   end
 

data/spec/lib/rooms_spec.rb

@@ -17,7 +17,7 @@ describe EventMachine::Campfire::Rooms do
     it "should allow joining by id" do
       join_stub = stub_join_room_request(123)
       EM.run_block { @adaptor.join(123) }
-      logger_output.should =~ /INFO.*Joined room 123 successfully/
+      logger_output.should =~ /INFO.*Joining room 123/
       join_stub.should have_been_requested
     end
 
@@ -30,11 +30,13 @@ describe EventMachine::Campfire::Rooms do
     it "should call a passed block on success" do
       join_stub = stub_join_room_request(123)
       object = mock()
-      object.expects(:ping).with("foo")
+      object.expects(:ping).with(123)
 
-      EM.run_block {
-        @adaptor.join(123) {|room_id| object.ping("foo") }
+      EM.run {
+        @adaptor.join(123) {|room_id| object.ping(room_id) }
+        EM.next_tick { EM.next_tick { EM.stop } }
       }
+
     end
   end
 
@@ -67,7 +69,7 @@ describe EventMachine::Campfire::Rooms do
       request = stub_timeout_stream_room_request(123)
 
       EM.run_block {@adaptor.stream(123)}
-      request.should have_been_requested.twice
+      EM.next_tick{ EM.next_tick{ request.should have_been_requested.twice } }
       logger_output.should =~ /ERROR.*Couldn't stream room 123 at url #{stream_url_for_room(123)}, error was WebMock timeout error/
     end
 

data/spec/rooms_helper.rb

@@ -85,7 +85,7 @@ end
 
 def stub_timeout_room_list_data_request
   stub_request(:get, rooms_data_url).
-    with(:headers => {'Authorization'=>['6124d98749365e3db2c9e5b27ca04db6', 'X'], 'Content-Type'=>'application/json'}, 'User-Agent' => valid_params[:user_agent]).
+    with(:headers => {'Authorization'=>['6124d98749365e3db2c9e5b27ca04db6', 'X'], 'Content-Type'=>'application/json', 'User-Agent' => valid_params[:user_agent]}).
     to_timeout
 end
 

data/spec/spec_helper.rb

@@ -10,7 +10,7 @@ require File.expand_path("../lib/em-campfire", File.dirname(__FILE__))
 require 'webmock/rspec'
 
 RSpec.configure do |config|
-  config.color_enabled = true
+  config.color = true
   config.mock_framework = :mocha
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: em-campfire
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Will Jessop
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-20 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Eventmachine campfire API lib