euston-rabbitmq 1.2.3-java → 1.2.4-java

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

@@ -2,7 +2,7 @@
 name: euston-rabbitmq
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 1.2.3
+  version: 1.2.4
 platform: java
 authors:
 - Lee Henson
@@ -10,149 +10,149 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-12-13 00:00:00.000000000Z
+date: 2012-02-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  version_requirements: &2058 !ruby/object:Gem::Requirement
+  version_requirements: &4056 !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.10
     none: false
-  requirement: *2058
+  requirement: *4056
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: euston
-  version_requirements: &2076 !ruby/object:Gem::Requirement
+  version_requirements: &4074 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.0
     none: false
-  requirement: *2076
+  requirement: *4074
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: euston-eventstore
-  version_requirements: &2092 !ruby/object:Gem::Requirement
+  version_requirements: &4090 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.0
     none: false
-  requirement: *2092
+  requirement: *4090
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: hash-keys
-  version_requirements: &2108 !ruby/object:Gem::Requirement
+  version_requirements: &4106 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
     none: false
-  requirement: *2108
+  requirement: *4106
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: hollywood
-  version_requirements: &2124 !ruby/object:Gem::Requirement
+  version_requirements: &4122 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
     none: false
-  requirement: *2124
+  requirement: *4122
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: i18n
-  version_requirements: &2140 !ruby/object:Gem::Requirement
+  version_requirements: &4138 !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.0
     none: false
-  requirement: *2140
+  requirement: *4138
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: hot_bunnies
-  version_requirements: &2156 !ruby/object:Gem::Requirement
+  version_requirements: &4154 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.0
     none: false
-  requirement: *2156
+  requirement: *4154
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: safely
-  version_requirements: &2172 !ruby/object:Gem::Requirement
+  version_requirements: &4170 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.0
     none: false
-  requirement: *2172
+  requirement: *4170
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  version_requirements: &2188 !ruby/object:Gem::Requirement
+  version_requirements: &4186 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 1.0.2
     none: false
-  requirement: *2188
+  requirement: *4186
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: fuubar
-  version_requirements: &2206 !ruby/object:Gem::Requirement
+  version_requirements: &4204 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.0
+        version: 1.0.0
     none: false
-  requirement: *2206
+  requirement: *4204
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: rabbitmqadmin-cli
-  version_requirements: &2222 !ruby/object:Gem::Requirement
+  version_requirements: &4220 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
     none: false
-  requirement: *2222
+  requirement: *4220
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: &2238 !ruby/object:Gem::Requirement
+  version_requirements: &4236 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.2
     none: false
-  requirement: *2238
+  requirement: *4236
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &2254 !ruby/object:Gem::Requirement
+  version_requirements: &4252 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.0
     none: false
-  requirement: *2254
+  requirement: *4252
   prerelease: false
   type: :development
 description: JRuby RabbitMq bindings
@@ -170,6 +170,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
@@ -201,17 +202,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 2
       version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 2
       version: '0'
   none: false
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.9
+rubygems_version: 1.8.15
 signing_key:
 specification_version: 3
 summary: RabbitMq bindings for Euston.