firehose 0.0.15 → 0.0.16

data/lib/firehose.rb

@@ -4,10 +4,12 @@ require 'amqp'
 require 'logger'
 
 module Firehose
-  autoload :Default,      'firehose/default'
   autoload :Subscription, 'firehose/subscription'
-  autoload :Producer,     'firehose/producer'
   autoload :Publisher,    'firehose/publisher'
+  autoload :Producer,     'firehose/producer'
+  autoload :Consumer,     'firehose/consumer'
+  autoload :Default,      'firehose/default'
+  autoload :Broker,       'firehose/broker'
   autoload :Rack,         'firehose/rack'
   autoload :CLI,          'firehose/cli'
 

data/lib/firehose/broker.rb

@@ -0,0 +1,34 @@
+module Firehose
+  # TODO add support to broker for publishing, then abstract this out into a backend. A
+  # broker will eventually be passed into a web server front-end to serve up the web requests.
+  class Broker
+    def consumers
+      @consumers ||= Hash.new do |consumers, consumer_id|
+        consumer = Firehose::Consumer.new(consumer_id)
+        consumer.on_unsubscribe do
+          consumers.delete consumer_id
+        end
+        consumers[consumer_id] = consumer
+      end
+    end
+
+    # Don't like the [] syntax to get at consumers? No worries mate!
+    def consumer(consumer_id)
+      consumers[consumer_id]
+    end
+
+    # Gracefully unsubscribe all of the consumers and get rid of them from the consumers 
+    # collection.
+    def stop
+      consumers.values.each(&:unsubscribe)
+    end
+
+    # Returns a hash of the connected consumers with the number of their subscriptions
+    def stats
+      consumers.inject({}) do |memo, (consumer_id, consumer)|
+        memo[consumer_id] = { 'subscriptions' => consumer.subscriptions.keys }
+        memo
+      end
+    end
+  end
+end

data/lib/firehose/cli.rb

@@ -6,9 +6,23 @@ module Firehose
     desc "server", "starts the firehose server"
     method_option :port, :type => :numeric, :default => Firehose::Default::URI.port, :required => true, :aliases => '-p'
     method_option :host, :type => :string, :default => '0.0.0.0', :required => true, :aliases => '-h'
+
     def server
+      broker = Firehose::Broker.new
+
       server = Thin::Server.new(options[:host], options[:port]) do
-        run Firehose::Rack::App.new
+        # TODO move this into a socket... this is really janky, but I need to to troubleshoot
+        # connection reference issues. I'd like to have this ancillary stuff accessiable via
+        # a different port or even a socket.
+        map '/_firehose/stats' do
+          run Proc.new {
+            [200, {'Content-Type' => 'text/plain'}, [broker.stats.inspect]]
+          }
+        end
+
+        map '/' do
+          run Firehose::Rack::App.new(broker)
+        end
       end
 
       begin

data/lib/firehose/consumer.rb

@@ -0,0 +1,49 @@
+module Firehose
+  class Consumer
+    # Unique identifier for a consumer. Note that a consumer does not map directly to
+    # a user_id. In a web browser world, you might have a user with multiple tabs open,
+    # so you'll went to send each users tab a seperate message stream. Consider a convention
+    # such as :user_id-:guid for your application.
+    attr_reader :guid
+
+    def initialize(guid = self.class.next_guid)
+      @guid = guid
+    end
+
+    # Create a subscription and subscribe to a channel.
+    def subscribe_to(channel, &block)
+      subscriptions[channel].subscribe(&block)
+    end
+
+    # Active subscriptions to the backend.
+    def subscriptions
+      @subscriptions ||= Hash.new do |subscriptions, channel|
+        # Setup the hash to generate subscriptions that can delete themselves from
+        # their own collection on an unsubscription event.
+        subscription = Subscription.new(self, channel)
+        subscription.on_unsubscribe do
+          # Remove the subscription from the consumer.subscriptions 
+          # list when unsubscribe.
+          subscriptions.delete channel
+        end
+        subscriptions[channel] = subscription
+      end
+    end
+
+    # Unsubscribe from all subscriptions.
+    def unsubscribe
+      subscriptions.values.each(&:unsubscribe)
+      @on_unsubscribe.call(self) if @on_unsubscribe
+    end
+
+    # Define callback for when unsubscribe is called from the consumer.
+    def on_unsubscribe(&block)
+      @on_unsubscribe = block
+    end
+
+  protected
+    def self.next_guid
+      rand(999_999_999_999).to_s
+    end
+  end
+end

data/lib/firehose/rack.rb

@@ -5,12 +5,17 @@ module Firehose
     AsyncResponse = [-1, {}, []]
 
     class HttpLongPoll
+      def initialize(broker)
+        @broker = broker
+      end
+
       def call(env)
         req     = ::Rack::Request.new(env)
         cid     = req.params['cid']
         path    = req.path
         method  = req.request_method
         timeout = 30
+        # TODO seperate out CORS logic as an async middleware with a Goliath web server.
         cors_origin = env['HTTP_ORIGIN']
         cors_headers  = {
           'Access-Control-Allow-Origin'     => cors_origin,
@@ -28,7 +33,7 @@ module Firehose
             response_headers = cors_origin ? cors_headers : {}
 
             # Setup a subscription with a client id. We haven't subscribed yet here.
-            subscription = Firehose::Subscription.new(cid)
+            consumer = @broker.consumer(cid)
 
             # Setup a timeout timer to tell clients that time out that everything is OK
             # and they should come back for more
@@ -39,10 +44,9 @@ module Firehose
             end
 
             # Ok, now subscribe to the subscription.
-            subscription.subscribe path do |message|
+            consumer.subscribe_to path do |message, subscription|
               timer.cancel # Turn off the heart beat so we don't execute any of that business.
-              subscription.unsubscribe
-              subscription = nil # Set this to nil so that our heart beat timer doesn't try to double unsub.
+              consumer.unsubscribe
               env['async.callback'].call [200, response_headers, [message]]
               Firehose.logger.debug "HTTP sent `#{message}` to `#{cid}@#{path}`"
             end
@@ -51,7 +55,7 @@ module Firehose
             # Unsubscribe from the subscription if its still open and something bad happened
             # or the heart beat triggered before we could finish.
             env['async.close'].callback do
-              subscription.unsubscribe if subscription
+              consumer.unsubscribe if consumer
               Firehose.logger.debug "HTTP connection `#{cid}@#{path}` closing"
             end
           end
@@ -76,14 +80,18 @@ module Firehose
     class WebSocket < ::Rack::WebSocket::Application
       attr_reader :cid, :path
       
+      def initialize(broker)
+        @broker = broker
+      end
+
       # Subscribe to a path and make some magic happen, mmkmay?
       def on_open(env)
         req   = ::Rack::Request.new(env)
         @cid   = req.params['cid']
         @path  = req.path
 
-        @subscription = Firehose::Subscription.new(cid)
-        @subscription.subscribe path do |message|
+        @consumer = @broker.consumer(@cid)
+        @consumer.subscribe_to path do |message|
           Firehose.logger.debug "WS sent `#{message}` to `#{cid}@#{path}`"
           send_data message
         end
@@ -92,29 +100,37 @@ module Firehose
 
       # Delete the subscription if the thing even happened.
       def on_close(env)
-        @subscription.unsubscribe if @subscription
+        @consumer.unsubscribe if @consumer
         Firehose.logger.debug "WS connection `#{cid}@#{path}` closing"
       end
 
       # Log websocket level errors
       def on_error(env, error)
         Firehose.logger.error "WS connection `#{cid}@#{path}` error `#{error}`: #{env.inspect}"
-        @subscription.unsubscribe if @subscription
+        @consumer.unsubscribe if @consumer
       end
     end
 
     class App
+      # Firehose broker that will be used to pub/sub messages.
+      attr_reader :broker
+
+      # Fire up a default broker if one is not specified.
+      def initialize(broker = Firehose::Broker.new)
+        @broker = broker
+      end
+
       def call(env)
         websocket_request?(env) ? websocket.call(env) : http_long_poll.call(env)
       end
 
     private
       def websocket
-        @websocket ||= WebSocket.new
+        @websocket ||= WebSocket.new(broker)
       end
 
       def http_long_poll
-        @http_long_poll ||= HttpLongPoll.new
+        @http_long_poll ||= HttpLongPoll.new(broker)
       end
 
       def websocket_request?(env)

data/lib/firehose/subscription.rb

@@ -1,56 +1,65 @@
 module Firehose
   class Subscription
+    # Default TTL for how long a subscription should live on the server when the
+    # consumer disconnects.
+    # TODO should the Consumer handle TTL?
     TTL = 15000
 
-    # Time to live for the queue on the server after the subscription is canceled. This
+    # Time to live for the amqp_queue on the server after the subscription is canceled. This
     # is mostly for flakey connections where the client may reconnect after *ttl* and continue
     # receiving messages.
     attr_accessor :ttl
 
-    # Globally unique subscription id
-    attr_reader :subscriber_id
+    # Consumer and channel for the subscription.
+    attr_reader :consumer
 
-    def initialize(subscriber_id=nil)
-      @subscriber_id = subscriber_id || self.class.subscriber_id
+    # Channel that we'll use for the pub-sub activity. This probably maps to an URL
+    attr_reader :channel
+
+    def initialize(consumer, channel)
+      @consumer, @channel = consumer, channel
     end
 
-    # TODO - Move the path to an initializer so that we can force on AMQP subscription per one
-    # Firehose subscription. As it stands now, you could fire off multple subscriptions to diff channels
-    def subscribe(path, &block)
-      queue_name  = "#{subscriber_id}@#{path}"
-      channel     = AMQP::Channel.new(Firehose.amqp.connection).prefetch(1)
-      exchange    = AMQP::Exchange.new(channel, :fanout, path, :auto_delete => true)
-      queue       = AMQP::Queue.new(channel, queue_name, :arguments => {'x-expires' => ttl})
-      queue.bind(exchange)
-
-      # When we get a message, we want to remove the consumer from the queue so that the x-expires
-      # ttl starts ticking down. On the reconnect, the consumer connects to the queue and resets the
+    # TODO - Move the channel to an initializer so that we can force on AMQP subscription per one
+    # Firehose subscription. As it stands now, you could fire off multple subscriptions to diff amqp_channels
+    def subscribe(&block)
+      amqp_queue_name = "#{consumer.guid}@#{channel}"
+      amqp_channel    = AMQP::Channel.new(Firehose.amqp.connection).prefetch(1)
+      amqp_exchange   = AMQP::Exchange.new(amqp_channel, :fanout, channel, :auto_delete => true)
+      amqp_queue      = AMQP::Queue.new(amqp_channel, amqp_queue_name, :arguments => {'x-expires' => ttl})
+      amqp_queue.bind(amqp_exchange)
+
+      # When we get a message, we want to remove the consumer from the amqp_queue so that the x-expires
+      # ttl starts ticking down. On the reconnect, the consumer connects to the amqp_queue and resets the
       # timer on x-expires... in theory at least.
-      @consumer = AMQP::Consumer.new(channel, queue, subscriber_id)
-      @consumer.on_delivery do |metadata, message|
-        Firehose.logger.debug "AMQP delivering `#{message}` to `#{subscriber_id}@#{path}`"
-        block.call(message)
+      @amqp_consumer = AMQP::Consumer.new(amqp_channel, amqp_queue, consumer.guid)
+      @amqp_consumer.on_delivery do |metadata, message|
+        Firehose.logger.debug "AMQP delivering `#{message}` to `#{consumer.guid}@#{channel}`"
+        block.call(message, self)
         # The ack needs to go after the block is called. This makes sure that all processing
-        # happens downstream before we remove it from the queue entirely.
+        # happens downstream before we remove it from the amqp_queue entirely.
         metadata.ack
       end.consume
-      Firehose.logger.debug "AMQP subscribed to `#{subscriber_id}@#{path}`"
+      Firehose.logger.debug "AMQP subscribed to `#{consumer.guid}@#{channel}`"
+      self # Return the subscription for chaining.
     end
 
     def unsubscribe
       Firehose.logger.debug "AMQP unsubscribed"
-      @consumer.cancel if @consumer
+      @amqp_consumer.cancel if @amqp_consumer
+      @unsubscribe_callback.call self if @unsubscribe_callback
+    end
+
+    # Callback when consumer unsubscribes from subscription. The consumer uses this to remove 
+    # subscriptions from itself when an unsubscribe happens.
+    def on_unsubscribe(&block)
+      @unsubscribe_callback = block
     end
 
-    # The time that a queue should live *after* the client unsubscribes. This is useful for
+    # The time that a amqp_queue should live *after* the client unsubscribes. This is useful for
     # flakey network connections, like HTTP Long Polling or even broken web sockets.
     def ttl
       @ttl ||= TTL
     end
-
-  protected
-    def self.subscriber_id
-      rand(999_999_999_999).to_s
-    end
   end
 end

data/lib/firehose/version.rb

@@ -1,4 +1,4 @@
 module Firehose
-  VERSION = "0.0.15"
-  CODENAME = "Error Reportin' Roberto"
+  VERSION = "0.0.16"
+  CODENAME = "Statistical Sam"
 end

data/spec/integrations/amqp_resources_spec.rb

@@ -2,7 +2,8 @@ require 'spec_helper'
 
 describe "Firehose amqp resources" do
 
-  let(:channel) { "/resource-test-#{Time.now.to_i}" }
+  let(:channel)   { "/resource-test-#{Time.now.to_i}" }
+  let(:consumer)  { Firehose::Consumer.new }
 
   it "should clean up exchanges and queues" do
     sent, received = 'howdy!', nil
@@ -17,10 +18,10 @@ describe "Firehose amqp resources" do
       # Kill test if it runs longer than 5s
       EM.add_timer(5) { EM.stop }
 
-      subscription = Firehose::Subscription.new
+      subscription = Firehose::Subscription.new(consumer, channel)
       subscription.ttl = 1
 
-      subscription.subscribe channel do |payload|
+      subscription.subscribe do |payload|
         received = payload
         subscription.unsubscribe
 

data/spec/integrations/thin_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe Firehose::Rack do
+  include EM::TestHelper
+
   before(:all) do
     Firehose::Producer.adapter = :em_http
   end
@@ -25,7 +27,7 @@ describe Firehose::Rack do
     # Our WS and Http clients call this when they have received their messages to determine
     # when to turn off EM and make the test assertion at the very bottom.
     succeed = Proc.new do
-      EM.stop if received_http.size == messages.size and received_ws.size == messages.size
+      em.stop if received_http.size == messages.size and received_ws.size == messages.size
     end
 
     # Setup a publisher
@@ -38,7 +40,7 @@ describe Firehose::Rack do
     # Lets have an HTTP Long poll client
     http_long_poll = Proc.new do
       http = EM::HttpRequest.new(http_url).get(:query => {'cid' => cid})
-      http.errback { EM.stop }
+      http.errback { em.stop }
       http.callback do
         received_http << http.response
         if received_http.size < messages.size
@@ -52,7 +54,7 @@ describe Firehose::Rack do
     # And test a web socket client too, at the same time.
     websocket = Proc.new do
       ws = EventMachine::WebSocketClient.connect(ws_url)
-      ws.errback  { EM.stop }
+      ws.errback  { em.stop }
       ws.stream do |msg|
         received_ws << msg
         succeed.call unless received_ws.size < messages.size
@@ -60,10 +62,7 @@ describe Firehose::Rack do
     end
 
     # Great, we have all the pieces in order, lets run this thing in the reactor.
-    EM.run do
-      # Stop the server no matter what happens.
-      EM.add_timer(30) { EM.stop }
-
+    em do
       # Start the server
       ::Thin::Server.new('0.0.0.0', uri.port, app).start
 
@@ -72,11 +71,11 @@ describe Firehose::Rack do
       websocket.call
 
       # Wait a sec to let our http_long_poll setup.
-      EM.add_timer(1){ publish.call }
+      em.add_timer(1){ publish.call }
     end
 
     # When EM stops, these assertions will be made.
     received_http.should  =~ messages
-    # received_ws.should    =~ messages
+    received_ws.should    =~ messages
   end
 end

data/spec/lib/broker_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe Firehose::Broker do
+  include EM::TestHelper
+
+  let(:broker)  { Firehose::Broker.new }
+
+  it "should unsubscibe consumers and remove them from the collection" do
+    stats = nil
+
+    em do
+      broker.consumer('1').subscribe_to('/the-channel')
+      broker.consumer('2').subscribe_to('/the-channel')
+      broker.consumer('2').subscribe_to('/a-channel')
+
+      em.add_timer(1) do
+        stats = broker.stats
+        broker.stop
+        em.stop
+      end
+    end
+
+    stats.should == {
+      '1' => {'subscriptions' => ['/the-channel'] },
+      '2' => {'subscriptions' => ['/the-channel', '/a-channel']}
+    }
+
+    broker.stats.should == {}
+  end
+end

data/spec/lib/consumer_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+
+describe Firehose::Consumer do
+  include EM::TestHelper
+
+  let(:consumer)  { Firehose::Consumer.new }
+  let(:publisher) { Firehose::Publisher.new }
+  let(:channel)   { '/papa-smurf' }
+  let(:another_channel)  { '/mama-smurf' }
+
+  describe "subscriptions" do
+    it "should subscribe to channel" do
+      sent, recieved = 'hi', nil
+
+      em do
+        consumer.subscribe_to channel do |msg|
+          recieved = msg
+          em.stop
+        end
+        em.add_timer(1) do
+          publisher.publish(channel, sent)
+        end
+      end
+
+      recieved.should == sent
+    end
+
+    it "should track subscriptions" do
+      lambda{
+        em do
+          consumer.subscribe_to channel
+          consumer.subscribe_to another_channel
+          em.add_timer(1){ em.stop }
+        end
+      }.should change{ consumer.subscriptions.size }.by(2)
+    end
+
+    it "should only allow one subscription per channel" do
+      lambda{
+        em do
+          3.times { consumer.subscribe_to channel }
+          em.add_timer(1){ em.stop }
+        end
+      }.should change{ consumer.subscriptions.size }.by(1)
+    end
+
+    it "should unsubscribe from all channels" do
+      subscribed_count, after_unsubscribe_count = 0, nil
+
+      em do
+        consumer.subscribe_to channel
+        consumer.subscribe_to another_channel
+        subscribed_count = consumer.subscriptions.size
+        em.add_timer(1) do 
+          consumer.unsubscribe
+          em.add_timer(1) do 
+            em.stop
+          end
+        end
+      end
+
+      subscribed_count.should == 2
+      consumer.subscriptions.size.should == 0
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -3,18 +3,36 @@ require 'em-http'
 require 'em-websocket-client'
 
 require 'firehose'
-Firehose.logger = Logger.new('/dev/null')
+Firehose.logger = Logger.new('/dev/null') unless ENV['VERBOSE']
 
 # Lets skip the verbosity of the thin for the test output.
 require 'thin'
-Thin::Logging.silent = true
+Thin::Logging.silent = true unless ENV['VERBOSE']
 
 # We use both EM::Http and Net::Http in this test lib. When EM:Http is fired up
 # we're usually hitting thins for integrations, and when Net::Http we want to mock that up.
 require 'webmock/rspec'
 WebMock.allow_net_connect!
 
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+module EM::TestHelper
+  # Run test inside of reactor.
+  def em(ttl=30, &block)
+    if block
+      # Run the block inside of a reactor
+      EM.run do
+        EM.add_timer(ttl) do
+          EM.stop
+          raise "Test timed-out"
+        end
+        block.call(EM)
+      end
+    else # or just grab em and go nuts.
+      EM
+    end
+  end
+end
+
+# Configure RSpec runner. See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: firehose
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-03 00:00:00.000000000 Z
+date: 2012-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70353146415780 !ruby/object:Gem::Requirement
+  requirement: &70349732213400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 1.0.0.beta
   type: :runtime
   prerelease: false
-  version_requirements: *70353146415780
+  version_requirements: *70349732213400
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &70353146414160 !ruby/object:Gem::Requirement
+  requirement: &70349732212540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 0.9.4
   type: :runtime
   prerelease: false
-  version_requirements: *70353146414160
+  version_requirements: *70349732212540
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70353146412800 !ruby/object:Gem::Requirement
+  requirement: &70349732211460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70353146412800
+  version_requirements: *70349732211460
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70353146411120 !ruby/object:Gem::Requirement
+  requirement: &70349732210400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70353146411120
+  version_requirements: *70349732210400
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70353146454620 !ruby/object:Gem::Requirement
+  requirement: &70349732209120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70353146454620
+  version_requirements: *70349732209120
 - !ruby/object:Gem::Dependency
   name: websocket-rack
-  requirement: &70353146454100 !ruby/object:Gem::Requirement
+  requirement: &70349732223780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70353146454100
+  version_requirements: *70349732223780
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70353146453540 !ruby/object:Gem::Requirement
+  requirement: &70349732222860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70353146453540
+  version_requirements: *70349732222860
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70353146453060 !ruby/object:Gem::Requirement
+  requirement: &70349732221260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70353146453060
+  version_requirements: *70349732221260
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70353146452280 !ruby/object:Gem::Requirement
+  requirement: &70349732220520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70353146452280
+  version_requirements: *70349732220520
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70353146451380 !ruby/object:Gem::Requirement
+  requirement: &70349732219740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70353146451380
+  version_requirements: *70349732219740
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &70353146448880 !ruby/object:Gem::Requirement
+  requirement: &70349732219100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70353146448880
+  version_requirements: *70349732219100
 - !ruby/object:Gem::Dependency
   name: guard-coffeescript
-  requirement: &70353146448120 !ruby/object:Gem::Requirement
+  requirement: &70349732218080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70353146448120
+  version_requirements: *70349732218080
 - !ruby/object:Gem::Dependency
   name: em-websocket-client
-  requirement: &70353146447120 !ruby/object:Gem::Requirement
+  requirement: &70349732217260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,7 +154,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70353146447120
+  version_requirements: *70349732217260
 description: Firehose is a realtime web application toolkit for building realtime
   Ruby web applications.
 email:
@@ -184,7 +184,9 @@ files:
 - lib/assets/javascripts/firehose/transport.js.coffee
 - lib/assets/javascripts/firehose/web_socket.js.coffee
 - lib/firehose.rb
+- lib/firehose/broker.rb
 - lib/firehose/cli.rb
+- lib/firehose/consumer.rb
 - lib/firehose/default.rb
 - lib/firehose/producer.rb
 - lib/firehose/publisher.rb
@@ -193,6 +195,8 @@ files:
 - lib/firehose/version.rb
 - spec/integrations/amqp_resources_spec.rb
 - spec/integrations/thin_spec.rb
+- spec/lib/broker_spec.rb
+- spec/lib/consumer_spec.rb
 - spec/lib/default_spec.rb
 - spec/lib/producer_spec.rb
 - spec/spec_helper.rb
@@ -223,6 +227,8 @@ summary: Build realtime Ruby web applications
 test_files:
 - spec/integrations/amqp_resources_spec.rb
 - spec/integrations/thin_spec.rb
+- spec/lib/broker_spec.rb
+- spec/lib/consumer_spec.rb
 - spec/lib/default_spec.rb
 - spec/lib/producer_spec.rb
 - spec/spec_helper.rb