firehose 0.2.alpha.5 → 0.2.alpha.6

data/firehose.gemspec

@@ -5,8 +5,8 @@ require "firehose/version"
 Gem::Specification.new do |s|
   s.name        = "firehose"
   s.version     = Firehose::VERSION
-  s.authors     = ["Brad Gessler", "Steel Fu", "Paul Cortens"]
-  s.email       = ["brad@polleverywhere.com", "steel@polleverywhere.com", "paul@polleverywhere.com"]
+  s.authors     = ["Brad Gessler", "Steel Fu", "Paul Cortens", "Zach Zolton"]
+  s.email       = ["brad@polleverywhere.com", "steel@polleverywhere.com", "paul@polleverywhere.com", "zach@polleverywhere.com"]
   s.homepage    = "http://firehose.io/"
   s.summary     = %q{Build realtime Ruby web applications}
   s.description = %q{Firehose is a realtime web application toolkit for building realtime Ruby web applications.}
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "faraday"
   s.add_runtime_dependency "faye-websocket"
   s.add_runtime_dependency "em-http-request", "~> 1.0.0"
+  s.add_runtime_dependency "json"
 
   s.add_development_dependency "rspec"
   s.add_development_dependency "webmock"

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

@@ -5,6 +5,10 @@ class Firehose.Consumer
   constructor: (config = {}) ->
     # List of transport stragies we have to use.
     config.transports   ||= Firehose.Consumer.transports
+    unless config.transports.length > 0
+      throw 'You must provide at least one tranport for Firehose.Consumer'
+    unless typeof config.uri is 'string'
+      throw 'You must provide a Firehose server URI for Firehose.Consumer'
     # Empty handler for messages.
     config.message      ||= ->
     # Empty handler for error handling.
@@ -13,41 +17,38 @@ class Firehose.Consumer
     config.connected    ||= ->
     # Empty handler for when we're disconnected.
     config.disconnected ||= ->
-    # The initial connection failed. This is probably triggered when a transport, like WebSockets
-    # is supported by the browser, but for whatever reason it can't connect (probably a firewall)
+    # The initial connection failed. This is probably triggered when a
+    # transport, like WebSockets is supported by the browser, but for whatever
+    # reason it can't connect (probably a firewall)
     config.failed       ||= ->
       throw "Could not connect"
-    # URL that we'll connect to.
-    config.uri          ||= undefined
     # Params that we'll tack on to the URL.
-    config.params       ||= { }
+    config.params       ||= {}
     # Do stuff before we send the message into config.message. The sensible
     # default on the webs is to parse JSON.
-    config.parse ||= (body) ->
-      JSON.parse(body)
-
+    config.parse        ||= JSON.parse
     # Hang on to these config for when we connect.
     @config = config
     # Make sure we return ourself out of the constructor so we can chain.
     this
 
-  connect: =>
+  connect: (delay=0) =>
     # Get a list of transports that the browser supports
-    supportedTransports = (transport for transport in @config.transports when transport.supported())
+    supportedTransports = (t for t in @config.transports when t.supported())
     # Mmmkay, we've got transports supported by the browser, now lets try connecting
     # to them and dealing with failed connections that might be caused by firewalls,
     # or other network connectivity issues.
     transports = for transport in supportedTransports
-      # Copy the config so we can modify it with a failed callback.
-      config = @config
+      originalFailFun = @config.failed
       # Map the next transport into the existing transports connectionError
       # If the connection fails, try the next transport supported by the browser.
-      config.failed = =>
-        # Map the next transport to connect insie of the current transport failures
-        if nextTransport = supportedTransports.pop()
-          new nextTransport(config).connect()
-        else
-          @config.failed() # Call the original fail method passed into the Firehose.Consumer
-      new transport(config)
+      @config.failed = =>
+        # Map the next transport to connect inside of the current transport failures
+        if nextTransportType = supportedTransports.pop()
+          nextTransport = new nextTransportType @config
+          nextTransport.connect delay
+        else originalFailFun?()
+      new transport(@config)
     # Fire off the first connection attempt.
-    transports[0].connect()
+    [firstTransport] = transports
+    firstTransport.connect delay

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

@@ -1,32 +1,33 @@
 class Firehose.LongPoll extends Firehose.Transport
-  messageSequenceHeader: 'pragma'
+  messageSequenceHeader: 'Pragma'
+  name: -> 'LongPoll'
 
-  # CORS is supported in IE 8+
-  @ieSupported: =>
-    $.browser.msie and parseInt($.browser.version) > 7 and window.XDomainRequest
+  # CORS is kinda supported in IE8+ except that its implementation cannot
+  # access "simple request" response headers. This means we don't yet have a
+  # plan to support IE<10 (when it gets a real XHR2 implementation). Sucks...
+  @ieSupported: ->
+    $.browser.msie and parseInt($.browser.version) >= 10
 
-  @supported: =>
+  @supported: ->
     # IE 8+, FF 3.5+, Chrome 4+, Safari 4+, Opera 12+, iOS 3.2+, Android 2.1+
     if xhr = $.ajaxSettings.xhr()
       "withCredentials" of xhr || Firehose.LongPoll.ieSupported()
 
   constructor: (args) ->
     super args
-
     # Configrations specifically for web sockets
-    @config.longPoll ||= {}
+    @config.longPoll         ||= {}
     # Protocol schema we should use for talking to WS server.
-    @config.longPoll.url ||= "http:#{@config.uri}"
+    @config.longPoll.url     ||= "http:#{@config.uri}"
     # How many ms should we wait before timing out the AJAX connection?
     @config.longPoll.timeout ||= 25000
-
     # 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.
-    @_lagTime = 5000
-    @_timeout = @config.longPoll.timeout + @_lagTime
-    @_okInterval = 0
-
-    @_isConnected = false
+    @_lagTime         = 5000
+    @_timeout         = @config.longPoll.timeout + @_lagTime
+    @_okInterval      = 0
+    @_isConnected     = false
+    @_stopRequestLoop = false
 
   connect: (delay = 0) =>
     unless @_isConnected
@@ -40,53 +41,35 @@ class Firehose.LongPoll extends Firehose.Transport
     # set any HTTP headers for CORS requests.
     data = @config.params
     data.last_message_sequence = @_lastMessageSequence
-    # TODO: Some of these options will be deprecated in jQurey 1.8
+    # TODO: Some of these options will be deprecated in jQuery 1.8
     #       See: http://api.jquery.com/jQuery.ajax/#jqXHR
+    opts =
+      crossDomain:  true
+      data:         data
+      timeout:      @_timeout
+      success:      @_success
+      error:        @_error
+      complete:     @_xhrComplete
+    opts.xhr = hackAroundFirefoxXhrHeadersBug if $.browser.mozilla
+    $.ajax @config.longPoll.url, opts
 
-    $.ajax @config.longPoll.url,
-      crossDomain: true
-      data: data
-      timeout: @_timeout
-      success: @_success
-      error: @_error
-      xhr: ->
-        # TODO - This while `xrh` attr is a stupid hack to deal with CORS short-comings in jQuery in Firefox.
-        # This ticket can be viewed at http://bugs.jquery.com/ticket/10338. Once jQuery is 
-        # upgraded to this version, we can probably remove this, but be sure you test the 
-        # crap out of Firefox!
-        #
-        # Its also worth noting that I had to localize this monkey-patch to the Firehose.LongPoll
-        # consumer because a previous global patch on jQuery.ajaxSettings.xhr was breaking regular IE7
-        # loading. I figured its better to localize this anyway to solve that problem and loading order issues.
-        xhr = jQuery.ajaxSettings.xhr()
-        getAllResponseHeaders = xhr.getAllResponseHeaders
-        xhr.getAllResponseHeaders = ->
-          allHeaders = getAllResponseHeaders.call(xhr)
-          return allHeaders if allHeaders
-          allHeaders = ""
-          for headerName in [ "Cache-Control", "Content-Language", "Content-Type", "Expires", "Last-Modified", "Pragma" ]
-            do (headerName) ->
-              allHeaders += headerName + ": " + xhr.getResponseHeader(headerName) + "\n"  if xhr.getResponseHeader(headerName)
-          allHeaders
-        xhr
+  _xhrComplete: (jqXhr) =>
+    # Get the last sequence from the server if specified.
+    if jqXhr.status is 200
+      val = jqXhr.getResponseHeader @messageSequenceHeader
+      @_lastMessageSequence = val if val?
 
-      complete: (jqXhr) =>
-        # Get the last sequence from the server if specified.
-        if jqXhr.status == 200
-          @_lastMessageSequence = jqXhr.getResponseHeader(@messageSequenceHeader)
-          if @_lastMessageSequence == null
-            console.log 'ERROR: Unable to get last message sequnce from header'
+  stop: =>
+    @_stopRequestLoop = true
 
   _success: (data, status, jqXhr) =>
-    # TODO we actually want to do this when the thing calls out... mmm right now it takes
-    # up to 30s before we can call this thing.
-    # Call the 'connected' callback if the connection succeeds.
-    @_open(data) unless @_succeeded
+    @_open data unless @_succeeded
+    return if @_stopRequestLoop
     if jqXhr.status == 204
       # If we get a 204 back, that means the server timed-out and sent back a 204 with a
       # X-Http-Next-Request header
       #
-      # Why did we use a 204 and not a 408? Because FireFox is really stupid about 400 level error
+      # Why did we use a 204 and not a 408? Because Firefox is really stupid about 400 level error
       # codes and would claims its a 0 error code, which we use for something else. Firefox is IE
       # in this case
       @connect(@_okInterval)
@@ -109,9 +92,65 @@ class Firehose.LongPoll extends Firehose.Transport
   _error: (jqXhr, status, error) =>
     @_isConnected = false
     @config.disconnected()
+    unless @_stopRequestLoop
+      # Ping the server to make sure this isn't a network connectivity error
+      setTimeout @_ping, @_retryDelay + @_lagTime
+      # Reconnect with delay
+      setTimeout @_request, @_retryDelay
+
+# NB: This is a stupid hack to deal with CORS short-comings in jQuery in
+# Firefox. There is a ticket for this: http://bugs.jquery.com/ticket/10338
+# Once jQuery is upgraded to this version we can probably remove this, but be
+# sure you test the crap out of Firefox!
+# Its also worth noting that I had to localize this monkey-patch to the
+# Firehose.LongPoll consumer because a previous global patch on
+# jQuery.ajaxSettings.xhr was breaking regular IE7 loading. Better to localize
+# this anyway to solve that problem and loading order issues.
+hackAroundFirefoxXhrHeadersBug = ->
+  XHR_HEADERS = [
+    "Cache-Control", "Content-Language", "Content-Type"
+    "Expires", "Last-Modified", "Pragma"
+  ]
+  xhr = jQuery.ajaxSettings.xhr()
+  originalFun = xhr.getAllResponseHeaders
+  xhr.getAllResponseHeaders = ->
+    return allHeaders if allHeaders = originalFun.call xhr
+    lines = for name in XHR_HEADERS when xhr.getResponseHeader(name)?
+      "#{name}: #{xhr.getResponseHeader name}"
+    lines.join '\n'
+  xhr
 
-    # Ping the server to make sure this isn't a network connectivity error
-    setTimeout @_ping, @_retryDelay + @_lagTime
+# NB: Leaving this here for now. It does work, but won't help us since the XDR
+#     object cannot access any response headers, which Firehose relies on.
 
-    # Reconnect with delay
-    setTimeout @_request, @_retryDelay
+# # Let's try to hack in support for IE8+ via the XDomainRequest object!
+# # This was adapted from code shamelessly stolen from:
+# # https://github.com/jaubourg/ajaxHooks/blob/master/src/ajax/xdr.js
+# if $.browser.msie and parseInt($.browser.version, 10) in [8, 9]
+#   jQuery.ajaxTransport (s) ->
+#     if s.crossDomain and s.async
+#       if s.timeout
+#         s.xdrTimeout = s.timeout
+#         delete s.timeout
+#       xdr = undefined
+#       return {
+#         send: (_, complete) ->
+#           callback = (status, statusText, responses, responseHeaders) ->
+#             xdr.onload = xdr.onerror = xdr.ontimeout = jQuery.noop
+#             xdr = undefined
+#             complete status, statusText, responses, responseHeaders
+#           xdr = new XDomainRequest()
+#           xdr.open s.type, s.url
+#           xdr.onload = ->
+#             headers = "Content-Type: #{xdr.contentType}"
+#             callback 200, "OK", {text: xdr.responseText}, headers
+#           xdr.onerror = -> callback 404, "Not Found"
+#           if s.xdrTimeout?
+#             xdr.ontimeout = -> callback 0, "timeout"
+#             xdr.timeout   = s.xdrTimeout
+#           xdr.send (s.hasContent and s.data) or null
+#         abort: ->
+#           if xdr?
+#             xdr.onerror = jQuery.noop()
+#             xdr.abort()
+#       }

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

@@ -11,23 +11,21 @@ class Firehose.Transport
 
   # Lets rock'n'roll! Connect to the server.
   connect: (delay = 0) =>
-    setTimeout =>
-      @_request()
-    , delay
+    setTimeout @_request, delay
     this
 
-  # Sub classes need to implement this method to handle requests
-  _request: =>
+  # Hey subclasses:
+  name: ->     throw 'not implemented in base Transport' # implement this to identify transport type
+  stop: ->     throw 'not implemented in base Transport' # implement this to stop receiving messages
+  _request: -> throw 'not implemented in base Transport' # implement this to handle requests
 
   # Default error handler
   _error: (event) =>
-    unless @_succeeded
-      # Fail peremantly if the error happens on the first connection.
-      @config.failed(this)
-    else
+    if @_succeeded
       # Lets try to connect again with delay
       @config.disconnected()
       @connect(@_retryDelay)
+    else @config.failed @
 
   # Default connection established handler
   _open: (event) =>

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

@@ -3,6 +3,8 @@
 window.WEB_SOCKET_SWF_LOCATION = '/assets/firehose/WebSocketMain.swf' if !window.WEB_SOCKET_SWF_LOCATION
 
 class Firehose.WebSocket extends Firehose.Transport
+  name: -> 'WebSocket'
+
   @supported: =>
     # Compatibility reference: http://caniuse.com/websockets
     # We don't need to explicitly check for Flash web socket or MozWebSocket
@@ -18,11 +20,31 @@ class Firehose.WebSocket extends Firehose.Transport
     @config.webSocket.url ||= "ws:#{@config.uri}?#{$.param(@config.params)}"
 
   _request: =>
-    @socket = new window.WebSocket(@config.webSocket.url)
-    @socket.onopen = @_open
-    @socket.onclose = @_close
-    @socket.onerror = @_error
-    @socket.onmessage = @_message
+    @socket = new window.WebSocket @config.webSocket.url
+    @socket.onopen    = @_open
+    @socket.onclose   = @_close
+    @socket.onerror   = @_error
+    @socket.onmessage = @_waitForPong
+
+  stop: =>
+    @cleanUp()
+
+  _open: =>
+    # TODO: include JSON client-side script for less awesome browsers
+    @socket.send JSON.stringify ping: 'PING'
+    # TODO: consider making this timeout configurable somehow...
+    @pingTimeout = setTimeout @_error, 2000
+
+  _waitForPong: (event) =>
+    o = try JSON.parse event.data catch e then {}
+    if o.pong is 'PONG'
+      # Not quite sure why this doesn't work in IE8:
+      # (Throws "TypeError: Array or arguments object expected")
+      # Firehose.Transport::_open.apply @, event
+      @_succeeded = true
+      @config.connected @
+      clearTimeout @pingTimeout
+      @socket.onmessage = @_message
 
   _message: (event) =>
     @config.message(@config.parse(event.data))
@@ -34,13 +56,14 @@ class Firehose.WebSocket extends Firehose.Transport
       @_error(event)
 
   _error: (event) =>
-    # Cleanup the current connection
+    @cleanUp()
+    super
+
+  cleanUp: ->
     if @socket
-      @socket.onopen = null
-      @socket.onclose = null
-      @socket.onerror = null
+      @socket.onopen    = null
+      @socket.onclose   = null
+      @socket.onerror   = null
       @socket.onmessage = null
       @socket.close()
       delete(@socket)
-    
-    super

data/lib/firehose/rack/consumer_app.rb

@@ -1,4 +1,5 @@
 require 'faye/websocket'
+require 'json'
 
 module Firehose
   module Rack
@@ -47,7 +48,8 @@ module Firehose
                 env['async.callback'].call response(400, "Header '#{LAST_MESSAGE_SEQUENCE_HEADER}' may not be less than zero", response_headers(env))
               else
                 Channel.new(path).next_message(last_sequence, :timeout => TIMEOUT).callback do |message, sequence|
-                  env['async.callback'].call response(200, message, response_headers(env).merge(LAST_MESSAGE_SEQUENCE_HEADER => sequence.to_s))
+                  combined_headers = response_headers(env).merge(LAST_MESSAGE_SEQUENCE_HEADER => sequence.to_s)
+                  env['async.callback'].call response(200, message, combined_headers)
                 end.errback do |e|
                   if e == :timeout
                     env['async.callback'].call response(204, '', response_headers(env))
@@ -84,8 +86,8 @@ module Firehose
         def cors_headers(env)
           # TODO seperate out CORS logic as an async middleware with a Goliath web server.
           {
-            'Access-Control-Allow-Origin'     => cors_origin(env),
-            'Access-Control-Expose-Headers'   => LAST_MESSAGE_SEQUENCE_HEADER
+            'Access-Control-Allow-Origin'   => cors_origin(env),
+            'Access-Control-Expose-Headers' => LAST_MESSAGE_SEQUENCE_HEADER
           }
         end
       end
@@ -117,9 +119,10 @@ module Firehose
             subscribe.call nil
           end
 
-          #ws.onmessage = lambda do |event|
-          #  event.data
-          #end
+          ws.onmessage = lambda do |event|
+            o = JSON.parse(event.data, :symbolize_names => true) rescue {}
+            ws.send(JSON.generate(:pong => 'PONG')) if o[:ping] == 'PING'
+          end
 
           ws.onclose = lambda do |event|
             if @deferrable

data/lib/firehose/rack.rb

@@ -10,7 +10,7 @@ module Firehose
     # Normally we'd want to use a custom header to reduce the likelihood of some
     # HTTP middleware clobbering the value. But Safari seems to ignore our CORS
     # header instructions, so we are using 'pragma' because it is always allowed.
-    LAST_MESSAGE_SEQUENCE_HEADER = 'pragma'
+    LAST_MESSAGE_SEQUENCE_HEADER = 'Pragma'
     RACK_LAST_MESSAGE_SEQUENCE_HEADER = "HTTP_#{LAST_MESSAGE_SEQUENCE_HEADER.upcase.gsub('-', '_')}"
     # Don't cache in development mode
     CORS_OPTIONS_MAX_AGE = ENV['RACK_ENV'] == 'development' ? '1' : '1728000'

data/lib/firehose/version.rb

@@ -1,4 +1,4 @@
 module Firehose
-  VERSION = "0.2.alpha.5"
-  CODENAME = "Time To Live (it up?)"
+  VERSION = "0.2.alpha.6"
+  CODENAME = "Web Sockets, Schmeb Schmockets"
 end

data/spec/integrations/shared_examples.rb

@@ -79,7 +79,7 @@ shared_examples_for 'Firehose::Rack::App' do
     end
 
     # Great, we have all the pieces in order, lets run this thing in the reactor.
-    em 60 do
+    em 180 do
       # Start the clients.
       websocket.call(1)
       websocket.call(2)

metadata

@@ -1,21 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: firehose
 version: !ruby/object:Gem::Version
