msgr 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d7147b5f93af8abbb88769c9bc5ad79e6aaccce
-  data.tar.gz: 51d0238c5a3f1da6c31727096f696741f2ed86cf
+  metadata.gz: 734c3680e24335ea471f3fc2446b461fbfa00efc
+  data.tar.gz: facaa4877340b7882f85982e47505ee8183f7df0
 SHA512:
-  metadata.gz: e4a0de140ab0c7195f422add2998dfdaef6c089acdcde696a7e10e9b0cd5d08203b0d5adc5ff4ddfeb71ae5d981f0a2f9eb6b0ec91098b57e142217027731493
-  data.tar.gz: 7b1be5091653909b0fd4ea7bd2f22aa85c926b82ab796ed1e4cc30a3f2ba358e7df1202e5265aad421fd92d4a9a2c34c09e945ae778b372eb946bc564e64f584
+  metadata.gz: 2cbce31c84a705f41af34a421cf24a0fed7c66adf5274d6ead1c8b776600a5378a4f55260b9a6c60f770c136c9fc4409a741dd6143cea8034df559e72ac58fd4
+  data.tar.gz: fb789cb58f7330d7fb0e45483d32ff83a80240b15912d027e82b558087dbf7763c38ce27dcfc1a0d98b720aaae44883c4f5ff98c4d0d9e3b50b26d41d8b3b4a2

data/lib/msgr/binding.rb

@@ -0,0 +1,40 @@
+module Msgr
+
+  class Binding
+    include Logging
+
+    attr_reader :queue, :subscription, :connection, :route, :dispatcher
+
+    def initialize(connection, route, dispatcher)
+      @connection = connection
+      @route      = route
+      @dispatcher = dispatcher
+      @queue      = connection.queue(route.name)
+
+      route.keys.each do |key|
+        log(:debug) { "Bind #{key} to #{queue.name}." }
+
+        queue.bind connection.exchange, routing_key: key
+      end
+
+      @subscription = queue.subscribe(ack: true) do |*args|
+        begin
+          dispatcher.call Message.new(self, *args, route)
+        rescue => err
+          log(:error) do
+            "Rescued error from subscribe: #{err.class.name}: #{err}\n#{err.backtrace.join("\n")}"
+          end
+        end
+      end
+    end
+
+    def release
+      subscription.cancel
+    end
+
+    def delete
+      release
+      queue.delete
+    end
+  end
+end

data/lib/msgr/client.rb

@@ -15,7 +15,7 @@ module Msgr
       @uri.path   = config[:vhost] ||= @uri.path.present? ? @uri.path : '/'
       config.reject! { |_, v| v.nil? }
 
-      @config = config
+      @config       = config
       @config[:max] ||= 2
 
       @mutex  = ::Mutex.new
@@ -56,13 +56,14 @@ module Msgr
       end
     end
 
-    def stop
+    def stop(opts = {})
       mutex.synchronize do
         check_process!
 
         log(:info) { "Stop on #{uri}..." }
 
         connection.release
+        connection.delete if opts[:delete]
         connection.close
         dispatcher.shutdown
 
@@ -119,10 +120,10 @@ module Msgr
     end
 
     def reset
-      @connection    = nil
-      @pool          = nil
-      @channel       = nil
-      @subscriptions = nil
+      @connection = nil
+      @pool       = nil
+      @channel    = nil
+      @bindings   = nil
     end
   end
 end

data/lib/msgr/connection.rb

@@ -17,7 +17,7 @@ module Msgr
     end
 
     def running?
-      subscriptions.any?
+      bindings.any?
     end
 
     def publish(payload, opts = {})
@@ -46,11 +46,22 @@ module Msgr
     end
 
     def release
-      subscriptions.each { |subscription| subscription.cancel }
+      return if bindings.empty?
+      log(:debug) { "Release bindings (#{bindings.size})..." }
+
+      bindings.each { |binding| binding.release }
     end
 
-    def subscriptions
-      @subscription ||= []
+    def delete
+      return if bindings.empty?
+      log(:debug) { "Delete bindings (#{bindings.size})..." }
+
+      bindings.each { |binding| binding.delete }
+      exchange.delete
+    end
+
+    def bindings
+      @bindings ||= []
     end
 
     def prefix(name)
@@ -105,25 +116,7 @@ module Msgr
 
     private
     def bind_all(routes)
-      routes.each do |route|
-        queue = queue(route.name)
-
-        route.keys.each do |key|
-          log(:debug) { "Bind #{key} to #{queue.name}." }
-
-          queue.bind exchange, routing_key: key
-        end
-
-        subscriptions << queue.subscribe(ack: true) do |*args|
-          begin
-            @dispatcher.call Message.new(self, *args, route)
-          rescue => err
-            log(:error) do
-              "Rescued error from subscribe: #{err.class.name}: #{err}\n#{err.backtrace.join("\n")}"
-            end
-          end
-        end
-      end
+      routes.each { |route| bindings << Binding.new(self, route, @dispatcher) }
     end
   end
 end

data/lib/msgr/version.rb

@@ -1,7 +1,7 @@
 module Msgr
   module VERSION
     MAJOR = 0
-    MINOR = 9
+    MINOR = 10
     PATCH = 0
     STAGE = nil
     STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.')

data/lib/msgr.rb

@@ -8,6 +8,7 @@ require 'active_support/core_ext/hash/keys'
 
 require 'msgr/logging'
 require 'msgr/client'
+require 'msgr/binding'
 require 'msgr/connection'
 require 'msgr/consumer'
 require 'msgr/dispatcher'

data/spec/msgr/msgr_spec.rb

@@ -23,7 +23,7 @@ describe Msgr do
   end
 
   after do
-    client.stop
+    client.stop delete: true
   end
 
   it 'should dispatch published methods to consumer' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: msgr
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-24 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -98,6 +98,7 @@ files:
 - gemfiles/Gemfile.rails-3-2
 - gemfiles/Gemfile.rails-4-0
 - lib/msgr.rb
+- lib/msgr/binding.rb
 - lib/msgr/client.rb
 - lib/msgr/connection.rb
 - lib/msgr/consumer.rb