euston-rabbitmq 1.1.0 → 1.2.1

data/Gemfile

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

data/euston-rabbitmq.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'euston-rabbitmq'
-  s.version     = '1.1.0'
+  s.version     = '1.2.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']
@@ -21,8 +21,8 @@ Gem::Specification.new do |s|
     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/hot_bunnies/queue.rb
+    lib/euston-rabbitmq/hot_bunnies/reactive_message.rb
     lib/euston-rabbitmq/reflection/constant_loader.rb
     lib/euston-rabbitmq/reflection/handler_finder.rb
     lib/euston-rabbitmq/reflection/handler_reference.rb
@@ -44,13 +44,13 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
 
-  s.add_dependency 'activesupport',               '~> 3.0.10'
-  s.add_dependency 'euston',                      '~> 1.1.0'
-  s.add_dependency 'euston-eventstore',           '~> 1.1.0'
+  s.add_dependency 'activesupport',               '>= 3.0.10'
+  s.add_dependency 'euston',                      '~> 1.2.0'
+  s.add_dependency 'euston-eventstore',           '~> 1.2.0'
   s.add_dependency 'hash-keys',                   '~> 1.0.0'
   s.add_dependency 'hollywood',                   '~> 1.0.0'
-  s.add_dependency 'i18n',                        '~> 0.5.0'
-  s.add_dependency 'jessica',                     '~> 1.0.0' if RUBY_PLATFORM.to_s == 'java'
+  s.add_dependency 'i18n',                        '>= 0.5.0'
+  s.add_dependency 'hot_bunnies',                 '~> 1.3.0.pre1' if RUBY_PLATFORM.to_s == 'java'
   s.add_dependency 'safely',                      '~> 0.3.0'
 
   s.add_development_dependency 'awesome_print',     '~> 0.4.0'

data/lib/euston-rabbitmq.rb

@@ -4,7 +4,7 @@ require 'active_support/ordered_hash'
 require 'hash-keys'
 require 'hollywood'
 require 'i18n'
-require 'jessica' if RUBY_PLATFORM == 'java'
+require 'hot_bunnies' if RUBY_PLATFORM == 'java'
 require 'safely'
 
 require 'euston'
@@ -14,8 +14,8 @@ require 'euston-rabbitmq/reflection/constant_loader'
 require 'euston-rabbitmq/reflection/handler_finder'
 require 'euston-rabbitmq/reflection/handler_reference'
 
-require 'euston-rabbitmq/rabbitmq_client/reactive_message'
-require 'euston-rabbitmq/rabbitmq_client/queue'
+require 'euston-rabbitmq/hot_bunnies/reactive_message'
+require 'euston-rabbitmq/hot_bunnies/queue'
 
 require 'euston-rabbitmq/euston/errors'
 require 'euston-rabbitmq/euston/exchanges'

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

@@ -1,23 +1,33 @@
 module Euston
   module RabbitMq
     class CommandHandlerBinder < HandlerBinder
+      include AggregateRootPrivateMethodNames
+
       private
 
-      def ensure_bindings_exist_for_reference channel, reference
+      def ensure_bindings_exist_for_reference reference
         queue_name = :command_handlers
-        queue = get_command_handler_queue channel, queue_name
+        queue = get_command_handler_queue @channel, queue_name
+
+        if reference.handler.included_modules.include? AggregateRoot
+          routing_keys = reference.handler.instance_methods.map { |m| self.class.consumes_regex.match m }.compact.map { |m| m[1] }
+        else
+          routing_keys = ["#{reference.name.to_s.underscore}"]
+        end
 
-        routing_key = "commands.#{reference.name.to_s.underscore}"
+        exchange = get_exchange @channel, :commands
 
-        @log.debug "Ensuring routing key exists for queue #{queue_name}: #{routing_key}"
+        routing_keys.each do |routing_key|
+          routing_key = "commands.#{routing_key}"
 
-        exchange = get_exchange channel, :commands
-        queue.bind exchange, :routing_key => routing_key
+          @log.debug "Ensuring routing key exists for queue #{queue_name}: #{routing_key}"
+          queue.bind exchange, :routing_key => routing_key
+        end
       end
 
       def get_command_handler_queue channel, queue_name
         @log.debug "Ensuring command handler queue exists: #{queue_name}" if @command_handler_queue.nil?
-        @command_handler_queue ||= get_queue channel, queue_name
+        @command_handler_queue ||= get_queue @channel, queue_name
       end
     end
   end

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

@@ -3,12 +3,12 @@ module Euston
     class EventHandlerBinder < HandlerBinder
       private
 
-      def ensure_bindings_exist_for_reference channel, reference
+      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
+        queue = get_queue @channel, queue_name
 
         prefix = '__event_handler__'
 
@@ -17,7 +17,7 @@ module Euston
         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
+        exchange = get_exchange @channel, :events
 
         methods.uniq.each do |method|
           routing_key = "events.#{method}"

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

@@ -10,7 +10,7 @@ module Euston
       end
 
       def get_exchange channel, name, opts = {}
-        channel.topic name.to_s, default_exchange_options.merge(opts)
+        channel.exchange name.to_s, default_exchange_options.merge(:type => :topic).merge(opts)
       end
     end
   end

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

@@ -4,21 +4,15 @@ module Euston
       include Euston::RabbitMq::Queues
       include Euston::RabbitMq::Exchanges
 
-      def initialize references, logger = Euston::NullLogger.instance
+      def initialize channel, references, logger = Euston::NullLogger.instance
+        @channel = channel
         @references = references
         @log = logger
       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?
+        @references.each do |reference|
+          ensure_bindings_exist_for_reference reference
         end
       end
     end

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

@@ -12,13 +12,13 @@ module Euston
       end
 
       def subscribe
-        queue.when(:message_decode_failed => method(:log_decode_failure),
-                   :message_failed        => method(:handle_failure),
-                   :message_received      => method(:call_handler))
-
         queue.safe_subscribe
       end
 
+      def get
+        queue.safe_get
+      end
+
       private
 
       def call_handler message
@@ -38,7 +38,7 @@ module Euston
           :body =>
           {
             :message => failed_message,
-            :routing_key => reactive_message.method.routing_key,
+            :routing_key => reactive_message.headers.routing_key,
             :error => error.message,
             :backtrace => error.backtrace
           }
@@ -46,51 +46,56 @@ module Euston
       end
 
       def handle_failure message, error, reactive_message
+        return reactive_message.reject if error.is_a? Euston::EventStore::ConcurrencyError
+
         failures = message[:failures] || 0
         failures = failures + 1
         message[:failures] = failures
 
         begin
-          if failures == 3
+          if failures == 5
             debug_message = "Message failed, out of retries"
 
             message.delete :failures
             message = create_message_failed_message error, message, reactive_message
 
-            options = { :key => 'events.message_failed' }
+            options = { :routing_key => 'events.message_failed' }
             exchange = :events
           else
             debug_message = "Message failed, retrying"
-
-            options = { :key => reactive_message.method.routing_key }
-            exchange = reactive_message.method.routing_key.split('.').first.to_sym
+            options = { :routing_key => reactive_message.headers.routing_key }
+            exchange = reactive_message.headers.routing_key.split('.').first.to_sym
           end
 
           options = default_publish_options.merge options
           exchange = get_exchange @channel, exchange
           message = ActiveSupport::JSON.encode message
-
-          @log.debug "#{debug_message}: #{message}"
-
           exchange.publish message, options
 
           reactive_message.ack
         rescue StandardError => e
-          reactive_message.reject :requeue => true
+          reactive_message.reject
           raise e
         end
       end
 
       def log_decode_failure message, error
         text = "A handler queue subscription failed. [Error] #{error.message} [Payload] #{message}"
-        error = Euston::RabbitMq::MessageDecodeFailedError.new text
-        error.set_backtrace error.backtrace
+        wrapper = Euston::RabbitMq::MessageDecodeFailedError.new text
+        wrapper.set_backtrace error.backtrace
 
-        raise error
+        raise wrapper
       end
 
       def queue
-        @queue ||= get_queue @channel, @queue_name
+        if @queue.nil?
+          @queue = get_queue @channel, @queue_name
+          @queue.when(:message_decode_failed => method(:log_decode_failure),
+                      :message_failed        => method(:handle_failure),
+                      :message_received      => method(:call_handler))
+        end
+
+        @queue
       end
     end
   end

data/lib/euston-rabbitmq/{rabbitmq_client → hot_bunnies}/queue.rb

@@ -1,19 +1,22 @@
-class RabbitMQClient
+module HotBunnies
   class Queue
     include Hollywood
 
     attr_writer :timeout
 
+    def consumer auto_ack = false
+      consumer = QueueingConsumer.new @channel
+      @channel.basic_consume @name, auto_ack, consumer
+      consumer
+    end
+
     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
+    def safe_get
+      message = get :ack => true
+      safe_handle_message ReactiveMessage.new(@channel, *message) unless message.nil?
     end
 
     def safe_handle_message reactive_message
@@ -22,29 +25,33 @@ class RabbitMQClient
 
         begin
           callback :message_received, message
-          reactive_message.ack!
+          reactive_message.ack
         rescue Euston::EventStore::ConcurrencyError
-          reactive_message.reject! true #requeue
+          reactive_message.reject #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!
+        reactive_message.ack
         Safely.report! e
       end
+
+      reactive_message.headers.ack unless reactive_message.reacted?
     end
 
-    def consumer auto_ack = false
-        consumer = QueueingConsumer.new @channel
-        @channel.basic_consume @name, auto_ack, consumer
-        consumer
+    def safe_subscribe
+      _consumer = self.consumer
+
+      until Thread.current[:stop] do
+        safe_subscribe_with_timeout _consumer, self.delivery_timeout
+      end
     end
 
     def safe_subscribe_with_timeout consumer, timeout = 500
       loop do
         delivery = nil
+
         begin
           delivery = consumer.next_delivery timeout
         rescue NativeException => e
@@ -54,10 +61,11 @@ class RabbitMQClient
 
         break if delivery.nil?
 
-        reactive_message = ReactiveMessage.new @channel, delivery, String.from_java_bytes(delivery.get_body)
-        safe_handle_message reactive_message
+        headers = Headers.new @channel, nil, delivery.envelope, delivery.properties
+        body = String.from_java_bytes(delivery.get_body)
 
-        @channel.basic_ack(delivery.envelope.delivery_tag, false) if reactive_message.should_acknowledge?
+        reactive_message = ReactiveMessage.new @channel, headers, body
+        safe_handle_message reactive_message
       end
     end
 

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

@@ -0,0 +1,26 @@
+module HotBunnies
+  class ReactiveMessage
+    attr_reader :headers, :body
+
+    def initialize channel, headers, body
+      @channel = channel
+      @headers = headers
+      @body = body
+      @reacted = false
+    end
+
+    def ack opts = {}
+      @headers.ack({ :multiple => false }.merge(opts))
+      @reacted = true
+    end
+
+    def reject opts = {}
+      @headers.reject({ :requeue => true }.merge(opts))
+      @reacted = true
+    end
+
+    def reacted?
+      @reacted
+    end
+  end
+end

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

@@ -1,10 +1,11 @@
 module Euston
   module RabbitMq
     class HandlerFinder
-      def initialize required_mixins = []
+      def initialize required_mixins = [], logger = Euston::NullLogger.instance
         @namespaces = []
         @constant_loader = ConstantLoader.new.when(:hit => method(:store_found_constant), :miss => method(:log_failed_lookup))
         @required_mixins = required_mixins
+        @log = logger
       end
 
       attr_reader :namespaces
@@ -32,7 +33,7 @@ module Euston
       end
 
       def log_failed_lookup string
-        EUSTON_LOG.warn "Couldn't find handler namespace: #{string}" if Object.const_defined?('EUSTON_LOG')
+        @log.warn "Couldn't find handler namespace: #{string}"
       end
 
       def map_namespaces_to_references
@@ -41,7 +42,7 @@ module Euston
         @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 = nil unless @required_mixins.empty? || @required_mixins.any? { |mixin| reference.handler.included_modules.include? mixin }
             reference
           end.to_a - [nil])
         end

data/lib/euston-rabbitmq/version.rb

@@ -1,5 +1,5 @@
 module Euston
   module RabbitMq
-    VERSION = "1.1.0"
+    VERSION = "1.2.1"
   end
 end

data/spec/euston/command_handler_binder_spec.rb

@@ -12,8 +12,8 @@ describe 'command handler binder', :rabbitmq do
 
   let(:handler)           { CommandHandlerBinderTesting::AbcHandler }
   let(:handler_finder)    { Euston::RabbitMq::HandlerFinder.new.tap { |f| f.namespaces.push 'CommandHandlerBinderTesting' } }
-  let(:binder)            { Euston::RabbitMq::CommandHandlerBinder.new handler_finder.find }
-  let(:bindings)          { @rabbitmqadmin.list_bindings AMQP_OPTS[:vhost] }
+  let(:binder)            { Euston::RabbitMq::CommandHandlerBinder.new @channel, handler_finder.find }
+  let(:bindings)          { @rabbitmqadmin.list_bindings @amqp_config[:vhost] }
 
   before { binder.ensure_bindings_exist }
 

data/spec/euston/event_handler_binder_spec.rb

@@ -22,8 +22,8 @@ describe 'event handler binder', :rabbitmq do
 
   let(:handler)           { EventHandlerBinderTesting::XyzHandler }
   let(:handler_finder)    { Euston::RabbitMq::HandlerFinder.new.tap { |f| f.namespaces.push 'EventHandlerBinderTesting' } }
-  let(:binder)            { Euston::RabbitMq::EventHandlerBinder.new handler_finder.find }
-  let(:bindings)          { @rabbitmqadmin.list_bindings AMQP_OPTS[:vhost] }
+  let(:binder)            { Euston::RabbitMq::EventHandlerBinder.new @channel, handler_finder.find }
+  let(:bindings)          { @rabbitmqadmin.list_bindings @amqp_config[:vhost] }
 
   before { binder.ensure_bindings_exist }
 

data/spec/euston/exchanges_spec.rb

@@ -13,15 +13,5 @@ describe 'exchanges', :rabbitmq do
     subject { get_exchange @channel, :events }
     its(:name) { should == 'events' }
   end
-
-  context 'obtaining the same exchange instance' do
-    let(:name)       { "exchange_#{Time.now.to_i}" }
-    let(:instance_1) { get_exchange @channel, name }
-    let(:instance_2) { get_exchange @channel, name }
-
-    subject { instance_1 }
-
-    it { should equal instance_2 }
-  end
 end
 end

data/spec/euston/queues_spec.rb

@@ -11,14 +11,5 @@ describe 'queues', :rabbitmq do
 
     its(:name) { should == name }
   end
-
-  context 'obtaining the same queue instance' do
-    let(:instance_1) { get_queue(@channel, name) }
-    let(:instance_2) { get_queue(@channel, name) }
-
-    subject { instance_1 }
-
-    it { should equal instance_2 }
-  end
 end
 end

data/spec/euston/retrying_subscription_spec.rb

@@ -15,13 +15,13 @@ describe 'retrying subscription', :rabbitmq do
   let(:message)                               { { :x => 123 } }
   let(:routing_key)                           { 'events.failing' }
   let(:error)                                 { 'kablammo' }
+  let(:thread_channel)                        { @amqp_connection.create_channel }
 
   before do
     failing_handler_queue.bind        events_exchange, :routing_key => routing_key
     failed_message_handler_queue.bind events_exchange, :routing_key => 'events.message_failed'
 
-    @thread = Thread.new(failing_queue_name, fail_limit, outcomes) do |name, fail_limit, outcomes|
-      channel = AMQP::Channel.new
+    @thread = Thread.new(thread_channel, failing_queue_name, fail_limit, outcomes) do |channel, name, fail_limit, outcomes|
       subscription = Euston::RabbitMq::RetryingSubscription.new channel, name
       subscription.when(:message_received => ->(body) { outcomes[:attempts_to_handle] += 1; raise error if outcomes[:attempts_to_handle] <= fail_limit })
       subscription.subscribe
@@ -31,7 +31,7 @@ describe 'retrying subscription', :rabbitmq do
     failing_message_handler_queue_harness.when(:message_received => ->(body) { outcomes[:failure] = body })
     failing_message_handler_queue_harness.startup
 
-    events_exchange.publish ActiveSupport::JSON.encode(message), { :key => routing_key }
+    events_exchange.publish ActiveSupport::JSON.encode(message), { :routing_key => routing_key }
 
     sleep 0.25
   end
@@ -39,6 +39,7 @@ describe 'retrying subscription', :rabbitmq do
   after do
     failing_message_handler_queue_harness.shutdown
     @thread.kill
+    thread_channel.close
   end
 
   subject { outcomes }

data/spec/rabbitmq_client/queue_spec.rb

@@ -24,7 +24,7 @@ describe 'queue', :rabbitmq do
        sleep 0.25
     end
 
-    let(:exchange) { @channel.topic "test-#{Time.now.to_i - 1}", :durable => true, :nowait => false }
+    let(:exchange) { @channel.exchange "test-#{Time.now.to_i - 1}", :durable => true, :nowait => false, :type => :topic }
     let(:harness)  { QueueSubscriptionThreadHarness.new queue }
 
     before do

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'ap'
+require 'logger'
 require 'rabbitmqadmin-cli'
 require 'euston-rabbitmq'
 
@@ -14,21 +15,32 @@ if jruby?
   require File.expand_path('../support/queue_subscription_thread_harness', __FILE__)
   require File.expand_path('../support/filters', __FILE__)
 
-  AMQP_OPTS = { :host  => 'localhost',
-                :pass  => 'password',
-                :user  => 'euston-rabbitmq-test',
-                :vhost => 'euston-rabbitmq-test' }
+  amqp_config = { :host  => 'localhost',
+                  :pass  => 'password',
+                  :user  => 'euston-rabbitmq-test',
+                  :vhost => 'euston-rabbitmq-test' }
 
   RSpec.configure do |config|
     config.treat_symbols_as_metadata_keys_with_true_values = true
 
-    config.before(:each, :amqp) do
-      initialize_amqp
+    config.before(:all, :rabbitmq) do
+      @amqp_config = amqp_config
     end
 
     config.before(:each, :rabbitmq) do
-      initialize_rabbitmq
-      initialize_amqp
+      initialize_rabbitmq amqp_config
+
+      @amqp_connection = HotBunnies.connect(:host => amqp_config[:host],
+                                            :virtual_host => amqp_config[:vhost],
+                                            :username => amqp_config[:user],
+                                            :password => amqp_config[:pass])
+
+      @channel = @amqp_connection.create_channel
+    end
+
+    config.after(:each, :rabbitmq) do
+      @channel.close
+      @amqp_connection.close
     end
   end
 end

data/spec/support/filters.rb

@@ -1,10 +1,5 @@
-def initialize_amqp
-  AMQP.settings.merge! AMQP_OPTS
-  @channel = AMQP::Channel.new
-end
-
-def initialize_rabbitmq
+def initialize_rabbitmq amqp_config
   @rabbitmqadmin = RabbitMqAdminCli.new
-  @rabbitmqadmin.initialize_vhost AMQP_OPTS[:vhost]
-  @rabbitmqadmin.initialize_user  AMQP_OPTS[:vhost], AMQP_OPTS[:user], AMQP_OPTS[:pass]
+  @rabbitmqadmin.initialize_vhost amqp_config[:vhost]
+  @rabbitmqadmin.initialize_user  amqp_config[:vhost], amqp_config[:user], amqp_config[:pass]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: euston-rabbitmq
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,44 +10,44 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-03 00:00:00.000000000 Z
+date: 2011-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &84335980 !ruby/object:Gem::Requirement
+  requirement: &84701010 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *84335980
+  version_requirements: *84701010
 - !ruby/object:Gem::Dependency
   name: euston
-  requirement: &84335140 !ruby/object:Gem::Requirement
+  requirement: &84700770 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *84335140
+  version_requirements: *84700770
 - !ruby/object:Gem::Dependency
   name: euston-eventstore
-  requirement: &84334370 !ruby/object:Gem::Requirement
+  requirement: &84700540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *84334370
+  version_requirements: *84700540
 - !ruby/object:Gem::Dependency
   name: hash-keys
-  requirement: &84333860 !ruby/object:Gem::Requirement
+  requirement: &84700310 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *84333860
+  version_requirements: *84700310
 - !ruby/object:Gem::Dependency
   name: hollywood
-  requirement: &84332670 !ruby/object:Gem::Requirement
+  requirement: &84700080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,21 +66,21 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *84332670
+  version_requirements: *84700080
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &84332210 !ruby/object:Gem::Requirement
+  requirement: &84699850 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *84332210
+  version_requirements: *84699850
 - !ruby/object:Gem::Dependency
   name: safely
-  requirement: &84331730 !ruby/object:Gem::Requirement
+  requirement: &84699610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *84331730
+  version_requirements: *84699610
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &84331020 !ruby/object:Gem::Requirement
+  requirement: &84699380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *84331020
+  version_requirements: *84699380
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &84125840 !ruby/object:Gem::Requirement
+  requirement: &84699150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 0.0.0
   type: :development
   prerelease: false
-  version_requirements: *84125840
+  version_requirements: *84699150
 - !ruby/object:Gem::Dependency
   name: rabbitmqadmin-cli
-  requirement: &84125000 !ruby/object:Gem::Requirement
+  requirement: &84698920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *84125000
+  version_requirements: *84698920
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &84124570 !ruby/object:Gem::Requirement
+  requirement: &84698690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,7 +132,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *84124570
+  version_requirements: *84698690
 description: JRuby RabbitMq bindings
 email:
 - lee.m.henson@gmail.com
@@ -152,8 +152,8 @@ files:
 - 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/hot_bunnies/queue.rb
+- lib/euston-rabbitmq/hot_bunnies/reactive_message.rb
 - lib/euston-rabbitmq/reflection/constant_loader.rb
 - lib/euston-rabbitmq/reflection/handler_finder.rb
 - lib/euston-rabbitmq/reflection/handler_reference.rb

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

@@ -1,15 +0,0 @@
-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