firehose 0.1.0 → 0.1.1

data/lib/firehose.rb

@@ -3,6 +3,8 @@ require 'firehose/version'
 require 'em-hiredis'
 require 'logger'
 
+require 'firehose/rails' if defined?(::Rails::Engine)
+
 module Firehose
   autoload :Subscription, 'firehose/subscription'
   autoload :Publisher,    'firehose/publisher'
@@ -10,7 +12,7 @@ module Firehose
   autoload :Default,      'firehose/default'
   autoload :Rack,         'firehose/rack'
   autoload :CLI,          'firehose/cli'
-
+  
   # Logging
   def self.logger
     @logger ||= Logger.new($stdout)
@@ -19,4 +21,4 @@ module Firehose
   def self.logger=(logger)
     @logger = logger
   end
-end
+end

data/lib/firehose/cli.rb

@@ -3,6 +3,11 @@ require 'thin'
 
 module Firehose
   class CLI < Thor
+    desc "version", "display the current version"
+    def version
+      puts %[Firehose #{Firehose::VERSION} "#{Firehose::CODENAME}"]
+    end
+
     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'
@@ -14,8 +19,8 @@ module Firehose
 
       begin
         server.start!
-      rescue RuntimeError
-        Firehose.logger.error "Unable to connect to Redis, are you sure it's running?"
+      rescue
+        Firehose.logger.error "#{e.message}: #{e.backtrace}"
         raise
       end
     end

data/lib/firehose/publisher.rb

@@ -2,7 +2,7 @@ module Firehose
   class Publisher
     def publish(channel, message)
       Firehose.logger.debug "Redis publishing `#{message}` to `#{channel}`"
-      redis.publish(channel, message).errback { raise 'Error publishing' }
+      redis.publish(channel, message).errback { |msg| raise "Error publishing: #{msg}" }
     end
 
   private

data/lib/firehose/rails.rb

@@ -0,0 +1,7 @@
+module Firehose
+  module Rails
+    class Engine < ::Rails::Engine
+      # enable rails to pick up lib/assets/* via sprockets.
+    end
+  end
+end

data/lib/firehose/subscription.rb

@@ -23,8 +23,10 @@ module Firehose
     end
 
     def unsubscribe(&block)
+      redis.unsubscribe(channel)
       Firehose.logger.debug "Redis unsubscribed from `#{consumer_id}@#{channel}`"
-      redis.close
+      redis.close_connection
+      @redis = nil
       block.call(self) if block
       self
     end

data/lib/firehose/version.rb

@@ -1,4 +1,4 @@
 module Firehose
-  VERSION = "0.1.0"
-  CODENAME = "Redis Rodeo"
+  VERSION = "0.1.1"
+  CODENAME = "Rails Ready"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: firehose
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-09 00:00:00.000000000 Z
+date: 2012-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70097385746880 !ruby/object:Gem::Requirement
+  requirement: &70305542896500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 1.0.0.beta
   type: :runtime
   prerelease: false
-  version_requirements: *70097385746880
+  version_requirements: *70305542896500
 - !ruby/object:Gem::Dependency
   name: em-hiredis
-  requirement: &70097385746460 !ruby/object:Gem::Requirement
+  requirement: &70305536313020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70097385746460
+  version_requirements: *70305536313020
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70097385746000 !ruby/object:Gem::Requirement
+  requirement: &70305536312560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70097385746000
+  version_requirements: *70305536312560
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70097385745580 !ruby/object:Gem::Requirement
+  requirement: &70305536312140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70097385745580
+  version_requirements: *70305536312140
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70097385745160 !ruby/object:Gem::Requirement
+  requirement: &70305536311720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70097385745160
+  version_requirements: *70305536311720
 - !ruby/object:Gem::Dependency
   name: websocket-rack
-  requirement: &70097385744740 !ruby/object:Gem::Requirement
+  requirement: &70305536311300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70097385744740
+  version_requirements: *70305536311300
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70097385744240 !ruby/object:Gem::Requirement
+  requirement: &70305536310800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70097385744240
+  version_requirements: *70305536310800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70097385743820 !ruby/object:Gem::Requirement
+  requirement: &70305536310380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70097385743820
+  version_requirements: *70305536310380
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70097385743360 !ruby/object:Gem::Requirement
+  requirement: &70305536309920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70097385743360
+  version_requirements: *70305536309920
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70097385742940 !ruby/object:Gem::Requirement
+  requirement: &70305536309500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70097385742940
+  version_requirements: *70305536309500
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &70097385742520 !ruby/object:Gem::Requirement
+  requirement: &70305536309080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70097385742520
+  version_requirements: *70305536309080
 - !ruby/object:Gem::Dependency
   name: guard-coffeescript
-  requirement: &70097385742100 !ruby/object:Gem::Requirement
+  requirement: &70305536308660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70097385742100
+  version_requirements: *70305536308660
 - !ruby/object:Gem::Dependency
   name: em-websocket-client
-  requirement: &70097385741680 !ruby/object:Gem::Requirement
+  requirement: &70305536308240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,7 +154,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70097385741680
+  version_requirements: *70305536308240
 description: Firehose is a realtime web application toolkit for building realtime
   Ruby web applications.
 email:
@@ -189,6 +189,7 @@ files:
 - lib/firehose/producer.rb
 - lib/firehose/publisher.rb
 - lib/firehose/rack.rb
+- lib/firehose/rails.rb
 - lib/firehose/subscription.rb
 - lib/firehose/version.rb
 - spec/integrations/thin_spec.rb