firehose 0.0.11 → 0.0.12

data/lib/assets/javascripts/firehose/long_poll.js.coffee

@@ -15,8 +15,7 @@ class Firehose.LongPoll extends Firehose.Transport
     # Protocol schema we should use for talking to WS server.
     @config.longPoll.url ||= "http:#{@config.uri}"
     # How many ms should we wait before timing out the AJAX connection?
-    # TODO why was this set at 0s?
-    @config.longPoll.timeout ||= 0
+    @config.longPoll.timeout ||= 20000
 
     # TODO - What is @_lagTime for? Can't we just use the @_timeout value?
     # We use the lag time to make the client live longer than the server.

data/lib/firehose/rack.rb

@@ -11,10 +11,12 @@ module Firehose
         path    = req.path
         method  = req.request_method
         timeout = 30
+        cors_origin = env['HTTP_ORIGIN']
         cors_headers  = {
-          'Access-Control-Allow-Origin'     => env['HTTP_ORIGIN'],
+          'Access-Control-Allow-Origin'     => cors_origin,
           'Access-Control-Allow-Methods'    => 'GET',
-          'Access-Control-Max-Age'          => '1728000'
+          'Access-Control-Max-Age'          => '1728000',
+          'Access-Control-Allow-Headers'    => 'Content-Type, User-Agent, If-Modified-Since, Cache-Control'
         }
 
         case method
@@ -22,23 +24,26 @@ module Firehose
         # close down the requeust, and the client then reconnects.
         when 'GET'
           EM.next_tick do
+            # If the request is a CORS request, return those headers, otherwise don't worry 'bout it
+            response_headers = cors_origin ? cors_headers : {}
+
             # Setup a subscription with a client id. We haven't subscribed yet here.
             subscription = Firehose::Subscription.new(cid)
 
             # Setup a timeout timer to tell clients that time out that everything is OK
             # and they should come back for more
-            timer = EM.add_timer(timeout) do
+            timer = EventMachine::Timer.new(timeout) do
               # We send a 204 OK to tell the client to reconnect.
-              env['async.callback'].call [204, cors_headers, []]
+              env['async.callback'].call [204, response_headers, []]
               Firehose.logger.debug "HTTP wait `#{cid}@#{path}` timed out"
             end
 
             # Ok, now subscribe to the subscription.
             subscription.subscribe path do |message|
+              timer.cancel # Turn off the heart beat so we don't execute any of that business.
               subscription.unsubscribe
               subscription = nil # Set this to nil so that our heart beat timer doesn't try to double unsub.
-              EM.cancel_timer timer # Turn off the heart beat so we don't execute any of that business.
-              env['async.callback'].call [200, cors_headers, [message]]
+              env['async.callback'].call [200, response_headers, [message]]
               Firehose.logger.debug "HTTP sent `#{message}` to `#{cid}@#{path}`"
             end
             Firehose.logger.debug "HTTP subscribed to `#{cid}@#{path}`"

data/lib/firehose/version.rb

@@ -1,4 +1,4 @@
 module Firehose
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
   CODENAME = "Shouty Shamous"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: firehose
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70308648263700 !ruby/object:Gem::Requirement
+  requirement: &70182613622860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 1.0.0.beta
   type: :runtime
   prerelease: false
-  version_requirements: *70308648263700
+  version_requirements: *70182613622860
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &70308648262880 !ruby/object:Gem::Requirement
+  requirement: &70182613621920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 0.9.4
   type: :runtime
   prerelease: false
-  version_requirements: *70308648262880
+  version_requirements: *70182613621920
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70308648261900 !ruby/object:Gem::Requirement
+  requirement: &70182613620960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70308648261900
+  version_requirements: *70182613620960
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70308648260860 !ruby/object:Gem::Requirement
+  requirement: &70182613619960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70308648260860
+  version_requirements: *70182613619960
 - !ruby/object:Gem::Dependency
   name: websocket-rack
-  requirement: &70308648260100 !ruby/object:Gem::Requirement
+  requirement: &70182613619120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70308648260100
+  version_requirements: *70182613619120
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70308648258940 !ruby/object:Gem::Requirement
+  requirement: &70182613617780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70308648258940
+  version_requirements: *70182613617780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70308648258020 !ruby/object:Gem::Requirement
+  requirement: &70182613617160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70308648258020
+  version_requirements: *70182613617160
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70308648257080 !ruby/object:Gem::Requirement
+  requirement: &70182613615900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70308648257080
+  version_requirements: *70182613615900
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70308648271320 !ruby/object:Gem::Requirement
+  requirement: &70182613629800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70308648271320
+  version_requirements: *70182613629800
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &70308648267980 !ruby/object:Gem::Requirement
+  requirement: &70182613627180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70308648267980
+  version_requirements: *70182613627180
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70308648266640 !ruby/object:Gem::Requirement
+  requirement: &70182613625900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: 0.3.0
   type: :development
   prerelease: false
-  version_requirements: *70308648266640
+  version_requirements: *70182613625900
 - !ruby/object:Gem::Dependency
   name: guard-coffeescript
-  requirement: &70308648265120 !ruby/object:Gem::Requirement
+  requirement: &70182613624400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,7 +143,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70308648265120
+  version_requirements: *70182613624400
 description: Firehose is a realtime web application toolkit for building realtime
   Ruby web applications.
 email: