amqp-subscribe-many 0.1.7 → 0.2.0

data/Rakefile

@@ -49,7 +49,7 @@ Jeweler::RubygemsDotOrgTasks.new
 
 Jeweler::Tasks.new do |gem|
   gem.name        = "amqp-subscribe-many"
-  gem.version     = "0.1.7"
+  gem.version     = "0.2.0"
   gem.homepage    = "http://github.com/brendanhay/amqp-subscribe-many"
   gem.license     = "MPL"
   gem.summary     = "An implementation of the publish one, subscribe many pattern"

data/amqp-subscribe-many.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{amqp-subscribe-many}
-  s.version = "0.1.7"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{brendanhay}]
-  s.date = %q{2012-09-26}
+  s.date = %q{2012-10-17}
   s.description = %q{Codifies best practices and configuration when consuming from multiple AMQP brokers simultaneously}
   s.email = %q{brendan@soundcloud.com}
   s.extra_rdoc_files = [

data/lib/messaging/client.rb

@@ -26,7 +26,7 @@ module Messaging
       delay ||= config.reconnect_delay
       options = AMQP::Client.parse_connection_uri(uri)
 
-      AMQP.connect(options) do |connection, open_ok|
+      res = AMQP.connect(options) do |connection, open_ok|
         # Handle TCP connection errors
         connection.on_tcp_connection_loss do |conn, settings|
           log.error("Connection to #{uri.inspect} lost, reconnecting")
@@ -47,6 +47,8 @@ module Messaging
 
         log.debug("Connection to #{uri.inspect} started")
       end
+
+      register_connection(res)
     end
 
     # Open an AMQP::Channel with auto-recovery and error handling.
@@ -56,7 +58,7 @@ module Messaging
     # @return [AMQP::Channel]
     # @api public
     def open_channel(connection, prefetch = nil)
-      AMQP::Channel.new(connection) do |channel, open_ok|
+      res = AMQP::Channel.new(connection) do |channel, open_ok|
         channel.auto_recovery = true
         channel.prefetch(prefetch) if prefetch
 
@@ -72,6 +74,8 @@ module Messaging
 
         log.debug("Channel #{channel.id} created")
       end
+
+      register_channel(res)
     end
 
     # Declare an exchange on the specified channel.
@@ -117,6 +121,20 @@ module Messaging
       end
     end
 
+    # Close all channels and then disconnect all the connections.
+    #
+    # @return []
+    # @api public
+    def disconnect
+      channels.each do |chan|
+        chan.close
+      end
+
+      connections.each do |conn|
+        conn.disconnect
+      end
+    end
+
     protected
 
     # @return [#info, #debug, #error]
@@ -133,6 +151,34 @@ module Messaging
 
     private
 
+    # @return [Array<AMQP::Channels>]
+    # @api private
+    def channels
+      @channels ||= []
+    end
+
+    # @param channel [AMQP::Channel]
+    # @return [AMQP::Channel]
+    # @api private
+    def register_channel(channel)
+      channels << channel
+      channel
+    end
+
+    # @return [Array<AMQP::Connection>]
+    # @api private
+    def connections
+      @connections ||= []
+    end
+
+    # @param connection [AMQP::Connection]
+    # @return [AMQP::Connection]
+    # @api private
+    def register_connection(connection)
+      connections << connection
+      connection
+    end
+
     # @param name [String]
     # @return [Boolean]
     # @api private

data/lib/messaging/consumer.rb

@@ -72,20 +72,6 @@ module Messaging
       raise NotImplementedError
     end
 
-    # Close all consumer_channels and then disconnect all the consumer_connections.
-    #
-    # @return []
-    # @api public
-    def disconnect
-      consumer_channels.each do |chan|
-        chan.close
-      end
-
-      consumer_connections.each do |conn|
-        conn.disconnect
-      end
-    end
-
     # Subscribe to a queue which will invoke the supplied block when
     # a message is received.
     # Additionally declaring a binding to the specified exchange/key pair.

data/lib/messaging/producer.rb

@@ -25,16 +25,6 @@ module Messaging
       self
     end
 
-    # Close the channel and then disconnect the connection.
-    #
-    # @return []
-    # @api public
-    def disconnect
-      producer_channel.close do |close_ok|
-        producer_connection.disconnect
-      end
-    end
-
     private
 
     # @return [Hash(String, AMQP::Exchange)]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amqp-subscribe-many
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
+date: 2012-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &70254082404240 !ruby/object:Gem::Requirement
+  requirement: &70133666875920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.6
   type: :runtime
   prerelease: false
-  version_requirements: *70254082404240
+  version_requirements: *70133666875920
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70254082403360 !ruby/object:Gem::Requirement
+  requirement: &70133666875100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254082403360
+  version_requirements: *70133666875100
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70254082402720 !ruby/object:Gem::Requirement
+  requirement: &70133666874560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70254082402720
+  version_requirements: *70133666874560
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70254082401680 !ruby/object:Gem::Requirement
+  requirement: &70133666873900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254082401680
+  version_requirements: *70133666873900
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70254082401060 !ruby/object:Gem::Requirement
+  requirement: &70133666873040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254082401060
+  version_requirements: *70133666873040
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70254082400280 !ruby/object:Gem::Requirement
+  requirement: &70133666872200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254082400280
+  version_requirements: *70133666872200
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70254082399680 !ruby/object:Gem::Requirement
+  requirement: &70133666871380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254082399680
+  version_requirements: *70133666871380
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70254082418900 !ruby/object:Gem::Requirement
+  requirement: &70133666870580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254082418900
+  version_requirements: *70133666870580
 description: Codifies best practices and configuration when consuming from multiple
   AMQP brokers simultaneously
 email: brendan@soundcloud.com
@@ -145,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3485289933541313982
+      hash: -1532574760131102209
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: