firehose 1.2.13 → 1.2.20

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6723069a09f7ecb056624cf408070f4376da2096
+  data.tar.gz: ee09bbe10757695dfd662a8252cd1acdfcb55f59
+SHA512:
+  metadata.gz: d2717778ef3c3b3a7f172f3bd124b0bee58291a0597267c6ef820988530abd72800f14814b0b437b288b39f17f0bdc2d7baf0f2118d583181fe535438b1ea887
+  data.tar.gz: d9a9f73db80996bddfa9187b71a8fa21ee9a6186770a34f7ae2fa32dfec8b9ee9b411ef3211c3f8198c8ab805629b1fcf51cae55151ec25badeb674ea2368fbc

data/.rbenv-version

@@ -1 +1 @@
-1.9.3-p484
+2.1.2

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

@@ -1 +1,4 @@
-window.Firehose = {}
+if module?.exports?
+  global.Firehose ||= {}
+else
+  window.Firehose ||= {}

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

@@ -22,6 +22,8 @@ class Firehose.Consumer
     this
 
   connect: (delay=0) =>
+    promise = @_connectPromise()
+
     @config.connectionVerified = @_upgradeTransport
     if Firehose.WebSocket.supported()
       @upgradeTimeout = setTimeout =>
@@ -30,7 +32,8 @@ class Firehose.Consumer
       , 500
     @transport = new Firehose.LongPoll @config
     @transport.connect delay
-    return
+
+    promise
 
   stop: =>
     if @upgradeTimeout?
@@ -44,3 +47,24 @@ class Firehose.Consumer
     ws.sendStartingMessageSequence @transport.getLastMessageSequence()
     @transport = ws
     return
+
+  # Return a promise that will succeed/fail depending on whether or not the
+  # initial connection succeeds.
+  _connectPromise: =>
+    deferred = $.Deferred()
+
+    origConnected = @config.connected
+    @config.connected = =>
+      deferred.resolve()
+      if origConnected
+        @config.connected = origConnected
+        origConnected()
+
+  #  origDisconnected = @config.disconnected
+  #  @config.disconnected = =>
+  #    deferred.reject()
+  #    if origDisconnected
+  #      @config.disconnected = origDisconnected
+  #      origDisconnected()
+
+    deferred.promise()

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

@@ -119,16 +119,29 @@ if $?.browser?.msie and parseInt($.browser.version, 10) in [8, 9]
             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"
+
+          # This is critical for long poll to work in IE9.
+          # Without it, the initial request will work but
+          # subsequent requests will fail silently.
+          # http://social.msdn.microsoft.com/Forums/ie/en-US/30ef3add-767c-4436-b8a9-f1ca19b4812e/ie9-rtm-xdomainrequest-issued-requests-may-abort-if-all-event-handlers-not-specified?forum=iewebdevelopment
+          xdr.onprogress = -> {}
+
           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()

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

@@ -5,7 +5,7 @@ class Firehose.WebSocket extends Firehose.Transport
   name: -> 'WebSocket'
 
   @ieSupported:-> (document.documentMode || 10) > 9
-  @supported  :-> window.WebSocket? # Check if WebSocket is an object in the window.
+  @supported  :-> (if module?.exports? then global else window).WebSocket? # Check if WebSocket is an object in the window.
 
   constructor: (args) ->
     super args
@@ -17,7 +17,7 @@ class Firehose.WebSocket extends Firehose.Transport
     # Run this is a try/catch block because IE10 inside of a .NET control
     # complains about security zones.
     try
-      @socket = new window.WebSocket "#{@_protocol()}:#{@config.uri}?#{$.param @config.params}"
+      @socket = new (if module?.exports? then global else window).WebSocket "#{@_protocol()}:#{@config.uri}?#{$.param @config.params}"
       @socket.onopen    = @_open
       @socket.onclose   = @_close
       @socket.onerror   = @_error

data/lib/firehose.rb

@@ -17,6 +17,3 @@ module Firehose
   # Default URI for the Firehose server. Consider the port "well-known" and bindable from other apps.
   URI = URI.parse("//0.0.0.0:7474").freeze
 end
-
-# Detect if Sprockets is loaded. If it is, lets configure Firehose to use it!
-Firehose::Assets::Sprockets.auto_detect

data/lib/firehose/assets.rb

@@ -36,7 +36,7 @@ module Firehose
         ::Sprockets::Manifest.new(environment, directory)
       end
 
-      # Try to automatically configure Sprockets if its detected in the project.
+      # Try to automatically configure Sprockets if it's detected in the project.
       def self.auto_detect
         if defined? ::Sprockets and ::Sprockets.respond_to? :append_path
           Firehose::Assets::Sprockets.configure ::Sprockets
@@ -51,3 +51,6 @@ module Firehose
     end
   end
 end
+
+# Detect if Sprockets is loaded. If it is, lets configure Firehose to use it!
+Firehose::Assets::Sprockets.auto_detect

data/lib/firehose/client/producer.rb

@@ -9,7 +9,7 @@ module Firehose
         # Exception gets raised when a 202 is _not_ received from the server after a message is published.
         PublishError = Class.new(RuntimeError)
         TimeoutError = Class.new(Faraday::Error::TimeoutError)
-        Timeout = 1 # How many seconds should we wait for a publish to take?
+        DEFAULT_TIMEOUT = 1 # How many seconds should we wait for a publish to take?
 
         # A DSL for publishing requests. This doesn't so much, but lets us call
         # Firehose::Client::Producer::Http#publish('message').to('channel'). Slick eh? If you don't like it,
@@ -26,11 +26,12 @@ module Firehose
         end
 
         # URI for the Firehose server. This URI does not include the path of the channel.
-        attr_reader :uri
+        attr_reader :uri, :timeout
 
-        def initialize(uri = Firehose::URI)
+        def initialize(uri = Firehose::URI, timeout=DEFAULT_TIMEOUT)
           @uri = ::URI.parse(uri.to_s)
           @uri.scheme ||= 'http'
+          @timeout = timeout
         end
 
         # A DSL for publishing messages.
@@ -41,7 +42,7 @@ module Firehose
         # Publish the message via HTTP.
         def put(message, channel, opts, &block)
           ttl = opts[:ttl]
-          timeout = opts[:timeout] || Timeout
+          timeout = opts[:timeout] || @timeout || DEFAULT_TIMEOUT
 
           response = conn.put do |req|
             req.options[:timeout] = timeout

data/lib/firehose/rack/consumer/web_socket.rb

@@ -32,7 +32,7 @@ module Firehose
           end
 
           # Subscribe the client to the channel on the server. Asks for
-          # the last sequence for clients that reconnect. 
+          # the last sequence for clients that reconnect.
           def subscribe(last_sequence)
             @subscribed = true
             @channel    = Server::Channel.new @req.path
@@ -62,7 +62,7 @@ module Firehose
             end
           end
 
-          # Log a message that the client has connected. 
+          # Log a message that the client has connected.
           def open(event)
             Firehose.logger.debug "WebSocket subscribed to `#{@req.path}`. Waiting for message_sequence..."
           end
@@ -80,10 +80,10 @@ module Firehose
           # Log errors if a socket fails. `close` will fire after this to clean up any
           # remaining connectons.
           def error(event)
-            Firehose.logger.error "WS connection `#{@req.path}` error. Message: `#{event.message.inspect}`; Data: `#{event.data.inspect}`"
+            Firehose.logger.error "WS connection `#{@req.path}` error. Message: `#{event.message.inspect}`"
           end
 
-          # Wrap a message in a sequence so that the client can record this and give us 
+          # Wrap a message in a sequence so that the client can record this and give us
           # the sequence when it reconnects.
           def self.wrap_frame(message, last_sequence)
             JSON.generate :message => message, :last_sequence => last_sequence
@@ -92,4 +92,4 @@ module Firehose
       end
     end
   end
-end
+end

data/lib/firehose/version.rb

@@ -1,4 +1,4 @@
 module Firehose
-  VERSION  = "1.2.13"
-  CODENAME = "Larger Sprocket"
+  VERSION  = "1.2.20"
+  CODENAME = "Onprogress of Doom"
 end

data/package.json

@@ -1,5 +1,5 @@
 {
   "name": "firehose",
-  "version": "1.2.12",
+  "version": "1.2.20",
   "main": "lib/assets/javascripts/firehose.js.coffee"
-}
+}

data/spec/lib/assets_spec.rb

@@ -21,14 +21,15 @@ describe Firehose::Assets do
 
   describe "Sprockets.javascript" do
     let(:js_spot_checks) do
-      %w[
-        Firehose.Transport
-        Firehose.version
-        window.Firehose
+      [
+        "Firehose.Transport",
+        "Firehose.version",
+        "global.Firehose || (global.Firehose = {})",
+        "window.Firehose || (window.Firehose = {})"
       ]
     end
     it "should compile javascript" do
       Firehose::Assets::Sprockets.javascript.should include(*js_spot_checks)
     end
   end
-end
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: firehose
 version: !ruby/object:Gem::Version
-  version: 1.2.13
-  prerelease: 
+  version: 1.2.20
 platform: ruby
 authors:
 - Brad Gessler
@@ -12,406 +11,356 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: em-hiredis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: em-http-request
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-coffeescript
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-copy
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rainbows
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.4.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.4.3
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: async_rack_test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: foreman
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: evergreen
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara-webkit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Firehose is a realtime web application toolkit for building realtime
@@ -426,11 +375,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .env.sample
-- .gitignore
-- .rbenv-version
-- .rspec
-- .travis.yml
+- ".env.sample"
+- ".gitignore"
+- ".rbenv-version"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -500,33 +449,26 @@ files:
 homepage: http://firehose.io/
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2325790275030245619
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2325790275030245619
 requirements: []
 rubyforge_project: firehose
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Build realtime Ruby web applications
 test_files:
 - spec/integrations/integration_test_helper.rb