firehose 0.0.10 → 0.0.11

data/lib/firehose.rb

@@ -1,6 +1,7 @@
 require 'firehose/version'
 
 require 'amqp'
+require 'logger'
 
 module Firehose
   autoload :Subscription, 'firehose/subscription'
@@ -20,4 +21,13 @@ module Firehose
   def self.reset!
     @amqp = nil
   end
+
+  # Logging
+  def self.logger
+    @logger ||= Logger.new($stdout)
+  end
+
+  def self.logger=(logger)
+    @logger = logger
+  end
 end

data/lib/firehose/publisher.rb

@@ -5,6 +5,7 @@ module Firehose
       exchange  = AMQP::Exchange.new(channel, :fanout, path, :auto_delete => true)
       # TODO How do I clean up this exchange at this point? Do I close it somehow or the channel?
       # The exchange just hangs out indefinitely now.
+      Firehose.logger.debug "AMQP publishing `#{message}` to `#{path}`"
       exchange.publish(message)
       exchange.delete(:if_unused => true)
     end

data/lib/firehose/rack.rb

@@ -21,8 +21,6 @@ module Firehose
         # GET is how clients subscribe to the queue. When a messages comes in, we flush out a response,
         # close down the requeust, and the client then reconnects.
         when 'GET'
-          p [:subscribed, cid, path]
-
           EM.next_tick do
             # Setup a subscription with a client id. We haven't subscribed yet here.
             subscription = Firehose::Subscription.new(cid)
@@ -32,24 +30,24 @@ module Firehose
             timer = EM.add_timer(timeout) do
               # We send a 204 OK to tell the client to reconnect.
               env['async.callback'].call [204, cors_headers, []]
-              p [:timeout]
+              Firehose.logger.debug "HTTP wait `#{cid}@#{path}` timed out"
             end
 
             # Ok, now subscribe to the subscription.
-            subscription.subscribe path do |payload|
+            subscription.subscribe path do |message|
               subscription.unsubscribe
               subscription = nil # Set this to nil so that our heart beat timer doesn't try to double unsub.
               EM.cancel_timer timer # Turn off the heart beat so we don't execute any of that business.
-              env['async.callback'].call [200, cors_headers, [payload]]
+              env['async.callback'].call [200, cors_headers, [message]]
+              Firehose.logger.debug "HTTP sent `#{message}` to `#{cid}@#{path}`"
             end
+            Firehose.logger.debug "HTTP subscribed to `#{cid}@#{path}`"
 
             # 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
-              if subscription
-                subscription.unsubscribe
-                p [:close_unsubscription]
-              end
+              subscription.unsubscribe if subscription
+              Firehose.logger.debug "HTTP connection `#{cid}@#{path}` closing"
             end
           end
 
@@ -59,36 +57,43 @@ module Firehose
         # PUT is how we throw messages on to the fan-out queue.
         when 'PUT'
           body = env['rack.input'].read
-          p [:put, path, body]
+          Firehose.logger.debug "HTTP published `#{body}` to `#{path}`"
           Firehose::Publisher.new.publish(path, body)
 
           [202, {}, []]
         else
+          Firehose.logger.debug "HTTP #{method} not supported"
           [501, {'Content-Type' => 'text/plain'}, ["#{method} not supported."]]
         end
       end
     end
 
     class WebSocket < ::Rack::WebSocket::Application
+      attr_reader :cid, :path
+      
       # 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
+        @cid   = req.params['cid']
+        @path  = req.path
 
         @subscription = Firehose::Subscription.new(cid)
-        @subscription.subscribe path do |payload|
-          send_data payload
+        @subscription.subscribe path do |message|
+          Firehose.logger.debug "WS sent `#{message}` to `#{cid}@#{path}`"
+          send_data message
         end
+        Firehose.logger.debug "WS subscribed to `#{cid}@#{path}`"
       end
 
       # Delete the subscription if the thing even happened.
       def on_close(env)
         @subscription.unsubscribe if @subscription
+        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
       end
     end

data/lib/firehose/subscription.rb

@@ -14,6 +14,8 @@ module Firehose
       @subscriber_id = subscriber_id || self.class.subscriber_id
     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)
@@ -25,16 +27,18 @@ module Firehose
       # ttl starts ticking down. On the reconnect, the consumer connects to the 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, payload|
-        p [:get, subscriber_id, @consumer.consumer_tag, path, payload]
-        block.call(payload)
+      @consumer.on_delivery do |metadata, message|
+        Firehose.logger.debug "AMQP delivering `#{message}` to `#{subscriber_id}@#{path}`"
+        block.call(message)
         # 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.
         metadata.ack
       end.consume
+      Firehose.logger.debug "AMQP subscribed to `#{subscriber_id}@#{path}`"
     end
 
     def unsubscribe
+      Firehose.logger.debug "AMQP unsubscribed"
       @consumer.cancel if @consumer
     end
 

data/lib/firehose/version.rb

@@ -1,4 +1,4 @@
 module Firehose
-  VERSION = "0.0.10"
-  CODENAME = "Garden Hose"
+  VERSION = "0.0.11"
+  CODENAME = "Shouty Shamous"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: firehose
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70248892020200 !ruby/object:Gem::Requirement
+  requirement: &70308648263700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 1.0.0.beta
   type: :runtime
   prerelease: false
-  version_requirements: *70248892020200
+  version_requirements: *70308648263700
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &70248892017640 !ruby/object:Gem::Requirement
+  requirement: &70308648262880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 0.9.4
   type: :runtime
   prerelease: false
-  version_requirements: *70248892017640
+  version_requirements: *70308648262880
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70248892031220 !ruby/object:Gem::Requirement
+  requirement: &70308648261900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70248892031220
+  version_requirements: *70308648261900
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70248892024520 !ruby/object:Gem::Requirement
+  requirement: &70308648260860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70248892024520
+  version_requirements: *70308648260860
 - !ruby/object:Gem::Dependency
   name: websocket-rack
-  requirement: &70248892039500 !ruby/object:Gem::Requirement
+  requirement: &70308648260100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70248892039500
+  version_requirements: *70308648260100
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70248892037240 !ruby/object:Gem::Requirement
+  requirement: &70308648258940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70248892037240
+  version_requirements: *70308648258940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70248892032840 !ruby/object:Gem::Requirement
+  requirement: &70308648258020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70248892032840
+  version_requirements: *70308648258020
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70248892042160 !ruby/object:Gem::Requirement
+  requirement: &70308648257080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70248892042160
+  version_requirements: *70308648257080
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70248892053200 !ruby/object:Gem::Requirement
+  requirement: &70308648271320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70248892053200
+  version_requirements: *70308648271320
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &70248892049780 !ruby/object:Gem::Requirement
+  requirement: &70308648267980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70248892049780
+  version_requirements: *70308648267980
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70248892059480 !ruby/object:Gem::Requirement
+  requirement: &70308648266640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: 0.3.0
   type: :development
   prerelease: false
-  version_requirements: *70248892059480
+  version_requirements: *70308648266640
 - !ruby/object:Gem::Dependency
   name: guard-coffeescript
-  requirement: &70248892071480 !ruby/object:Gem::Requirement
+  requirement: &70308648265120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,7 +143,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70248892071480
+  version_requirements: *70308648265120
 description: Firehose is a realtime web application toolkit for building realtime
   Ruby web applications.
 email: