euston-rabbitmq 1.0.1 → 1.0.2

data/Gemfile

@@ -1,2 +1,4 @@
 source :rubygems
 gemspec
+
+gem 'safely', :git => 'https://github.com/leemhenson/safely.git', :branch => 'override_strategies'

data/Rakefile

@@ -78,27 +78,6 @@ RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = default_rspec_opts
 end
 
-desc "Resets the testing vhost in rabbitmq"
-task :reset_rabbitmq do
-  vhosts = `rabbitmqctl list_vhosts`.split("\n")
-  vhosts = trim_array_ends vhosts
-  vhost = '/euston-rabbitmq-test'
-
-  puts `rabbitmqctl delete_vhost #{vhost}` if vhosts.include? vhost
-  puts `rabbitmqctl add_vhost #{vhost}`
-
-  users = `rabbitmqctl list_users`.split("\n")
-  users = trim_array_ends users
-  users = users.map { |u| u.split("\t").shift }
-
-  user, password = 'euston-rabbitmq-tester', 'password'
-
-  puts `rabbitmqctl delete_user #{user}` if users.include? user
-  puts `rabbitmqctl add_user #{user} #{password}`
-  puts `rabbitmqctl set_permissions -p #{vhost} #{user} ".*" ".*" ".*"`
-  puts `rabbitmqctl set_permissions -p #{vhost} guest ".*" ".*" ".*"` if users.include? 'guest'
-end
-
 #############################################################################
 #
 # Packaging tasks

data/euston-rabbitmq.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'euston-rabbitmq'
-  s.version     = '1.0.1'
+  s.version     = '1.0.2'
   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']
@@ -14,35 +14,31 @@ Gem::Specification.new do |s|
     Rakefile
     euston-rabbitmq.gemspec
     lib/euston-rabbitmq.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_handlers/message_failure.rb
-    lib/euston-rabbitmq/exchanges.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
-    lib/euston-rabbitmq/queues.rb
-    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/euston/command_handler_binder.rb
+    lib/euston-rabbitmq/euston/errors.rb
+    lib/euston-rabbitmq/euston/event_handler_binder.rb
+    lib/euston-rabbitmq/euston/exchanges.rb
+    lib/euston-rabbitmq/euston/handler_binder.rb
+    lib/euston-rabbitmq/euston/queues.rb
+    lib/euston-rabbitmq/euston/retrying_subscription.rb
+    lib/euston-rabbitmq/rabbitmq_client/queue.rb
+    lib/euston-rabbitmq/rabbitmq_client/reactive_message.rb
+    lib/euston-rabbitmq/reflection/constant_loader.rb
+    lib/euston-rabbitmq/reflection/handler_finder.rb
+    lib/euston-rabbitmq/reflection/handler_reference.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/euston/command_handler_binder_spec.rb
+    spec/euston/event_handler_binder_spec.rb
+    spec/euston/exchanges_spec.rb
+    spec/euston/queues_spec.rb
+    spec/euston/retrying_subscription_spec.rb
+    spec/rabbitmq_client/queue_spec.rb
+    spec/reflection/constant_loader_spec.rb
+    spec/reflection/handler_finder_spec.rb
     spec/spec_helper.rb
-    spec/support/factories.rb
+    spec/support/filters.rb
+    spec/support/queue_subscription_thread_harness.rb
+    spec/support/rabbitmqadmin.rb
   ]
   # = MANIFEST =
 
@@ -50,27 +46,20 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
 
   s.add_dependency 'activesupport',               '~> 3.0.0'
-  s.add_dependency 'euston',                      '~> 1.0.0'
+  s.add_dependency 'euston',                      '~> 1.0.1'
   s.add_dependency 'euston-eventstore',           '~> 1.0.0'
   s.add_dependency 'hash-keys',                   '~> 1.0.0'
   s.add_dependency 'hollywood',                   '~> 1.0.0'
+  s.add_dependency 'i18n',                        '~> 0.6.0'
   s.add_dependency 'require_all',                 '~> 1.2.0'
   s.add_dependency 'robustthread',                '~> 0.5.2'
   s.add_dependency 'safely',                      '~> 0.3.0'
 
   if RUBY_PLATFORM.to_s == 'java'
-    s.add_dependency 'jmongo',                    '~> 1.0.0'
     s.add_dependency 'jessica',                   '~> 1.0.0'
-  else
-    s.add_dependency 'amqp',                      '~> 0.8.0'
-    s.add_dependency 'bson_ext',                  '~> 1.3.1'
-    s.add_dependency 'eventmachine',              '~> 0.12.10'
-    s.add_dependency 'mongo',                     '~> 1.3.1'
-    s.add_development_dependency 'evented-spec',  '~> 0.9.0'
   end
 
   s.add_development_dependency 'awesome_print',   '~> 0.4.0'
-  s.add_development_dependency 'faker',           '~> 1.0.0'
   s.add_development_dependency 'fuubar',          '~> 0.0.0'
   s.add_development_dependency 'rspec',           '~> 2.6.0'
 end

data/lib/euston-rabbitmq/{bindings → euston}/command_handler_binder.rb

@@ -9,14 +9,14 @@ module Euston
 
         routing_key = "commands.#{reference.name.to_s.underscore}"
 
-        EUSTON_LOG.debug "Ensuring routing key exists for queue #{queue_name}: #{routing_key}"
+        @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?
+        @log.debug "Ensuring command handler queue exists: #{queue_name}" if @command_handler_queue.nil?
         @command_handler_queue ||= get_queue channel, queue_name
       end
     end

data/lib/euston-rabbitmq/{errors.rb → euston/errors.rb}

@@ -2,4 +2,4 @@ module Euston
   module RabbitMq
     class MessageDecodeFailedError < StandardError; end
   end
-end
+end

data/lib/euston-rabbitmq/{bindings → euston}/event_handler_binder.rb

@@ -6,7 +6,7 @@ module Euston
       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}"
+        @log.debug "Ensuring event handler queue exists: #{queue_name}"
 
         queue = get_queue channel, queue_name
 
@@ -14,15 +14,15 @@ module Euston
 
         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 = 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}"
+          @log.debug "Ensuring routing key exists for queue #{queue_name}: #{routing_key}"
 
           queue.bind exchange, :routing_key => routing_key
         end

data/lib/euston-rabbitmq/{exchanges.rb → euston/exchanges.rb}

@@ -14,4 +14,4 @@ module Euston
       end
     end
   end
-end
+end

data/lib/euston-rabbitmq/{bindings → euston}/handler_binder.rb

@@ -4,8 +4,9 @@ module Euston
       include Euston::RabbitMq::Queues
       include Euston::RabbitMq::Exchanges
 
-      def initialize references
+      def initialize references, logger = Euston::NullLogger.instance
         @references = references
+        @log = logger
       end
 
       def ensure_bindings_exist

data/lib/euston-rabbitmq/{queues.rb → euston/queues.rb}

@@ -10,4 +10,4 @@ module Euston
       end
     end
   end
-end
+end

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

@@ -1,16 +1,17 @@
 module Euston
   module RabbitMq
-    class RetriableSubscription
+    class RetryingSubscription
       include Hollywood
       include Euston::RabbitMq::Queues
       include Euston::RabbitMq::Exchanges
 
-      def initialize channel, queue_name
+      def initialize channel, queue_name, logger = Euston::NullLogger.instance
         @channel = channel
         @queue_name = queue_name
+        @log = logger
       end
 
-      def attach_queue_hook_listeners
+      def subscribe
         queue.when(:message_decode_failed => method(:log_decode_failure),
                    :message_failed        => method(:handle_failure),
                    :message_received      => method(:call_handler))
@@ -20,11 +21,11 @@ module Euston
 
       private
 
-      def call_handler(message)
+      def call_handler message
         callback :message_received, message
       end
 
-      def create_message_failed_message error, failed_message, amqp_header
+      def create_message_failed_message error, failed_message, reactive_message
         {
           :headers =>
           {
@@ -37,14 +38,14 @@ module Euston
           :body =>
           {
             :message => failed_message,
-            :routing_key => amqp_header.method.routing_key,
+            :routing_key => reactive_message.method.routing_key,
             :error => error.message,
             :backtrace => error.backtrace
           }
         }
       end
 
-      def handle_failure message, error, amqp_header
+      def handle_failure message, error, reactive_message
         failures = message[:failures] || 0
         failures = failures + 1
         message[:failures] = failures
@@ -54,38 +55,38 @@ module Euston
             debug_message = "Message failed, out of retries"
 
             message.delete :failures
-            message = create_message_failed_message error, message, amqp_header
+            message = create_message_failed_message error, message, reactive_message
 
             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
+            options = { :key => reactive_message.method.routing_key }
+            exchange = reactive_message.method.routing_key.split('.').first.to_sym
           end
 
           options = default_publish_options.merge options
           exchange = get_exchange @channel, exchange
           message = ActiveSupport::JSON.encode message
 
-          EUSTON_LOG.debug "#{debug_message}: #{message}"
+          @log.debug "#{debug_message}: #{message}"
 
           exchange.publish message, options
 
-          amqp_header.ack
+          reactive_message.ack
         rescue StandardError => e
-          amqp_header.reject :requeue => true
+          reactive_message.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
+        error = Euston::RabbitMq::MessageDecodeFailedError.new text
+        error.set_backtrace error.backtrace
 
-        Safely.report! err
+        raise error
       end
 
       def queue

data/lib/euston-rabbitmq/rabbitmq_client/queue.rb

@@ -0,0 +1,70 @@
+class RabbitMQClient
+  class Queue
+    include Hollywood
+
+    attr_writer :timeout
+
+    def delivery_timeout
+      @timeout ||= 500
+    end
+
+    def safe_subscribe
+      _consumer = self.consumer
+
+      until Thread.current[:stop] do
+        safe_subscribe_with_timeout(_consumer, self.delivery_timeout)
+      end
+    end
+
+    def safe_handle_message reactive_message
+      begin
+        message = parse_json reactive_message.body
+
+        begin
+          callback :message_received, message
+          reactive_message.ack!
+        rescue Euston::EventStore::ConcurrencyError
+          reactive_message.reject! true #requeue
+        rescue => e
+          callback :message_failed, message, e, reactive_message
+          Safely.report! e
+        end
+      rescue => e
+        callback :message_decode_failed, reactive_message.body, e
+        reactive_message.ack!
+        Safely.report! e
+      end
+    end
+
+    def consumer auto_ack = false
+        consumer = QueueingConsumer.new @channel
+        @channel.basic_consume @name, auto_ack, consumer
+        consumer
+    end
+
+    def safe_subscribe_with_timeout consumer, timeout = 500
+      loop do
+        delivery = nil
+        begin
+          delivery = consumer.next_delivery timeout
+        rescue NativeException => e
+          Thread.current[:exception] = e
+          break
+        end
+
+        break if delivery.nil?
+
+        reactive_message = ReactiveMessage.new @channel, delivery, String.from_java_bytes(delivery.get_body)
+        safe_handle_message reactive_message
+
+        @channel.basic_ack(delivery.envelope.delivery_tag, false) if reactive_message.should_acknowledge?
+      end
+    end
+
+    private
+
+    def parse_json json
+      JSON.parse json, :symbolize_names => true
+    end
+  end
+end

data/lib/euston-rabbitmq/rabbitmq_client/reactive_message.rb

@@ -0,0 +1,15 @@
+class RabbitMQClient
+  class ReactiveMessage
+    def reject opts = {}
+      self.reject!(opts.fetch :requeue, true)
+    end
+
+    def ack multiple = false
+      self.ack!
+    end
+
+    def method
+      self.envelope
+    end
+  end
+end

data/lib/euston-rabbitmq/version.rb

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

data/lib/euston-rabbitmq.rb

@@ -1,30 +1,16 @@
-require 'require_all'
-require 'active_support/core_ext/hash/keys'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/json'
 require 'active_support/ordered_hash'
-require 'robustthread'
-
-if RUBY_PLATFORM == 'java'
-  require 'jessica'
-else
-  require 'eventmachine'
-  require 'amqp'
-end
-
 require 'hash-keys'
 require 'hollywood'
+require 'i18n'
+require 'jessica' if RUBY_PLATFORM == 'java'
+require 'require_all'
+require 'safely'
+
 require 'euston'
 require 'euston-eventstore'
 
-require_rel 'euston-rabbitmq/exchanges.rb'
-require_rel 'euston-rabbitmq/queues.rb'
-require_rel 'euston-rabbitmq/**/*.rb'
-
-module Euston
-  module RabbitMq
-    class << self
-      attr_accessor :event_store, :event_store_mongodb, :read_model_mongodb
-    end
-  end
-end
+require_rel 'euston-rabbitmq/reflection'
+require_rel 'euston-rabbitmq/rabbitmq_client'
+require_rel 'euston-rabbitmq/euston'