-  version: 0.2.alpha.5
+  version: 0.2.alpha.6
   prerelease: 4
 platform: ruby
 authors:
 - Brad Gessler
 - Steel Fu
 - Paul Cortens
+- Zach Zolton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-12 00:00:00.000000000 Z
+date: 2012-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70227705301260 !ruby/object:Gem::Requirement
+  requirement: &70256291491020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +24,10 @@ dependencies:
         version: 1.0.0.rc
   type: :runtime
   prerelease: false
-  version_requirements: *70227705301260
+  version_requirements: *70256291491020
 - !ruby/object:Gem::Dependency
   name: em-hiredis
-  requirement: &70227705300800 !ruby/object:Gem::Requirement
+  requirement: &70256291490580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +35,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70227705300800
+  version_requirements: *70256291490580
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70227705300260 !ruby/object:Gem::Requirement
+  requirement: &70256291490080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +46,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70227705300260
+  version_requirements: *70256291490080
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70227705299800 !ruby/object:Gem::Requirement
+  requirement: &70256291489660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +57,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70227705299800
+  version_requirements: *70256291489660
 - !ruby/object:Gem::Dependency
   name: faye-websocket
-  requirement: &70227705299260 !ruby/object:Gem::Requirement
+  requirement: &70256291489240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +68,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70227705299260
+  version_requirements: *70256291489240
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70227705298620 !ruby/object:Gem::Requirement
+  requirement: &70256291488740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +79,21 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70227705298620
+  version_requirements: *70256291488740
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70256291488320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70256291488320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70227705297680 !ruby/object:Gem::Requirement
+  requirement: &70256291487860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +101,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70227705297680
+  version_requirements: *70256291487860
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70227705340680 !ruby/object:Gem::Requirement
+  requirement: &70256291459520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +112,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70227705340680
+  version_requirements: *70256291459520
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70227705340080 !ruby/object:Gem::Requirement
+  requirement: &70256291459080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +123,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70227705340080
+  version_requirements: *70256291459080
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &70227705339180 !ruby/object:Gem::Requirement
+  requirement: &70256291458660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,10 +134,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70227705339180
+  version_requirements: *70256291458660
 - !ruby/object:Gem::Dependency
   name: guard-coffeescript
-  requirement: &70227705338480 !ruby/object:Gem::Requirement
+  requirement: &70256291458220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,10 +145,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70227705338480
+  version_requirements: *70256291458220
 - !ruby/object:Gem::Dependency
   name: rainbows
-  requirement: &70227705337780 !ruby/object:Gem::Requirement
+  requirement: &70256291457800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -144,10 +156,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70227705337780
+  version_requirements: *70256291457800
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70227705337360 !ruby/object:Gem::Requirement
+  requirement: &70256291457380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -155,10 +167,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70227705337360
+  version_requirements: *70256291457380
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70227705336940 !ruby/object:Gem::Requirement
+  requirement: &70256291456960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -166,10 +178,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70227705336940
+  version_requirements: *70256291456960
 - !ruby/object:Gem::Dependency
   name: async_rack_test
-  requirement: &70227705336480 !ruby/object:Gem::Requirement
+  requirement: &70256291456520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -177,10 +189,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70227705336480
+  version_requirements: *70256291456520
 - !ruby/object:Gem::Dependency
   name: foreman
-  requirement: &70227705336020 !ruby/object:Gem::Requirement
+  requirement: &70256291456040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -188,10 +200,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70227705336020
+  version_requirements: *70256291456040
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70227705335600 !ruby/object:Gem::Requirement
+  requirement: &70256291455540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -199,13 +211,14 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70227705335600
+  version_requirements: *70256291455540
 description: Firehose is a realtime web application toolkit for building realtime
   Ruby web applications.
 email:
 - brad@polleverywhere.com
 - steel@polleverywhere.com
 - paul@polleverywhere.com
+- zach@polleverywhere.com
 executables:
 - firehose
 extensions: []
@@ -282,6 +295,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1005777279219714638
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: