euston-rabbitmq 1.0.0-java → 1.0.1-java

data/Gemfile.lock

@@ -1,16 +1,14 @@
 PATH
   remote: .
   specs:
-    euston-rabbitmq (1.0.0)
+    euston-rabbitmq (1.0.0-java)
       activesupport (~> 3.0.0)
-      amqp (~> 0.8.0)
-      bson_ext (~> 1.3.1)
       euston (~> 1.0.0)
       euston-eventstore (~> 1.0.0)
-      eventmachine (~> 0.12.10)
       hash-keys (~> 1.0.0)
       hollywood (~> 1.0.0)
-      mongo (~> 1.3.1)
+      jessica (~> 1.0.0)
+      jmongo (~> 1.0.0)
       require_all (~> 1.2.0)
       robustthread (~> 0.5.2)
       safely (~> 0.3.0)
@@ -19,31 +17,12 @@ GEM
   remote: http://rubygems.org/
   specs:
     activesupport (3.0.10)
-    amq-client (0.8.3)
-      amq-protocol (>= 0.8.0)
-      eventmachine
-    amq-protocol (0.8.1)
-    amqp (0.8.0)
-      amq-client (~> 0.8.3)
-      amq-protocol (~> 0.8.0)
-      eventmachine
     awesome_print (0.4.0)
-    bson (1.3.1)
-    bson (1.3.1-java)
-    bson_ext (1.3.1)
     diff-lcs (1.1.3)
     euston (1.0.0)
       activesupport (~> 3.0.9)
       euston-eventstore (~> 1.0.0)
       require_all (~> 1.2.0)
-    euston-eventstore (1.0.4)
-      activesupport (~> 3.0.9)
-      bson_ext (~> 1.3.1)
-      hash-keys (~> 1.0.0)
-      json (~> 1.5.0)
-      mongo (~> 1.3.1)
-      require_all (~> 1.2.0)
-      uuid (~> 2.3.0)
     euston-eventstore (1.0.4-java)
       activesupport (~> 3.0.9)
       hash-keys (~> 1.0.0)
@@ -51,9 +30,6 @@ GEM
       json-jruby (~> 1.5.0)
       require_all (~> 1.2.0)
       uuid (~> 2.3.0)
-    evented-spec (0.9.0)
-    eventmachine (0.12.10)
-    eventmachine (0.12.10-java)
     faker (1.0.0)
       i18n (~> 0.4)
     fuubar (0.0.6)
@@ -63,16 +39,15 @@ GEM
     hash-keys (1.0.0)
     hollywood (1.0.0)
     i18n (0.6.0)
+    jessica (1.0.2-java)
+      require_all (~> 1.2.0)
     jmongo (1.0.3)
       require_all (~> 1.2)
-    json (1.5.0)
     json (1.5.0-java)
     json-jruby (1.5.0-java)
       json (= 1.5.0)
     macaddr (1.4.0)
       systemu (~> 2.2.0)
-    mongo (1.3.1)
-      bson (>= 1.3.1)
     require_all (1.2.0)
     robustthread (0.5.2)
     rspec (2.6.0)
@@ -92,12 +67,10 @@ GEM
 
 PLATFORMS
   java
-  ruby
 
 DEPENDENCIES
   awesome_print (~> 0.4.0)
   euston-rabbitmq!
-  evented-spec (~> 0.9.0)
   faker (~> 1.0.0)
   fuubar (~> 0.0.0)
   rspec (~> 2.6.0)

data/euston-rabbitmq.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'euston-rabbitmq'
-  s.version     = '1.0.0'
+  s.version     = '1.0.1'
   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']
@@ -15,16 +15,16 @@ Gem::Specification.new do |s|
     Rakefile
     euston-rabbitmq.gemspec
     lib/euston-rabbitmq.rb
-    lib/euston-rabbitmq/buffered_message_dispatcher.rb
-    lib/euston-rabbitmq/command_handler_bindings.rb
+    lib/euston-rabbitmq/bindings/command_handler_binder.rb
+    lib/euston-rabbitmq/bindings/event_handler_binder.rb
+    lib/euston-rabbitmq/bindings/handler_binder.rb
     lib/euston-rabbitmq/command_handlers/retry_failed_message.rb
+    lib/euston-rabbitmq/constant_loader.rb
     lib/euston-rabbitmq/errors.rb
-    lib/euston-rabbitmq/event_handler_binding.rb
-    lib/euston-rabbitmq/event_handler_bindings.rb
     lib/euston-rabbitmq/event_handlers/message_failure.rb
-    lib/euston-rabbitmq/event_store_dispatcher.rb
     lib/euston-rabbitmq/exchanges.rb
-    lib/euston-rabbitmq/handler_bindings.rb
+    lib/euston-rabbitmq/handler_finder.rb
+    lib/euston-rabbitmq/handler_reference.rb
     lib/euston-rabbitmq/message_buffer.rb
     lib/euston-rabbitmq/message_logger.rb
     lib/euston-rabbitmq/queue.rb
@@ -32,10 +32,13 @@ Gem::Specification.new do |s|
     lib/euston-rabbitmq/read_model/failed_message.rb
     lib/euston-rabbitmq/read_model/message_buffer.rb
     lib/euston-rabbitmq/read_model/message_log.rb
+    lib/euston-rabbitmq/subscriptions/retriable_subscription.rb
     lib/euston-rabbitmq/version.rb
     spec/command_buffer_spec.rb
+    spec/constant_loader_spec.rb
     spec/event_buffer_spec.rb
     spec/exchange_declaration_spec.rb
+    spec/handler_finder_spec.rb
     spec/message_failure_spec.rb
     spec/mt_safe_queue_subscription_spec.rb
     spec/safe_queue_subscription_spec.rb

data/lib/euston-rabbitmq/bindings/command_handler_binder.rb

@@ -0,0 +1,24 @@
+module Euston
+  module RabbitMq
+    class CommandHandlerBinder < HandlerBinder
+      private
+
+      def ensure_bindings_exist_for_reference channel, reference
+        queue_name = :command_handlers
+        queue = get_command_handler_queue channel, queue_name
+
+        routing_key = "commands.#{reference.name.to_s.underscore}"
+
+        EUSTON_LOG.debug "Ensuring routing key exists for queue #{queue_name}: #{routing_key}"
+
+        exchange = get_exchange channel, :commands
+        queue.bind exchange, :routing_key => routing_key
+      end
+
+      def get_command_handler_queue channel, queue_name
+        EUSTON_LOG.debug "Ensuring command handler queue exists: #{queue_name}" if @command_handler_queue.nil?
+        @command_handler_queue ||= get_queue channel, queue_name
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+module Euston
+  module RabbitMq
+    class EventHandlerBinder < HandlerBinder
+      private
+
+      def ensure_bindings_exist_for_reference channel, reference
+        queue_name = reference.name.to_s.underscore
+
+        EUSTON_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 }
+
+        exchange = get_exchange channel, :events
+
+        methods.uniq.each do |method|
+          routing_key = "events.#{method}"
+
+          EUSTON_LOG.debug "Ensuring routing key exists for queue #{queue_name}: #{routing_key}"
+
+          queue.bind exchange, :routing_key => routing_key
+        end
+      end
+    end
+  end
+end

data/lib/euston-rabbitmq/bindings/handler_binder.rb

@@ -0,0 +1,25 @@
+module Euston
+  module RabbitMq
+    class HandlerBinder
+      include Euston::RabbitMq::Queues
+      include Euston::RabbitMq::Exchanges
+
+      def initialize references
+        @references = references
+      end
+
+      def ensure_bindings_exist
+        begin
+          channel = AMQP::Channel.new
+          channel.prefetch 1
+
+          @references.each do |reference|
+            ensure_bindings_exist_for_reference channel, reference
+          end
+        ensure
+          channel.disconnect unless channel.nil?
+        end
+      end
+    end
+  end
+end

data/lib/euston-rabbitmq/constant_loader.rb

@@ -0,0 +1,26 @@
+module Euston
+  module RabbitMq
+    class ConstantLoader
+      include Hollywood
+
+      def load string
+        namespace = Object
+        found = true
+
+        string.split('::').each do |segment|
+          if found && namespace.const_defined?(segment)
+            namespace = namespace.const_get segment.to_sym
+          else
+            found = false
+          end
+        end
+
+        if found
+          callback :hit, namespace
+        else
+          callback :miss, string
+        end
+      end
+    end
+  end
+end

data/lib/euston-rabbitmq/handler_finder.rb

@@ -0,0 +1,57 @@
+module Euston
+  module RabbitMq
+    class HandlerFinder
+      def initialize required_mixins = []
+        @namespaces = []
+        @constant_loader = ConstantLoader.new.when(:hit => method(:store_found_constant), :miss => method(:log_failed_lookup))
+        @required_mixins = required_mixins
+      end
+
+      attr_reader :namespaces
+
+      def find
+        filter_namespaces_list
+        map_namespaces_to_references
+      end
+
+      private
+
+      def filter_namespaces_list
+        @namespaces = @namespaces.map do |namespace|
+          @current_constant = nil
+
+          if namespace.is_a? Module
+            @current_constant = namespace
+          else
+            namespace = namespace.to_s
+            @constant_loader.load namespace
+          end
+
+          @current_constant
+        end.uniq.to_a - [nil]
+      end
+
+      def log_failed_lookup string
+        EUSTON_LOG.warn "Couldn't find handler namespace: #{string}" if Object.const_defined?('EUSTON_LOG')
+      end
+
+      def map_namespaces_to_references
+        references = []
+
+        @namespaces.each do |namespace|
+          references.push *(namespace.constants.map do |constant|
+            reference = HandlerReference.new namespace, namespace.const_get(constant), constant
+            reference = nil unless @required_mixins.all? { |mixin| reference.handler.included_modules.include? mixin }
+            reference
+          end.to_a - [nil])
+        end
+
+        references
+      end
+
+      def store_found_constant constant
+        @current_constant = constant if constant.is_a?(Module)
+      end
+    end
+  end
+end

data/lib/euston-rabbitmq/handler_reference.rb

@@ -0,0 +1,11 @@
+module Euston
+  module RabbitMq
+    class HandlerReference
+      def initialize namespace, handler, name
+        @namespace, @handler, @name = namespace, handler, name
+      end
+
+      attr_reader :namespace, :handler, :name
+    end
+  end
+end

data/lib/euston-rabbitmq/message_buffer.rb

@@ -16,7 +16,6 @@ module Euston
       include Hollywood
 
       def initialize channel, exchange_name
-
         @channel = channel
         @exchange = get_exchange channel, exchange_name
         @read_model = Euston::RabbitMq::ReadModel::MessageBuffer.send exchange_name
@@ -65,4 +64,4 @@ module Euston
       end
     end
   end
-end
+end

data/lib/euston-rabbitmq/read_model/message_buffer.rb

@@ -27,6 +27,11 @@ module Euston
                              'json' => ::ActiveSupport::JSON.encode(message) }, :safe => { :fsync => true })
         end
 
+        def find_next_message
+          query = { 'next_attempt' => { '$lte' => Time.now.to_f } }
+          @collection.find_one(query)
+        end
+
         def find_due_messages
           query = { 'next_attempt' => { '$lte' => Time.now.to_f } }
           order = [ 'next_attempt', Mongo::ASCENDING ]
@@ -40,7 +45,7 @@ module Euston
 
         def set_next_attempt message
           @collection.update({ '_id' => message['_id'] },
-                             { '$set' => { 'next_attempt' => message['next_attempt'] + 10 } }, :safe => { :fsync => true })
+                             { '$set' => { 'next_attempt' => Time.now.to_f + 10 } }, :safe => { :fsync => true })
         end
 
         def remove_published_message id
@@ -49,4 +54,4 @@ module Euston
       end
     end
   end
-end
+end

data/lib/euston-rabbitmq/{handler_bindings.rb → subscriptions/retriable_subscription.rb}

@@ -1,47 +1,16 @@
 module Euston
   module RabbitMq
-    class HandlerBindings
-      include Euston::RabbitMq::Exchanges
+    class RetriableSubscription
+      include Hollywood
       include Euston::RabbitMq::Queues
+      include Euston::RabbitMq::Exchanges
 
-      def initialize channel
+      def initialize channel, queue_name
         @channel = channel
-        @exchanges = { :commands => get_exchange(@channel, :commands),
-                         :events => get_exchange(@channel, :events) }
-        @namespaces = []
-      end
-
-      def add_namespace namespace
-        @namespaces << namespace
-      end
-
-      def namespaced_handler_types
-        ret = []
-        @namespaces.each do |namespace|
-          namespace.constants.each do |handler_type|
-            ret << [namespace, handler_type]
-          end
-        end
-        ret
-      end
-
-      def finalize_bindings
-        namespaced_handler_types.each do |namespace, handler_type|
-          bind_handler handler_type
-        end
+        @queue_name = queue_name
       end
 
-      protected
-
-      def bind_handler handler_type
-        # virtual
-      end
-
-      def find_namespaces_containing_handler_type handler_type
-        @namespaces.select { |namespace| namespace.const_defined? handler_type }
-      end
-
-      def attach_queue_hook_listeners queue
+      def attach_queue_hook_listeners
         queue.when(:message_decode_failed => method(:log_decode_failure),
                    :message_failed        => method(:handle_failure),
                    :message_received      => method(:call_handler))
@@ -49,8 +18,10 @@ module Euston
         queue.safe_subscribe
       end
 
+      private
+
       def call_handler(message)
-        # abstract
+        callback :message_received, message
       end
 
       def create_message_failed_message error, failed_message, amqp_header
@@ -80,19 +51,25 @@ module Euston
 
         begin
           if failures == 3
+            debug_message = "Message failed, out of retries"
+
             message.delete :failures
             message = create_message_failed_message error, message, amqp_header
 
             options = { :key => 'events.message_failed' }
             exchange = :events
           else
+            debug_message = "Message failed, retrying"
+
             options = { :key => amqp_header.method.routing_key }
             exchange = amqp_header.method.routing_key.split('.').first.to_sym
           end
 
           options = default_publish_options.merge options
-          exchange = @exchanges[exchange]
-          message = ::ActiveSupport::JSON.encode message
+          exchange = get_exchange @channel, exchange
+          message = ActiveSupport::JSON.encode message
+
+          EUSTON_LOG.debug "#{debug_message}: #{message}"
 
           exchange.publish message, options
 
@@ -110,6 +87,10 @@ module Euston
 
         Safely.report! err
       end
+
+      def queue
+        @queue ||= get_queue @channel, @queue_name
+      end
     end
   end
-end
+end

data/lib/euston-rabbitmq/version.rb

@@ -1,5 +1,5 @@
 module Euston
   module RabbitMq
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

data/lib/euston-rabbitmq.rb

@@ -17,7 +17,9 @@ require 'hollywood'
 require 'euston'
 require 'euston-eventstore'
 
-require_rel 'euston-rabbitmq'
+require_rel 'euston-rabbitmq/exchanges.rb'
+require_rel 'euston-rabbitmq/queues.rb'
+require_rel 'euston-rabbitmq/**/*.rb'
 
 module Euston
   module RabbitMq

data/spec/constant_loader_spec.rb

@@ -0,0 +1,38 @@
+require File.expand_path('../spec_helper.rb', __FILE__)
+
+module ConstantLoaderTesting
+  module SubNamespace
+    class Foobar
+    end
+  end
+end
+
+describe 'constant loader' do
+  let(:loader) { Euston::RabbitMq::ConstantLoader.new }
+  let(:outcome) { { :hit => nil, :miss => nil} }
+
+  before { loader.when(:hit => ->(constant) { outcome[:hit] = constant }, :miss => ->{ outcome[:miss] = true }) }
+
+  subject do
+    loader.load constant_string
+    outcome
+  end
+
+  context 'with a valid constant string' do
+    let(:constant_string) { 'ConstantLoaderTesting::SubNamespace::Foobar' }
+
+    its([:hit]) { should == ConstantLoaderTesting::SubNamespace::Foobar }
+  end
+
+  context 'with a totally invalid constant string' do
+    let(:constant_string) { 'Something::Entirely::Made::Up' }
+
+    its([:miss]) { should == true }
+  end
+
+  context 'with a partially invalid constant string' do
+    let(:constant_string) { 'ConstantLoaderTesting::Missing' }
+
+    its([:miss]) { should == true }
+  end
+end

data/spec/handler_finder_spec.rb

@@ -0,0 +1,48 @@
+require File.expand_path('../spec_helper.rb', __FILE__)
+
+module HandlerFinderTesting
+  module EmptyNamespace; end
+  module SuperSpecialMixin; end
+
+  module NonEmptyNamespace
+    class Handler1; end
+    class Handler2; end
+
+    class Handler3
+      include HandlerFinderTesting::SuperSpecialMixin
+    end
+  end
+end
+
+describe 'handler finder' do
+  let(:required_mixins) { [] }
+  let(:finder) { Euston::RabbitMq::HandlerFinder.new required_mixins }
+
+  before { finder.namespaces.push *namespaces }
+  subject { finder.find }
+
+  context 'no namespaces are provided' do
+    let(:namespaces) { [] }
+
+    it { should be_empty }
+  end
+
+  context 'a namespace is provided which contains no classes' do
+    let(:namespaces) { [HandlerFinderTesting::EmptyNamespace] }
+
+    it { should be_empty }
+  end
+
+  context 'a namespace is provided with contains some classes' do
+    let(:namespaces) { [HandlerFinderTesting::EmptyNamespace, 'HandlerFinderTesting::NonEmptyNamespace'] }
+
+    it { should have(3).items }
+  end
+
+  context 'a specific mixin is required on each handler' do
+    let(:required_mixins) { [HandlerFinderTesting::SuperSpecialMixin] }
+    let(:namespaces) { [HandlerFinderTesting::EmptyNamespace, 'HandlerFinderTesting::NonEmptyNamespace'] }
+
+    it { should have(1).items }
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: euston-rabbitmq
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 1.0.0
+  version: 1.0.1
 platform: java
 authors:
 - Lee Henson
@@ -10,160 +10,161 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-09-16 00:00:00.000000000Z
+date: 2011-09-20 00:00:00.000000000 +01:00
+default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  version_requirements: &2058 !ruby/object:Gem::Requirement
+  version_requirements: &2158 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.0
     none: false
-  requirement: *2058
+  requirement: *2158
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: euston
-  version_requirements: &2076 !ruby/object:Gem::Requirement
+  version_requirements: &2176 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
     none: false
-  requirement: *2076
+  requirement: *2176
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: euston-eventstore
-  version_requirements: &2092 !ruby/object:Gem::Requirement
+  version_requirements: &2192 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
     none: false
-  requirement: *2092
+  requirement: *2192
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: hash-keys
-  version_requirements: &2108 !ruby/object:Gem::Requirement
+  version_requirements: &2208 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
     none: false
-  requirement: *2108
+  requirement: *2208
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: hollywood
-  version_requirements: &2124 !ruby/object:Gem::Requirement
+  version_requirements: &2224 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
     none: false
-  requirement: *2124
+  requirement: *2224
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: require_all
-  version_requirements: &2140 !ruby/object:Gem::Requirement
+  version_requirements: &2240 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.0
     none: false
-  requirement: *2140
+  requirement: *2240
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: robustthread
-  version_requirements: &2156 !ruby/object:Gem::Requirement
+  version_requirements: &2256 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.2
     none: false
-  requirement: *2156
+  requirement: *2256
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: safely
-  version_requirements: &2172 !ruby/object:Gem::Requirement
+  version_requirements: &2272 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.0
     none: false
-  requirement: *2172
+  requirement: *2272
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: jmongo
-  version_requirements: &2188 !ruby/object:Gem::Requirement
+  version_requirements: &2288 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
     none: false
-  requirement: *2188
+  requirement: *2288
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: jessica
-  version_requirements: &2204 !ruby/object:Gem::Requirement
+  version_requirements: &2304 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
     none: false
-  requirement: *2204
+  requirement: *2304
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  version_requirements: &2220 !ruby/object:Gem::Requirement
+  version_requirements: &2320 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.0
     none: false
-  requirement: *2220
+  requirement: *2320
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: faker
-  version_requirements: &2238 !ruby/object:Gem::Requirement
+  version_requirements: &2338 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
     none: false
-  requirement: *2238
+  requirement: *2338
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: fuubar
-  version_requirements: &2254 !ruby/object:Gem::Requirement
+  version_requirements: &2354 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.0
     none: false
-  requirement: *2254
+  requirement: *2354
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &2270 !ruby/object:Gem::Requirement
+  version_requirements: &2370 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.0
     none: false
-  requirement: *2270
+  requirement: *2370
   prerelease: false
   type: :development
 description: JRuby RabbitMq bindings
@@ -179,16 +180,16 @@ files:
 - Rakefile
 - euston-rabbitmq.gemspec
 - lib/euston-rabbitmq.rb
-- lib/euston-rabbitmq/buffered_message_dispatcher.rb
-- lib/euston-rabbitmq/command_handler_bindings.rb
+- lib/euston-rabbitmq/bindings/command_handler_binder.rb
+- lib/euston-rabbitmq/bindings/event_handler_binder.rb
+- lib/euston-rabbitmq/bindings/handler_binder.rb
 - lib/euston-rabbitmq/command_handlers/retry_failed_message.rb
+- lib/euston-rabbitmq/constant_loader.rb
 - lib/euston-rabbitmq/errors.rb
-- lib/euston-rabbitmq/event_handler_binding.rb
-- lib/euston-rabbitmq/event_handler_bindings.rb
 - lib/euston-rabbitmq/event_handlers/message_failure.rb
-- lib/euston-rabbitmq/event_store_dispatcher.rb
 - lib/euston-rabbitmq/exchanges.rb
-- lib/euston-rabbitmq/handler_bindings.rb
+- lib/euston-rabbitmq/handler_finder.rb
+- lib/euston-rabbitmq/handler_reference.rb
 - lib/euston-rabbitmq/message_buffer.rb
 - lib/euston-rabbitmq/message_logger.rb
 - lib/euston-rabbitmq/queue.rb
@@ -196,15 +197,19 @@ files:
 - lib/euston-rabbitmq/read_model/failed_message.rb
 - lib/euston-rabbitmq/read_model/message_buffer.rb
 - lib/euston-rabbitmq/read_model/message_log.rb
+- lib/euston-rabbitmq/subscriptions/retriable_subscription.rb
 - lib/euston-rabbitmq/version.rb
 - spec/command_buffer_spec.rb
+- spec/constant_loader_spec.rb
 - spec/event_buffer_spec.rb
 - spec/exchange_declaration_spec.rb
+- spec/handler_finder_spec.rb
 - spec/message_failure_spec.rb
 - spec/mt_safe_queue_subscription_spec.rb
 - spec/safe_queue_subscription_spec.rb
 - spec/spec_helper.rb
 - spec/support/factories.rb
+has_rdoc: true
 homepage: http://github.com/leemhenson/euston-rabbitmq
 licenses: []
 post_install_message:
@@ -225,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.9
+rubygems_version: 1.5.1
 signing_key:
 specification_version: 3
 summary: RabbitMq bindings for Euston.

data/lib/euston-rabbitmq/buffered_message_dispatcher.rb

@@ -1,48 +0,0 @@
-module Euston
-  module RabbitMq
-    class BufferedMessageDispatcher
-      class << self
-        def command_dispatcher channel
-          @command_dispatcher ||= BufferedMessageDispatcher.new(Euston::RabbitMq::MessageBuffer.commands_buffer channel)
-        end
-
-        def event_dispatcher channel
-          @event_dispatcher ||= BufferedMessageDispatcher.new(Euston::RabbitMq::MessageBuffer.events_buffer channel)
-        end
-      end
-
-      include Euston::RabbitMq::Exchanges
-
-      def initialize buffer
-        @buffer = buffer
-        @buffer.when(:no_messages_were_due) { @sleep = true }
-      end
-
-      attr_writer :wait_time
-
-      def wait_time
-        @wait_time ||= 1
-      end
-
-      def stop
-        @stop = true
-      end
-
-      def start
-        @stop = false
-
-        dispatch_loop = Proc.new do
-          @sleep = false
-
-          begin
-            @buffer.dispatch_due_messages
-          end while !@sleep
-
-          EM.add_timer(wait_time) { dispatch_loop.call } unless @stop
-        end
-
-        EM.add_timer(wait_time) { dispatch_loop.call }
-      end
-    end
-  end
-end

data/lib/euston-rabbitmq/command_handler_bindings.rb

@@ -1,30 +0,0 @@
-module Euston
-  module RabbitMq
-    class CommandHandlerBindings < HandlerBindings
-      def finalize_bindings
-        super
-        attach_queue_hook_listeners queue
-      end
-
-      protected
-
-      def bind_handler handler_type
-        queue.bind @exchanges[:commands], :routing_key => "commands.#{handler_type.to_s.underscore}"
-      end
-
-      def call_handler message
-        command_headers = CommandHeaders.from_hash(message[:headers]).freeze
-        command_body = message[:body].freeze
-        handler_type = command_headers.type.to_s.camelize.to_sym
-        find_namespaces_containing_handler_type(handler_type).each do |namespace|
-          handler = namespace.const_get handler_type
-          handler.new.send "__version__#{command_headers.version}", command_headers, command_body
-        end
-      end
-
-      def queue
-        @queue ||= get_queue @channel, :command_handlers
-      end
-    end
-  end
-end

data/lib/euston-rabbitmq/event_handler_binding.rb

@@ -1,114 +0,0 @@
-module Euston
-  module RabbitMq
-    class EventHandlerBinding
-      include Euston::RabbitMq::Queues
-      include Euston::RabbitMq::Exchanges
-
-      PREFIX = '__event_handler__'
-
-      def initialize(channel, namespace, handler_type)
-        @channel, @namespace, @handler_type = channel, namespace, handler_type
-
-        name = @handler_type.to_s.underscore
-        @queue = get_queue(@channel, name)
-        instance_variable_set "@#{name}".to_sym, @queue
-        @handler_class = @namespace.const_get @handler_type
-        @exchange = get_exchange(@channel, :events)
-      end
-
-      def bind
-        bindable_methods.each do |method|
-          @queue.bind @exchange, :routing_key => "events.#{method}"
-        end
-        self
-      end
-
-      def listen
-        attach_queue_hook_listeners @queue
-      end
-
-      private
-
-      def attach_queue_hook_listeners queue
-        queue.when(:message_decode_failed => method(:log_decode_failure),
-                   :message_failed        => method(:handle_failure),
-                   :message_received      => method(:call_handler))
-
-        queue.safe_subscribe
-      end
-
-      def call_handler(message)
-        event_headers = EventHeaders.from_hash message[:headers]
-        event_body = message[:body]
-
-        @handler_class.new.send "#{PREFIX}#{event_headers.type}__#{event_headers.version}", event_headers.freeze, event_body.freeze
-      end
-
-      def bindable_methods
-        methods = @handler_class.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
-      end
-
-      def create_message_failed_message error, failed_message, amqp_header
-        {
-          :headers =>
-          {
-            :id => Euston.uuid.generate.to_s,
-            :type => :message_failed,
-            :version => 1,
-            :timestamp => Time.now.to_f
-          },
-
-          :body =>
-          {
-            :message => failed_message,
-            :routing_key => amqp_header.method.routing_key,
-            :error => error.message,
-            :backtrace => error.backtrace
-          }
-        }
-      end
-
-      def handle_failure message, error, amqp_header
-        failures = message[:failures] || 0
-        failures = failures + 1
-        message[:failures] = failures
-
-        begin
-          if failures == 3
-            message.delete :failures
-            message = create_message_failed_message error, message, amqp_header
-
-            options = { :key => 'events.message_failed' }
-            exchange_ref = :events
-          else
-            options = { :key => amqp_header.method.routing_key }
-            exchange_ref = amqp_header.method.routing_key.split('.').first.to_sym
-          end
-
-          options = default_publish_options.merge options
-          exchange = get_exchange(@channel, exchange_ref)
-          message = ::ActiveSupport::JSON.encode message
-
-          exchange.publish message, options
-
-          amqp_header.ack
-        rescue StandardError => e
-          amqp_header.reject :requeue => true
-          raise e
-        end
-      end
-
-      def log_decode_failure message, error
-        text = "A handler queue subscription failed. [Error] #{error.message} [Payload] #{message}"
-        err = Euston::RabbitMq::MessageDecodeFailedError.new text
-        err.set_backtrace error.backtrace
-
-        Safely.report! err
-      end
-    end
-  end
-end

data/lib/euston-rabbitmq/event_handler_bindings.rb

@@ -1,30 +0,0 @@
-module Euston
-  module RabbitMq
-    class EventHandlerBindings < HandlerBindings
-      PREFIX = '__event_handler__'
-
-      protected
-
-      def bind_handler handler_type
-        name = handler_type.to_s.underscore
-        queue = get_queue @channel, name
-        instance_variable_set "@#{name}".to_sym, queue
-
-        namespace = find_namespaces_containing_handler_type(handler_type).first
-        handler_class = namespace.const_get handler_type
-        methods = handler_class.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.each { |method| queue.bind @exchanges[:events], :routing_key => "events.#{method}" }
-
-        attach_queue_hook_listeners queue do |message|
-          event_headers = EventHeaders.from_hash message[:headers]
-          event_body = message[:body]
-
-          handler_class.new.send "#{PREFIX}#{event_headers.type}__#{event_headers.version}", event_headers.freeze, event_body.freeze
-        end
-      end
-    end
-  end
-end

data/lib/euston-rabbitmq/event_store_dispatcher.rb

@@ -1,45 +0,0 @@
-module Euston
-  module RabbitMq
-    class EventStoreDispatcher
-      def initialize channel
-        @channel = channel
-        @event_buffer = Euston::RabbitMq::MessageBuffer.events_buffer channel
-        @event_store = Euston::RabbitMq.event_store
-      end
-
-      attr_writer :wait_time
-
-      def wait_time
-        @wait_time ||= 1
-      end
-
-      def stop
-        @stop = true
-      end
-
-      def start
-        @stop = false
-
-        dispatch_loop = Proc.new do
-          begin
-            begin
-              commits = @event_store.get_undispatched_commits
-
-              commits.each do |commit|
-                commit.events.each { |event| @event_buffer.push event.to_hash }
-
-                @event_store.mark_commit_as_dispatched commit
-              end
-            end while !commits.empty?
-          rescue StandardError => e
-            DaemonKit::logger.error "#{e}\n#{e.backtrace}"
-          end
-
-          EM.add_timer(wait_time) { dispatch_loop.call } unless @stop
-        end
-
-        EM.add_timer(wait_time) { dispatch_loop.call }
-      end
-    end
-  end
-end