firehose 1.2.10 → 1.2.11

data/.gitignore

@@ -8,3 +8,4 @@ pkg/*
 tmp
 *.sublime-project
 *.sublime-workspace
+public/javascripts

data/.rbenv-version

@@ -1 +1 @@
-1.9.3-p392
+1.9.3-p484

data/.travis.yml

@@ -1,5 +1,16 @@
 language: ruby
+
 rvm:
   - 1.9.3
-  - 1.8.7
-  - ree
+  - 2.0.0
+  - 2.1.0
+
+services:
+  - redis-server
+
+before_script:
+  - bundle exec rake travis:prepare
+
+script:
+  - bundle exec rake spec
+  - xvfb-run bundle exec rake evergreen:run

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    firehose (1.2.9)
+    firehose (1.2.11)
       em-hiredis (>= 0.2.0)
       em-http-request (>= 1.0.0)
       eventmachine (>= 1.0.0)
@@ -16,6 +16,18 @@ GEM
   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
@@ -29,21 +41,27 @@ GEM
     dotenv (0.9.0)
     em-hiredis (0.2.1)
       hiredis (~> 0.4.0)
-    em-http-request (1.1.1)
+    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.beta.2)
+      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.8.8)
-      multipart-post (~> 1.2.0)
-    faye-websocket (0.7.0)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    faye-websocket (0.7.2)
       eventmachine (>= 0.12.0)
-      websocket-driver (>= 0.3.0)
+      websocket-driver (>= 0.3.1)
     ffi (1.9.0)
     foreman (0.63.0)
       dotenv (>= 0.7)
@@ -61,27 +79,39 @@ GEM
     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.beta.2)
+    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 (1.2.0)
+    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)
@@ -95,6 +125,7 @@ GEM
       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)
@@ -103,13 +134,26 @@ GEM
     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)
@@ -123,22 +167,30 @@ GEM
     webmock (1.15.0)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
-    websocket-driver (0.3.0)
+    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

data/Guardfile

@@ -1,6 +1,31 @@
+guard 'bundler' do
+  watch 'Gemfile'
+  watch /^.+\.gemspec/
+end
+
+
+guard 'coffeescript',
+  input: 'lib/assets/javascripts',
+  output: 'public/javascripts',
+  all_on_start: true
+
+
 guard 'rspec', :version => 2 do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
 end
 
+
+guard :copy,
+  from:         'lib/assets/javascripts/vendor',
+  to:           'public/javascripts/vendor',
+  mkpath:       true,
+  run_at_start: true
+
+
+guard :copy,
+  from:         'spec/javascripts/support',
+  to:           'public/javascripts/vendor',
+  mkpath:       true,
+  run_at_start: true

data/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2011-2013 Brad Gessler 
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/Procfile.dev

@@ -0,0 +1,4 @@
+firehose: ./bin/firehose server -p $PORT
+redis: redis-server
+evergreen: rake evergreen:serve
+# guard: guard

data/README.md

@@ -177,6 +177,16 @@ Firehose::Assets::Sprockets.configure my_sprockets_env
 
 It is important that your firehose config file comes first.
 
+### Not using sprockets?
+
+If you don't intend to use the Firehose JavaScript client in a Ruby stack where Sprockets is available, you can grab the unminified source by running:
+
+```sh
+$ firehose javascript > firehose.js
+```
+
+Copy the firehose.js where needed in your project.
+
 # Web Server
 
 Firehose currently supports Thin and Rainbows! (which is the default). Neither is listed as a dependency in the gemspec so that you don't need to install whichever one you aren't using. You can set which server to use via the `.env` file (recommended) or with the `-s` option to `bin/firehose`.
@@ -214,4 +224,4 @@ Of course, you could use `exceptional` instead of `airbrake` and `thin` instead
 
 2. Set up `config/deploy.rb` to your liking. You can follow most directions for using Capistrano and Foreman to deploy Rack apps, such as https://gist.github.com/1027117
 
-3. Set up `config/rainbows.rb` (if you are using Rainbows!). The gem includes an example to get you started.
+3. Set up `config/rainbows.rb` (if you are using Rainbows!). The gem includes example configurations scripts to get you started. There's also an example at https://gist.github.com/bradgessler/f2416efdbb1771e983b3.

data/Rakefile

@@ -1,10 +1,53 @@
 require "rake/testtask"
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'coffee-script'
+
+
+task :default => [:spec, 'evergreen:run']
 
-task :default => [:spec]
 
 desc 'run Rspec specs'
 task :spec do
   sh 'rspec spec'
-end
+end
+
+
+namespace :evergreen do
+  desc 'run Evergreen specs'
+  task :run do
+    sh 'evergreen run'
+  end
+
+  desc 'start an Evergreen server'
+  task :serve do
+    sh 'evergreen serve'
+  end
+end
+
+
+namespace :travis do
+  desc 'Prepares evergreen and JS files for Travis CI'
+  task :prepare do
+    # Prepare directories
+    sh "mkdir -p public/javascripts/vendor"
+    sh "mkdir -p public/javascripts/firehose"
+
+    # Precompile coffeescript
+    Dir.glob 'lib/assets/javascripts/**/*.js.coffee' do |coffee_file|
+      dest = coffee_file.gsub( 'lib/assets/', 'public/' ).gsub '.js.coffee', '.js'
+
+      File.open dest, 'w' do |file|
+        file.write ::CoffeeScript.compile File.read coffee_file
+      end
+    end
+
+    # Copy JS vendor files into public
+    Dir.glob [
+      'spec/javascripts/support/*.js',
+      'lib/assets/javascripts/vendor/*.js'
+    ] do |js_file|
+      sh "cp #{js_file} public/javascripts/vendor"
+    end
+  end
+end

data/config/evergreen.rb

@@ -0,0 +1,9 @@
+require 'capybara-webkit'
+
+
+Evergreen.configure do |config|
+  config.driver       = :webkit
+  config.public_dir   = 'public'
+  # config.template_dir = 'spec/javascripts/templates'
+  config.spec_dir     = 'spec/javascripts'
+end

data/firehose.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
   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.}
+  s.license     = "MIT"
 
   s.rubyforge_project = "firehose"
 
@@ -30,9 +31,11 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rspec"
   s.add_development_dependency "webmock"
+  s.add_development_dependency "coffee-script"
   s.add_development_dependency "guard-rspec"
   s.add_development_dependency "guard-bundler"
   s.add_development_dependency "guard-coffeescript"
+  s.add_development_dependency "guard-copy"
   s.add_development_dependency "rainbows", "~> 4.4.3"
   s.add_development_dependency "thin"
   s.add_development_dependency "rack-test"
@@ -40,4 +43,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "foreman"
   s.add_development_dependency "sprockets"
   s.add_development_dependency "rake"
+  s.add_development_dependency "evergreen"
+  s.add_development_dependency "capybara-webkit"
+  s.add_development_dependency "therubyracer"
 end

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

@@ -1,7 +1,7 @@
-#= require firehose/json2
 #= require firehose/base
 #= require firehose/version
 #= require firehose/transport
 #= require firehose/long_poll
 #= require firehose/web_socket
 #= require firehose/consumer
+#= require vendor/json2

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

@@ -1 +1 @@
-window.Firehose = {}
+window.Firehose = {}

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

@@ -5,8 +5,8 @@ class Firehose.LongPoll extends Firehose.Transport
   # 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) >= 8
+  # $.browser.msie and parseInt($.browser.version) >= 8 # DEPRECATED
+  @ieSupported: -> (document.documentMode || 10) > 8
 
   @supported: ->
     # IE 8+, FF 3.5+, Chrome 4+, Safari 4+, Opera 12+, iOS 3.2+, Android 2.1+
@@ -27,7 +27,7 @@ class Firehose.LongPoll extends Firehose.Transport
     # We use the lag time to make the client live longer than the server.
     @_lagTime         = 5000
     @_timeout         = @config.longPoll.timeout + @_lagTime
-    @_okInterval      = 0
+    @_okInterval      = @config.okInterval || 0
     @_stopRequestLoop = false
 
   # Protocol schema we should use for talking to firehose server.

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

@@ -8,6 +8,7 @@ class Firehose.Transport
   constructor: (config={}) ->
     @config      = config
     @_retryDelay = 3000
+    @
 
   # Lets rock'n'roll! Connect to the server.
   connect: (delay = 0) =>

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

@@ -4,9 +4,8 @@ KEEPALIVE_PING_TIMEOUT = 20000
 class Firehose.WebSocket extends Firehose.Transport
   name: -> 'WebSocket'
 
-  # Check if WebSocket is an object in the window.
-  @supported: ->
-    window.WebSocket?
+  @ieSupported:-> (document.documentMode || 10) > 9
+  @supported  :-> window.WebSocket? # Check if WebSocket is an object in the window.
 
   constructor: (args) ->
     super args

data/lib/firehose/assets.rb

@@ -1,3 +1,5 @@
+require 'sprockets'
+
 module Firehose
   # Deal with bundling Sprocket assets into environments (like Rails or Sprockets)
   module Assets
@@ -7,12 +9,33 @@ module Firehose
 
     # Integrate Firehose ./lib/assets files into a sprocket-enabled environment.
     module Sprockets
+      # Entry-point Javascript for Sprockets project.
+      JAVASCRIPT = "firehose.js"
+
       # Drop flash and javascript paths to Firehose assets into a sprockets environment.
       def self.configure(env)
         env.append_path Firehose::Assets.path('javascripts')
         env
       end
 
+      # The "main" javascript that folks should compile and use in their
+      # web applications.
+      def self.javascript
+        Firehose::Assets::Sprockets.environment[JAVASCRIPT].source
+      end
+
+      # Return a new sprockets environment configured with Firehose.
+      def self.environment
+        configure ::Sprockets::Environment.new
+      end
+
+      # Quick and dirty way for folks to compile the Firehose assets to a path
+      # from the CLI and use. These are usualy non-ruby (or non-sprockets) folks
+      # who want to run the firehose process and use the JS in a web app.
+      def self.manifest(directory)
+        ::Sprockets::Manifest.new(environment, directory)
+      end
+
       # Try to automatically configure Sprockets if its detected in the project.
       def self.auto_detect
         if defined? ::Sprockets and ::Sprockets.respond_to? :append_path
@@ -20,7 +43,7 @@ module Firehose
         end
       end
 
-      def self.manifest
+      def self.manifest_paths
         paths = []
         paths << File.basename(Firehose::Assets.path('/javascripts/firehose/firehose.js.coffee'), '.coffee')
         paths