firehose 1.1.0 → 1.1.1

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 1.8.7
+  - ree

data/README.md

@@ -7,6 +7,8 @@
     
     Build realtime web applications in Ruby and JS
 
+[![Build Status](https://travis-ci.org/polleverywhere/firehose.png)](https://travis-ci.org/polleverywhere/firehose)
+
 # What is Firehose?
 
 Firehose is both a Rack application and JavaScript library that makes building real-time web applications possible.

data/Rakefile

@@ -1,4 +1,10 @@
+require "rake/testtask"
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new
+task :default => [:spec]
+
+desc 'run Rspec specs'
+task :spec do
+  sh 'rspec spec'
+end

data/firehose.gemspec

@@ -19,12 +19,12 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-  s.add_runtime_dependency "eventmachine", ">= 1.0.0.rc"
-  s.add_runtime_dependency "em-hiredis"
+  s.add_runtime_dependency "eventmachine", ">= 1.0.0"
+  s.add_runtime_dependency "em-hiredis", ">= 0.2.0"
   s.add_runtime_dependency "thor"
   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 "em-http-request", ">= 1.0.0"
   s.add_runtime_dependency "json"
 
   s.add_development_dependency "rspec"
@@ -32,10 +32,11 @@ Gem::Specification.new do |s|
   s.add_development_dependency "guard-rspec"
   s.add_development_dependency "guard-bundler"
   s.add_development_dependency "guard-coffeescript"
-  s.add_development_dependency "rainbows"
+  s.add_development_dependency "rainbows", "~> 4.4.3"
   s.add_development_dependency "thin"
   s.add_development_dependency "rack-test"
   s.add_development_dependency "async_rack_test"
   s.add_development_dependency "foreman"
   s.add_development_dependency "sprockets"
-end
+  s.add_development_dependency "rake"
+end

data/lib/firehose/assets.rb

@@ -19,6 +19,16 @@ module Firehose
           Firehose::Assets::Sprockets.configure ::Sprockets
         end
       end
+
+      def self.manifest
+        paths = []
+
+        paths << Firehose::Assets.path('/flash/firehose/WebSocketMainInsecure.swf')
+
+        paths << File.basename(Firehose::Assets.path('/javascripts/firehose/firehose.js.coffee'), '.coffee')
+
+        paths
+      end
     end
   end
-end
+end

data/lib/firehose/producer.rb

@@ -44,7 +44,17 @@ module Firehose
 
       response = conn.put do |req|
         req.options[:timeout] = Timeout
-        req.path = channel
+        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
+        else
+          if conn.path_prefix =~ /\/\Z/ || channel =~ /\A\//
+            req.path = [conn.path_prefix, channel].compact.join
+          else
+            # Add a / so the prefix and channel aren't just rammed together.
+            req.path = [conn.path_prefix, channel].compact.join('/')
+          end
+        end
         req.body = message
         req.headers['Cache-Control'] = "max-age=#{ttl.to_i}" if ttl
       end
@@ -84,11 +94,11 @@ module Firehose
     end
 
   private
-    # Build out a Faraday connection 
+    # Build out a Faraday connection
     def conn
       @conn ||= Faraday.new(:url => uri.to_s) do |builder|
         builder.adapter self.class.adapter
       end
     end
   end
-end
+end

data/lib/firehose/subscriber.rb

@@ -1,10 +1,10 @@
 module Firehose
   # Setups a connetion to Redis to listen for new resources...
   class Subscriber
-    attr_reader :redis
+    attr_reader :pubsub
 
     def initialize(redis)
-      @redis = redis
+      @pubsub = redis.pubsub
 
       # TODO: Instead of just raising an exception, it would probably be better
       #       for the errback to set some sort of 'disconnected' state. Then
@@ -16,10 +16,10 @@ module Firehose
       #       with the same error.
       #       The final goal is to allow the failed deferrable bubble back up
       #       so we can send back a nice, clean 500 error to the client.
-      redis.subscribe('firehose:channel_updates').
+      pubsub.subscribe('firehose:channel_updates').
         errback{|e| EM.next_tick { raise e } }.
         callback { Firehose.logger.debug "Redis subscribed to `firehose:channel_updates`" }
-      redis.on(:message) do |_, payload|
+      pubsub.on(:message) do |_, payload|
         channel_key, sequence, message = Firehose::Publisher.from_payload(payload)
 
         if deferrables = subscriptions.delete(channel_key)

data/lib/firehose/version.rb

@@ -1,4 +1,4 @@
 module Firehose
-  VERSION  = "1.1.0"
-  CODENAME = "Rockin' Reconnect"
+  VERSION  = "1.1.1"
+  CODENAME = "Radtastical Redis"
 end

data/spec/integrations/integration_test_helper.rb

@@ -13,4 +13,10 @@ module IntegrationTestHelper
   def stop_server
     Process.kill 'INT', @server_pid
   end
+
+
+  # Let isn't allowed in before(:all)
+  def uri
+    Firehose::Default::URI
+  end
 end

data/spec/integrations/rainbows_spec.rb

@@ -2,6 +2,6 @@ require 'spec_helper'
 require 'integrations/shared_examples'
 
 describe "rainbows" do
-  let(:server) { :rainbows }
+  def server; :rainbows; end # Let isn't allowed in before(:all)
   it_behaves_like 'Firehose::Rack::App'
 end

data/spec/integrations/shared_examples.rb

@@ -22,7 +22,6 @@ shared_examples_for 'Firehose::Rack::App' do
   let(:app)       { Firehose::Rack::App.new }
   let(:messages)  { (1..2000).map{|n| "msg-#{n}" } }
   let(:channel)   { "/firehose/integration/#{Time.now.to_i}" }
-  let(:uri)       { Firehose::Default::URI }
   let(:http_url)  { "http://#{uri.host}:#{uri.port}#{channel}" }
   let(:ws_url)    { "ws://#{uri.host}:#{uri.port}#{channel}" }
 
@@ -68,8 +67,14 @@ shared_examples_for 'Firehose::Rack::App' do
     # And test a web socket client too, at the same time.
     websocket = Proc.new do |cid|
       ws = Faye::WebSocket::Client.new(ws_url)
+
+      ws.onopen = lambda do |event|
+        ws.send('{"message_sequence":0}')
+      end
+
       ws.onmessage = lambda do |event|
-        received[cid] << event.data
+        frame = JSON.parse(event.data, :symbolize_names => true)
+        received[cid] << frame[:message]
         succeed.call cid unless received[cid].size < messages.size
       end
 

data/spec/integrations/thin_spec.rb

@@ -2,6 +2,6 @@ require 'spec_helper'
 require 'integrations/shared_examples'
 
 describe "thin" do
-  let(:server) { :thin }
+  def server; :thin; end # Let isn't allowed in before(:all)
   it_behaves_like 'Firehose::Rack::App'
 end

data/spec/lib/producer_spec.rb

@@ -21,6 +21,18 @@ describe Firehose::Producer do
     WebMock.should have_requested(:put, url).with { |req| req.body == message }
   end
 
+  context 'prefix is specified in URI' do
+    let(:firehose_uri) {"#{Firehose::Default::URI}/prefix"}
+    let(:url) { "#{firehose_uri}#{channel}"}
+
+    it "should publish message to channel" do
+      publish_stub.to_return(:body => "", :status => 202)
+
+      Firehose::Producer.new(firehose_uri).publish(message).to(channel)
+      WebMock.should have_requested(:put, url).with { |req| req.body == message }
+    end
+  end
+
   it "should publish message to channel with expiry headers" do
     publish_stub.to_return(:body => "", :status => 202)
     ttl = 20
@@ -56,4 +68,4 @@ describe Firehose::Producer do
       }.should raise_exception(Firehose::Producer::TimeoutError)
     end
   end
-end
+end

data/spec/lib/publisher_spec.rb

@@ -18,7 +18,7 @@ describe Firehose::Publisher do
   describe "#publish" do
     it "should publish message change" do
       em do
-        hiredis = EM::Hiredis.connect
+        hiredis = EM::Hiredis.connect.pubsub
         hiredis.subscribe "firehose:channel_updates"
         hiredis.on(:message) {|_, msg|
           msg.should == "#{channel_key}\n1\n#{message}"

data/spec/lib/subscriber_spec.rb

@@ -5,7 +5,7 @@ describe Firehose::Subscriber do
 
   let(:channel_key)     { '/bears/are/mean' }
   let(:subscriber)      { Firehose::Subscriber.new(EM::Hiredis.connect) }
-  let(:dummy_subscriber){ Firehose::Subscriber.new(double('redis', :subscribe => EM::DefaultDeferrable.new, :on => nil)) }
+  let(:dummy_subscriber){ Firehose::Subscriber.new(double('redis', :pubsub => double('pubsub', :subscribe => EM::DefaultDeferrable.new, :on => nil))) }
   let(:message)         { 'Raaaarrrrrr!!!!' }
   let(:publisher)       { Firehose::Publisher.new }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: firehose
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-21 00:00:00.000000000 Z
+date: 2013-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -21,7 +21,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: em-hiredis
   requirement: !ruby/object:Gem::Requirement
@@ -37,7 +37,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -45,7 +45,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -99,7 +99,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
@@ -107,7 +107,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
@@ -211,17 +211,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.4.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.4.3
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
@@ -302,6 +302,22 @@ dependencies:
     - - ! '>='
       - !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'
 description: Firehose is a realtime web application toolkit for building realtime
   Ruby web applications.
 email:
@@ -318,6 +334,7 @@ files:
 - .gitignore
 - .rbenv-version
 - .rspec
+- .travis.yml
 - Gemfile
 - Guardfile
 - Procfile
@@ -327,6 +344,7 @@ files:
 - config/rainbows.rb
 - firehose.gemspec
 - lib/assets/flash/firehose/WebSocketMain.swf
+- lib/assets/flash/firehose/WebSocketMainInsecure.swf
 - lib/assets/javascripts/firehose.js.coffee
 - lib/assets/javascripts/firehose/base.js.coffee
 - lib/assets/javascripts/firehose/consumer.js.coffee