bunny-mock 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 884e4998df1d5701f0384a2cb1c009d80ed81b67
-  data.tar.gz: 198414bf1eabff599a44310c514cbfa9ce770b0d
+  metadata.gz: ef8cbde025836118928a61e3d8d0b63f736c8b4c
+  data.tar.gz: d88bdce511227d6f4fd7dd4a3b70a38c363374cc
 SHA512:
-  metadata.gz: 868c41d0849c0ea46f2049b15e6ee9122d662f4953089baefc7e35efc37114baff7ea09c6f66bb322a03252820513115526f27e40e2c71c30f312a9526c34e7a
-  data.tar.gz: ee9f02bc843c883b4df2780a3373219bf283d9780219eccea3edc6e7bcfebca177c53806f6a379dba35469c22d2dfc1dc9dec7a2d8462eb8fbad34cc99d69f26
+  metadata.gz: 836978ddc5b9220044e6a3628631e8915e64995099fb86cbb5fe61a11bd9441057d8482919907a4c46c2de4f8b63719cb896f8c4526aae4fb21bcb70f588dec5
+  data.tar.gz: 45658e28e7d45880a424ac9a5132c962757820f74ee6d0f0a2b6e87f8584e23289cf0ea880e47db2e23620189104dbd295622583399a93c271a4a96f1d3d169e

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 _Add contribution here_
 
+## v1.7.0
+
+* [#32](https://github.com/arempe93/bunny-mock/pull/32): Implement reject functionality - [@binaryberry](https://github.com/binaryberry)
+* [#31](https://github.com/arempe93/bunny-mock/pull/31): Add `generate_consumer_tag` to `BunnyMock::Channel` - [@Jakenberg](https://github.com/Jakenberg)
+* [#23](https://github.com/arempe93/bunny-mock/pull/23): Fix queue bind returning an array instead of self - [@fugufish](https://github.com/fugufish)
+
 ## v1.6.0
 
 * [#27](https://github.com/arempe93/bunny-mock/pull/27): Allow `Session#create_channel` to accept additional args - [@eebs](https://github.com/eebs)

data/lib/bunny_mock/channel.rb

@@ -35,7 +35,7 @@ module BunnyMock
       # initialize exchange and queue storage
       @exchanges = {}
       @queues    = {}
-      @acknowledged_state = { pending: {}, acked: {}, nacked: {} }
+      @acknowledged_state = { pending: {}, acked: {}, nacked: {}, rejected: {} }
 
       # set status to opening
       @status = :opening
@@ -103,6 +103,14 @@ module BunnyMock
       @connection.register_exchange xchg_find_or_create(name, opts)
     end
 
+    # Unique string supposed to be used as a consumer tag.
+    #
+    # @return [String]  Unique string.
+    # @api plugin
+    def generate_consumer_tag(name = 'bunny')
+      "#{name}-#{Time.now.to_i * 1000}-#{Kernel.rand(999_999_999_999)}"
+    end
+
     ##
     # Mocks a fanout exchange
     #
@@ -303,13 +311,21 @@ module BunnyMock
     end
 
     ##
-    # Does nothing atm.
+    # Rejects a message. A rejected message can be requeued or
+    # dropped by RabbitMQ.
+    #
+    # @param [Integer] delivery_tag Delivery tag to reject
+    # @param [Boolean] requeue      Should this message be requeued instead of dropping it?
     #
     # @return nil
     # @api public
     #
-    def reject(*)
-      # noop
+    def reject(delivery_tag, requeue = false)
+      if @acknowledged_state[:pending].key?(delivery_tag)
+        delivery, header, body = update_acknowledgement_state(delivery_tag, :rejected)
+        delivery.queue.publish(body, header.to_hash) if requeue
+      end
+      nil
     end
 
     # @endgroup

data/lib/bunny_mock/queue.rb

@@ -123,6 +123,7 @@ module BunnyMock
         # we need the channel to lookup the exchange
         @channel.queue_bind self, opts.fetch(:routing_key, @name), exchange
       end
+      self
     end
 
     ##

data/lib/bunny_mock/version.rb

@@ -3,5 +3,5 @@
 
 module BunnyMock
   # @return [String] Version of the library
-  VERSION = '1.6.0'.freeze
+  VERSION = '1.7.0'.freeze
 end

data/spec/integration/message_acknowledgement_spec.rb

@@ -27,61 +27,88 @@ describe BunnyMock::Channel, 'acknowledgement' do
       expect(@channel.acknowledged_state[:acked]).not_to include(delivery_tag)
     end
 
-    it 'should allow messages which have been nacked to be identified' do
-      queue.publish 'Message to nack'
-      delivery_tag = delivery_tags['Message to nack']
-      @channel.nack delivery_tag
+    context 'when using nack to negatively acknowledge' do
+      it 'should allow messages which have been nacked to be identified' do
+        queue.publish 'Message to nack'
+        delivery_tag = delivery_tags['Message to nack']
+        @channel.nack delivery_tag
+
+        expect(@channel.acknowledged_state[:pending]).not_to include(delivery_tag)
+        expect(@channel.acknowledged_state[:acked]).not_to include(delivery_tag)
+        expect(@channel.acknowledged_state[:nacked]).to include(delivery_tag)
+      end
 
-      expect(@channel.acknowledged_state[:pending]).not_to include(delivery_tag)
-      expect(@channel.acknowledged_state[:acked]).not_to include(delivery_tag)
-      expect(@channel.acknowledged_state[:nacked]).to include(delivery_tag)
-    end
+      it 'should requeue messages with have been nacked with `requeue` = true' do
+        queue.publish 'Message to nack'
+        delivery_tag = delivery_tags['Message to nack']
+        @channel.nack delivery_tag, false, true
+        new_delivery_tag = delivery_tags['Message to nack']
 
-    it 'should requeue messages with have been nacked with `requeue` = true' do
-      queue.publish 'Message to nack'
-      delivery_tag = delivery_tags['Message to nack']
-      @channel.nack delivery_tag, false, true
-      new_delivery_tag = delivery_tags['Message to nack']
+        expect(@channel.acknowledged_state[:pending]).not_to include(delivery_tag)
+        expect(@channel.acknowledged_state[:acked]).not_to include(delivery_tag)
+        expect(@channel.acknowledged_state[:nacked]).to include(delivery_tag)
 
-      expect(@channel.acknowledged_state[:pending]).not_to include(delivery_tag)
-      expect(@channel.acknowledged_state[:acked]).not_to include(delivery_tag)
-      expect(@channel.acknowledged_state[:nacked]).to include(delivery_tag)
+        expect(@channel.acknowledged_state[:pending]).to include(new_delivery_tag)
+      end
 
-      expect(@channel.acknowledged_state[:pending]).to include(new_delivery_tag)
-    end
+      it 'should allow multiple messages to be acked when `multiple` = true' do
+        queue.publish 'Message to be automatically acked'
+        delivery_tag_1 = delivery_tags['Message to be automatically acked']
+        queue.publish 'Message to acked'
+        delivery_tag_2 = delivery_tags['Message to acked']
+        queue.publish 'Message to be left as pending'
+        delivery_tag_3 = delivery_tags['Message to be left as pending']
+
+        @channel.ack delivery_tag_2, true
+
+        expect(@channel.acknowledged_state[:pending]).not_to include(delivery_tag_1)
+        expect(@channel.acknowledged_state[:pending]).not_to include(delivery_tag_2)
+        expect(@channel.acknowledged_state[:pending]).to include(delivery_tag_3)
+        expect(@channel.acknowledged_state[:acked]).to include(delivery_tag_1)
+        expect(@channel.acknowledged_state[:acked]).to include(delivery_tag_2)
+      end
 
-    it 'should allow multiple messages to be acked when `multiple` = true' do
-      queue.publish 'Message to be automatically acked'
-      delivery_tag_1 = delivery_tags['Message to be automatically acked']
-      queue.publish 'Message to acked'
-      delivery_tag_2 = delivery_tags['Message to acked']
-      queue.publish 'Message to be left as pending'
-      delivery_tag_3 = delivery_tags['Message to be left as pending']
-
-      @channel.ack delivery_tag_2, true
-
-      expect(@channel.acknowledged_state[:pending]).not_to include(delivery_tag_1)
-      expect(@channel.acknowledged_state[:pending]).not_to include(delivery_tag_2)
-      expect(@channel.acknowledged_state[:pending]).to include(delivery_tag_3)
-      expect(@channel.acknowledged_state[:acked]).to include(delivery_tag_1)
-      expect(@channel.acknowledged_state[:acked]).to include(delivery_tag_2)
+      it 'should allow multiple messages to be nacked when `multiple` = true' do
+        queue.publish 'Message to be automatically nacked'
+        delivery_tag_1 = delivery_tags['Message to be automatically nacked']
+        queue.publish 'Message to nacked'
+        delivery_tag_2 = delivery_tags['Message to nacked']
+        queue.publish 'Message to be left as pending'
+        delivery_tag_3 = delivery_tags['Message to be left as pending']
+
+        @channel.nack delivery_tag_2, true
+
+        expect(@channel.acknowledged_state[:pending]).not_to include(delivery_tag_1)
+        expect(@channel.acknowledged_state[:pending]).not_to include(delivery_tag_2)
+        expect(@channel.acknowledged_state[:pending]).to include(delivery_tag_3)
+        expect(@channel.acknowledged_state[:nacked]).to include(delivery_tag_1)
+        expect(@channel.acknowledged_state[:nacked]).to include(delivery_tag_2)
+      end
     end
 
-    it 'should allow multiple messages to be nacked when `multiple` = true' do
-      queue.publish 'Message to be automatically nacked'
-      delivery_tag_1 = delivery_tags['Message to be automatically nacked']
-      queue.publish 'Message to nacked'
-      delivery_tag_2 = delivery_tags['Message to nacked']
-      queue.publish 'Message to be left as pending'
-      delivery_tag_3 = delivery_tags['Message to be left as pending']
-
-      @channel.nack delivery_tag_2, true
-
-      expect(@channel.acknowledged_state[:pending]).not_to include(delivery_tag_1)
-      expect(@channel.acknowledged_state[:pending]).not_to include(delivery_tag_2)
-      expect(@channel.acknowledged_state[:pending]).to include(delivery_tag_3)
-      expect(@channel.acknowledged_state[:nacked]).to include(delivery_tag_1)
-      expect(@channel.acknowledged_state[:nacked]).to include(delivery_tag_2)
+    context 'when using reject to negatively acknowledge' do
+      it 'should allow messages which have been nacked to be identified' do
+        queue.publish 'Message to reject'
+        delivery_tag = delivery_tags['Message to reject']
+        @channel.reject delivery_tag
+
+        expect(@channel.acknowledged_state[:pending]).not_to include(delivery_tag)
+        expect(@channel.acknowledged_state[:acked]).not_to include(delivery_tag)
+        expect(@channel.acknowledged_state[:rejected]).to include(delivery_tag)
+      end
+
+      it 'should requeue messages with have been rejected with `requeue` = true' do
+        queue.publish 'Message to reject'
+        delivery_tag = delivery_tags['Message to reject']
+        @channel.reject delivery_tag, true
+        new_delivery_tag = delivery_tags['Message to reject']
+
+        expect(@channel.acknowledged_state[:pending]).not_to include(delivery_tag)
+        expect(@channel.acknowledged_state[:acked]).not_to include(delivery_tag)
+        expect(@channel.acknowledged_state[:rejected]).to include(delivery_tag)
+
+        expect(@channel.acknowledged_state[:pending]).to include(new_delivery_tag)
+      end
     end
   end
 end

data/spec/unit/bunny_mock/queue_spec.rb

@@ -39,6 +39,11 @@ describe BunnyMock::Queue do
     it 'should raise error when exchange does not exists' do
       expect { @receiver.bind('this.xchg.does.not.exist') }.to raise_exception(Bunny::NotFound)
     end
+
+    it 'should return self' do
+      expect(@receiver.bind(@source)).to eq @receiver
+    end
+
   end
 
   context '#unbind' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bunny-mock
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Andrew Rempe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-10 00:00:00.000000000 Z
+date: 2017-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -188,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Mocking for the popular Bunny client for RabbitMQ