euston-rabbitmq 1.2.3 → 1.2.4

data/euston-rabbitmq.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'euston-rabbitmq'
-  s.version     = '1.2.3'
+  s.version     = '1.2.4'
   s.platform    = RUBY_PLATFORM.to_s == 'java' ? 'java' : Gem::Platform::RUBY
   s.authors     = ['Lee Henson', 'Guy Boertje']
   s.email       = ['lee.m.henson@gmail.com', 'guyboertje@gmail.com']
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
     lib/euston-rabbitmq/euston/command_handler_binder.rb
     lib/euston-rabbitmq/euston/errors.rb
     lib/euston-rabbitmq/euston/event_handler_binder.rb
+    lib/euston-rabbitmq/euston/event_handler_queue_declarer.rb
     lib/euston-rabbitmq/euston/exchanges.rb
     lib/euston-rabbitmq/euston/handler_binder.rb
     lib/euston-rabbitmq/euston/queues.rb
@@ -53,8 +54,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'hot_bunnies',                 '~> 1.3.0' if RUBY_PLATFORM.to_s == 'java'
   s.add_dependency 'safely',                      '~> 0.3.0'
 
-  s.add_development_dependency 'awesome_print',     '~> 0.4.0'
-  s.add_development_dependency 'fuubar',            '~> 0.0.0'
+  s.add_development_dependency 'awesome_print',     '~> 1.0.2'
+  s.add_development_dependency 'fuubar',            '~> 1.0.0'
   s.add_development_dependency 'rabbitmqadmin-cli', '~> 1.0.0'
   s.add_development_dependency 'rake',              '~> 0.9.2'
   s.add_development_dependency 'rspec',             '~> 2.6.0'

data/lib/euston-rabbitmq.rb

@@ -23,4 +23,5 @@ require 'euston-rabbitmq/euston/queues'
 require 'euston-rabbitmq/euston/handler_binder'
 require 'euston-rabbitmq/euston/command_handler_binder'
 require 'euston-rabbitmq/euston/event_handler_binder'
+require 'euston-rabbitmq/euston/event_handler_queue_declarer'
 require 'euston-rabbitmq/euston/retrying_subscription'

data/lib/euston-rabbitmq/euston/event_handler_binder.rb

@@ -4,22 +4,25 @@ module Euston
       private
 
       def ensure_bindings_exist_for_reference reference
-        queue_name = reference.name.to_s.underscore
-
-        @log.debug "Ensuring event handler queue exists: #{queue_name}"
-
-        queue = get_queue @channel, queue_name
-
         prefix = '__event_handler__'
 
         methods = reference.handler.public_instance_methods(false)
         methods = methods.select { |method| method.to_s.start_with? prefix }
         methods = methods.map    { |method| method.to_s[prefix.length, method.to_s.length - prefix.length] }
         methods = methods.map    { |method| method.split('__').first }
+        methods.uniq!
 
         exchange = get_exchange @channel, :events
 
-        methods.uniq.each do |method|
+        return if methods.empty?
+
+        queue_name = reference.queue_name
+        
+        @log.debug "Ensuring event handler queue exists: #{queue_name}"
+        
+        queue = get_queue @channel, queue_name
+
+        methods.each do |method|
           routing_key = "events.#{method}"
 
           @log.debug "Ensuring routing key exists for queue #{queue_name}: #{routing_key}"

data/lib/euston-rabbitmq/euston/event_handler_queue_declarer.rb

@@ -0,0 +1,25 @@
+module Euston
+  module RabbitMq
+    module EventHandlerQueueDeclarer
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        def event_queue name
+          @event_queue_name = name
+        end
+
+        def event_queue_name
+          @event_queue_name
+        end
+      end
+    end
+  end
+
+  module AggregateRoot
+    include Euston::RabbitMq::EventHandlerQueueDeclarer
+  end
+
+  module EventHandler
+    include Euston::RabbitMq::EventHandlerQueueDeclarer
+  end
+end

data/lib/euston-rabbitmq/reflection/handler_reference.rb

@@ -3,9 +3,11 @@ module Euston
     class HandlerReference
       def initialize namespace, handler, name
         @namespace, @handler, @name = namespace, handler, name
+        @queue_name = handler.event_queue_name if handler.respond_to? :event_queue_name
+        @queue_name = handler.to_s.split('::').pop.underscore if @queue_name.nil?
       end
 
-      attr_reader :namespace, :handler, :name
+      attr_reader :namespace, :handler, :name, :queue_name
     end
   end
 end

data/lib/euston-rabbitmq/version.rb

@@ -1,5 +1,5 @@
 module Euston
   module RabbitMq
-    VERSION = "1.2.3"
+    VERSION = "1.2.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: euston-rabbitmq
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-13 00:00:00.000000000 Z
+date: 2012-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70300704979420 !ruby/object:Gem::Requirement
+  requirement: &70292547439480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *70300704979420
+  version_requirements: *70292547439480
 - !ruby/object:Gem::Dependency
   name: euston
-  requirement: &70300704978940 !ruby/object:Gem::Requirement
+  requirement: &70292547438640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70300704978940
+  version_requirements: *70292547438640
 - !ruby/object:Gem::Dependency
   name: euston-eventstore
-  requirement: &70300704978480 !ruby/object:Gem::Requirement
+  requirement: &70292547437920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70300704978480
+  version_requirements: *70292547437920
 - !ruby/object:Gem::Dependency
   name: hash-keys
-  requirement: &70300704978020 !ruby/object:Gem::Requirement
+  requirement: &70292547437100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70300704978020
+  version_requirements: *70292547437100
 - !ruby/object:Gem::Dependency
   name: hollywood
-  requirement: &70300704977560 !ruby/object:Gem::Requirement
+  requirement: &70292547436040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70300704977560
+  version_requirements: *70292547436040
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70300704977100 !ruby/object:Gem::Requirement
+  requirement: &70292547435240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70300704977100
+  version_requirements: *70292547435240
 - !ruby/object:Gem::Dependency
   name: safely
-  requirement: &70300704976620 !ruby/object:Gem::Requirement
+  requirement: &70292547434380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,32 +88,32 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70300704976620
+  version_requirements: *70292547434380
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &70300704976160 !ruby/object:Gem::Requirement
+  requirement: &70292547433880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *70300704976160
+  version_requirements: *70292547433880
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &70300704975700 !ruby/object:Gem::Requirement
+  requirement: &70292547433360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.0
+        version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70300704975700
+  version_requirements: *70292547433360
 - !ruby/object:Gem::Dependency
   name: rabbitmqadmin-cli
-  requirement: &70300704975240 !ruby/object:Gem::Requirement
+  requirement: &70292547432780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70300704975240
+  version_requirements: *70292547432780
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70300704974780 !ruby/object:Gem::Requirement
+  requirement: &70292547432220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70300704974780
+  version_requirements: *70292547432220
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70300704974320 !ruby/object:Gem::Requirement
+  requirement: &70292547431520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,7 +143,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70300704974320
+  version_requirements: *70292547431520
 description: JRuby RabbitMq bindings
 email:
 - lee.m.henson@gmail.com
@@ -159,6 +159,7 @@ files:
 - lib/euston-rabbitmq/euston/command_handler_binder.rb
 - lib/euston-rabbitmq/euston/errors.rb
 - lib/euston-rabbitmq/euston/event_handler_binder.rb
+- lib/euston-rabbitmq/euston/event_handler_queue_declarer.rb
 - lib/euston-rabbitmq/euston/exchanges.rb
 - lib/euston-rabbitmq/euston/handler_binder.rb
 - lib/euston-rabbitmq/euston/queues.rb
@@ -192,15 +193,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1997316586014769473
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1997316586014769473
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: RabbitMq bindings for Euston.