firehose 1.2.11 → 1.2.12

data/.gitignore

@@ -9,3 +9,4 @@ tmp
 *.sublime-project
 *.sublime-workspace
 public/javascripts
+Gemfile.lock

data/README.md

@@ -216,6 +216,7 @@ The recommended method of deploying firehose is to deploy it separately from you
 gem "firehose"
 gem "airbrake"
 gem "rainbows",   :require => false
+gem "rack", "~> 1.4.0" # if you're using Rainbows. See https://github.com/polleverywhere/firehose/commit/dfe55fff
 gem "foreman",    :require => false
 gem "capistrano", :require => false
 ```

data/firehose.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "faye-websocket"
   s.add_runtime_dependency "em-http-request", ">= 1.0.0"
   s.add_runtime_dependency "json"
-  s.add_runtime_dependency "rack", "~> 1.4.0"
+  s.add_runtime_dependency "rack"
 
   s.add_development_dependency "rspec"
   s.add_development_dependency "webmock"

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

@@ -6,7 +6,7 @@ class Firehose.LongPoll extends Firehose.Transport
   # 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...
   # $.browser.msie and parseInt($.browser.version) >= 8 # DEPRECATED
-  @ieSupported: -> (document.documentMode || 10) > 8
+  @ieSupported: -> (document.documentMode || 10) >= 8
 
   @supported: ->
     # IE 8+, FF 3.5+, Chrome 4+, Safari 4+, Opera 12+, iOS 3.2+, Android 2.1+

data/lib/firehose/client/producer.rb

@@ -41,9 +41,10 @@ module Firehose
         # Publish the message via HTTP.
         def put(message, channel, opts, &block)
           ttl = opts[:ttl]
+          timeout = opts[:timeout] || Timeout
 
           response = conn.put do |req|
-            req.options[:timeout] = Timeout
+            req.options[:timeout] = timeout
             if conn.path_prefix.nil? || conn.path_prefix == '/'
               # This avoids a double / if the channel starts with a / too (which is expected).
               req.path = channel

data/lib/firehose/version.rb

@@ -1,4 +1,4 @@
 module Firehose
-  VERSION  = "1.2.11"
-  CODENAME = "For the Pythonistas"
+  VERSION  = "1.2.12"
+  CODENAME = "Benchmarkin' Billy"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: firehose
 version: !ruby/object:Gem::Version
-  version: 1.2.11
+  version: 1.2.12
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-23 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -131,17 +131,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -432,7 +432,6 @@ files:
 - .rspec
 - .travis.yml
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - LICENSE.txt
 - Procfile

data/Gemfile.lock

@@ -1,196 +0,0 @@
-PATH
-  remote: .
-  specs:
-    firehose (1.2.11)
-      em-hiredis (>= 0.2.0)
-      em-http-request (>= 1.0.0)
-      eventmachine (>= 1.0.0)
-      faraday
-      faye-websocket
-      json
-      rack (~> 1.4.0)
-      thor
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    addressable (2.3.5)
-    async_rack_test (0.0.4)
-    capybara (1.1.4)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 0.1.4)
-    capybara-webkit (0.13.1)
-      capybara (>= 1.0.0, < 1.2)
-      json
-    childprocess (0.3.9)
-      ffi (~> 1.0, >= 1.0.11)
-    coderay (1.0.9)
-    coffee-script (2.2.0)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.6.3)
-    cookiejar (0.3.0)
-    crack (0.4.1)
-      safe_yaml (~> 0.9.0)
-    daemons (1.1.9)
-    diff-lcs (1.2.4)
-    dotenv (0.9.0)
-    em-hiredis (0.2.1)
-      hiredis (~> 0.4.0)
-    em-http-request (1.1.2)
-      addressable (>= 2.3.4)
-      cookiejar
-      em-socksify (>= 0.3)
-      eventmachine (>= 1.0.3)
-      http_parser.rb (>= 0.6.0)
-    em-socksify (0.3.0)
-      eventmachine (>= 1.0.0.beta.4)
-    eventmachine (1.0.3)
-    evergreen (1.0.1)
-      capybara (~> 1.0)
-      coffee-script
-      json_pure
-      launchy
-      sinatra (~> 1.1)
-    execjs (2.0.2)
-    faraday (0.9.0)
-      multipart-post (>= 1.2, < 3)
-    faye-websocket (0.7.2)
-      eventmachine (>= 0.12.0)
-      websocket-driver (>= 0.3.1)
-    ffi (1.9.0)
-    foreman (0.63.0)
-      dotenv (>= 0.7)
-      thor (>= 0.13.6)
-    formatador (0.2.4)
-    guard (1.8.3)
-      formatador (>= 0.2.4)
-      listen (~> 1.3)
-      lumberjack (>= 1.0.2)
-      pry (>= 0.9.10)
-      thor (>= 0.14.6)
-    guard-bundler (1.0.0)
-      bundler (~> 1.0)
-      guard (~> 1.1)
-    guard-coffeescript (1.3.4)
-      coffee-script (>= 2.2.0)
-      guard (>= 1.1.0)
-    guard-copy (0.0.8)
-      guard (~> 1.1)
-    guard-rspec (3.1.0)
-      guard (>= 1.8)
-      rspec (~> 2.13)
-    hike (1.2.3)
-    hiredis (0.4.5)
-    http_parser.rb (0.6.0)
-    json (1.8.1)
-    json_pure (1.8.1)
-    kgio (2.8.1)
-    launchy (2.4.2)
-      addressable (~> 2.3)
-    libv8 (3.16.14.3)
-    listen (1.3.1)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
-    lumberjack (1.0.4)
-    method_source (0.8.2)
-    mime-types (2.0)
-    mini_portile (0.5.2)
-    multi_json (1.8.2)
-    multipart-post (2.0.0)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    rack (1.4.5)
-    rack-protection (1.5.1)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rainbows (4.4.3)
-      kgio (~> 2.5)
-      rack (~> 1.1)
-      unicorn (~> 4.1)
-    raindrops (0.12.0)
-    rake (10.1.0)
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.2)
-      ffi (>= 0.5.0)
-    rb-kqueue (0.2.0)
-      ffi (>= 0.5.0)
-    ref (1.0.5)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.6)
-    rspec-expectations (2.14.3)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
-    rubyzip (1.1.0)
-    safe_yaml (0.9.7)
-    selenium-webdriver (2.38.0)
-      childprocess (>= 0.2.5)
-      multi_json (~> 1.0)
-      rubyzip (~> 1.0)
-      websocket (~> 1.0.4)
-    sinatra (1.4.4)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    slop (3.4.6)
-    sprockets (2.10.0)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    therubyracer (0.12.0)
-      libv8 (~> 3.16.14.0)
-      ref
-    thin (1.6.1)
-      daemons (>= 1.0.9)
-      eventmachine (>= 1.0.0)
-      rack (>= 1.0.0)
-    thor (0.18.1)
-    tilt (1.4.1)
-    unicorn (4.6.3)
-      kgio (~> 2.6)
-      rack
-      raindrops (~> 0.7)
-    webmock (1.15.0)
-      addressable (>= 2.2.7)
-      crack (>= 0.3.2)
-    websocket (1.0.7)
-    websocket-driver (0.3.2)
-    xpath (0.1.4)
-      nokogiri (~> 1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  async_rack_test
-  capybara-webkit
-  coffee-script
-  evergreen
-  firehose!
-  foreman
-  guard-bundler
-  guard-coffeescript
-  guard-copy
-  guard-rspec
-  rack-test
-  rainbows (~> 4.4.3)
-  rake
-  rspec
-  sprockets
-  therubyracer
-  thin
-  webmock