message-driver 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50d3e0ad81f5bd85c9bbedffba83a385e3eacbbb
-  data.tar.gz: 10e8e998f50aeaf99cd309d413846945d6574792
+  metadata.gz: 37e87665e5236aa222f318953697cdd22afb4db9
+  data.tar.gz: 3ad5849abc80a63269e6425a3c4c81cc06694be4
 SHA512:
-  metadata.gz: 2a41aa665e9b2598d13815f7a0968ee16c3d2dd00ca49548b2115633e4e1556576e1c94d5bb3e86c43dbf5cef9459da6375eee2372ffab72ddd1711ac88a4327
-  data.tar.gz: 15baeb722f77d49dd2aedb4de7b4f20c13835a7944d646b106fc2168b590b8561dec4a34b148a0a61039ec40588855dd02c2463750b3d7cabddbf6096637574e
+  metadata.gz: 484d9c907162ac6b4b23829293daa8ee15e852104f823549306f8437448ecd34ff3e4b3f00c8aa2e07cb35a921e913fdac8ba0a6a70a02e21db33979d4441d84
+  data.tar.gz: 8885281a32669a94934c10e545663ee4a2888655b104bf0182edf90aff2d424c32f53447e53f1c9778c72249c8e7176651523c80770a9e8af9ad2af00cc3306e

data/.travis.yml

@@ -17,7 +17,8 @@ env:
   - ADAPTER=in_memory
   - ADAPTER=bunny:1.2.2
   - ADAPTER=bunny:1.3.1
-  - ADAPTER=bunny:1.4.0
+  - ADAPTER=bunny:1.4.1
+  - ADAPTER=bunny:1.5.0
   - ADAPTER=stomp
 matrix:
   allow_failures:

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.5.2 - 2014-10-14
+
+* fix deprecation warning with bunny 1.5.0
+
 ## 0.5.1 - 2014-10-08
 
 * put version constant under correct module

data/features/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.5.2 - 2014-10-14
+
+* fix deprecation warning with bunny 1.5.0
+
 ## 0.5.1 - 2014-10-08
 
 * put version constant under correct module

data/lib/message_driver/adapters/bunny_adapter.rb

@@ -150,7 +150,7 @@ module MessageDriver
           end
           @sub_ctx = adapter.new_subscription_context(self)
           @error_handler = options[:error_handler]
-          @message_handler =  case options[:ack]
+          @message_handler =  case options.delete(:ack)
                               when :auto, nil
                                 AutoAckHandler.new(self)
                               when :manual
@@ -238,7 +238,8 @@ module MessageDriver
           @sub_ctx.with_channel do |ch|
             queue = destination.bunny_queue(@sub_ctx.channel)
             ch.prefetch(options[:prefetch_size]) if options.key? :prefetch_size
-            @bunny_consumer = queue.subscribe(options.merge(manual_ack: true)) do |delivery_info, properties, payload|
+            sub_opts = options.merge(adapter.ack_key => true)
+            @bunny_consumer = queue.subscribe(sub_opts) do |delivery_info, properties, payload|
               adapter.broker.client.with_adapter_context(@sub_ctx) do
                 message = @sub_ctx.args_to_message(delivery_info, properties, payload, destination)
                 @message_handler.call(message)
@@ -252,8 +253,11 @@ module MessageDriver
         validate_bunny_version
         @broker = broker
         @config = config
+        @ack_key = Bunny::VERSION >= '1.5.0' ? :manual_ack : :ack
       end
 
+      attr_reader :ack_key
+
       def connection(ensure_started = true)
         if ensure_started
           begin
@@ -391,7 +395,7 @@ module MessageDriver
           with_channel(false) do |ch|
             queue = ch.queue(destination.name, passive: true)
 
-            message = queue.pop(ack: options.fetch(:client_ack, false))
+            message = queue.pop(adapter.ack_key => options.fetch(:client_ack, false))
             if message.nil? || message[0].nil?
               nil
             else

data/lib/message_driver/version.rb

@@ -1,3 +1,3 @@
 module MessageDriver
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

data/spec/integration/bunny/bunny_adapter_spec.rb

@@ -33,7 +33,7 @@ module MessageDriver
               include_examples 'raises an error'
             end
           end
-          %w(1.2.2 1.3.2 1.4.0).each do |v|
+          %w(1.2.2 1.3.2 1.4.0 1.5.0).each do |v|
             context "bunny version #{v}" do
               let(:version) { v }
               include_examples "doesn't raise an error"
@@ -79,6 +79,27 @@ module MessageDriver
         include_context 'a connected bunny adapter'
       end
 
+      describe '#ack_key' do
+        include_context 'a connected bunny adapter'
+
+        context 'when bunny version is 1.5.0 or later' do
+          before do
+            stub_const('Bunny::VERSION', '1.5.0')
+          end
+          it 'should be :manual_ack' do
+            expect(adapter.ack_key).to eq(:manual_ack)
+          end
+        end
+        context 'when bunny version earlier than 1.5.0' do
+          before do
+            stub_const('Bunny::VERSION', '1.4.1')
+          end
+          it 'should be :manual_ack' do
+            expect(adapter.ack_key).to eq(:ack)
+          end
+        end
+      end
+
       describe '#new_context' do
         include_context 'a connected bunny adapter'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: message-driver
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Matt Campbell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake