bunny-mock 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d54d4507d1c57efad12f4d1525154cde983b98b7
-  data.tar.gz: d5986217aed023311d8ac3903627d36cbead2a10
+  metadata.gz: c50a06b6ad300048718d1da4576cf4aa26bb3f7a
+  data.tar.gz: d3a46df9f089b40a09bf763a55dec107f1adde22
 SHA512:
-  metadata.gz: 58a3e975090251bcbe4dcf40d4534e1c2382e151b50280a59d2524a20485a30c9bfff7ed34af448f3a5fbce9c481aa0fcc0f4184568c98caa73eac06bf013905
-  data.tar.gz: 81960ae54b49872107f122ed8c681934392940dd3698fe0c20a3736fbf3aafd8244925edae01858b3b0133af99a1cb880c3759ae730076bd7873f105f52a2208
+  metadata.gz: a66ab64795f09af460aecb30c702a177caeed40f20603a2680bdccbc8c2307f6c312fb73ec1de039c4a787c21bf671569ae7ecacae9e59143e238d27b174e852
+  data.tar.gz: fa47402ad74277744d11cbf0c560476ea507379b385d0ab2453f0d5ba1589d4938777244cd9b86a7241d608f47ade3b8535f5aa200217d3e9ef513ca480a0a44

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## Next release
+
+_Add contribution here_
+
+## v1.5.0
+
+*[#20](https://github.com/arempe93/bunny-mock/pull/20): Adds implementation of `Queue#subscribe` - [@baelter](https://github.com/baelter)
+
 ## v1.4.0
 
 * [#19](https://github.com/arempe93/bunny-mock/pull/12): Adds support for JRuby with Bunny 1.7.0 - [@TimothyMDean](https://github.com/TimothyMDean)

data/README.md

@@ -163,7 +163,7 @@ View the documentation on [RubyDoc](http://www.rubydoc.info/github/arempe93/bunn
 
 * [Bunny](https://github.com/ruby-amqp/bunny) - To use original exception classes
 
-* Ruby version >= 2.0 (A requirement of Bunny)
+* ~~Ruby version >= 2.0 (A requirement of Bunny)~~ Now works with other Ruby versions (even JRuby!) thanks to **[@TimothyMDean](https://github.com/TimothyMDean)**
 
 ## License
 

data/lib/bunny_mock/channel.rb

@@ -235,6 +235,46 @@ module BunnyMock
       # noop
     end
 
+    ##
+    # Does nothing atm.
+    #
+    # @return nil
+    # @api public
+    #
+    def prefetch(*)
+      # noop
+    end
+
+    ##
+    # Does not actually wait, but always return true.
+    #
+    # @return true
+    # @api public
+    #
+    def wait_for_confirms(*)
+      true
+    end
+
+    ##
+    # Does nothing atm.
+    #
+    # @return nil
+    # @api public
+    #
+    def acknowledge(*)
+      # noop
+    end
+
+    ##
+    # Does nothing atm.
+    #
+    # @return nil
+    # @api public
+    #
+    def reject(*)
+      # noop
+    end
+
     # @endgroup
 
     #
@@ -260,11 +300,11 @@ module BunnyMock
     end
 
     # @private
-    def queue_unbind(key, xchg)
+    def queue_unbind(queue, key, xchg)
       exchange = @connection.find_exchange xchg
       raise Bunny::NotFound.new("Exchange '#{xchg}' was not found", self, false) unless exchange
 
-      exchange.remove_route key
+      exchange.remove_route key, queue
     end
 
     # @private
@@ -276,11 +316,11 @@ module BunnyMock
     end
 
     # @private
-    def xchg_routes_to?(key, xchg)
+    def xchg_routes_to?(queue, key, xchg)
       exchange = @connection.find_exchange xchg
       raise Bunny::NotFound.new("Exchange '#{xchg}' was not found", self, false) unless exchange
 
-      exchange.routes_to? key
+      exchange.routes_to? queue, routing_key: key
     end
 
     # @private
@@ -292,11 +332,11 @@ module BunnyMock
     end
 
     # @private
-    def xchg_unbind(routing_key, name)
+    def xchg_unbind(routing_key, name, exchange)
       source = @connection.find_exchange name
       raise Bunny::NotFound.new("Exchange '#{name}' was not found", self, false) unless source
 
-      source.remove_route routing_key
+      source.remove_route routing_key, exchange
     end
 
     private

data/lib/bunny_mock/exchange.rb

@@ -168,13 +168,11 @@ module BunnyMock
     #
     def unbind(exchange, opts = {})
       if exchange.respond_to?(:remove_route)
-
         # we can do the unbinding ourselves
-        exchange.remove_route opts.fetch(:routing_key, @name)
+        exchange.remove_route opts.fetch(:routing_key, @name), self
       else
-
         # we need the channel to look up the exchange
-        @channel.xchg_unbind opts.fetch(:routing_key, @name), exchange
+        @channel.xchg_unbind opts.fetch(:routing_key, @name), exchange, self
       end
 
       self
@@ -195,7 +193,6 @@ module BunnyMock
     #
     def bound_to?(exchange, opts = {})
       if exchange.respond_to?(:routes_to?)
-
         # we can find out on the exchange object
         exchange.routes_to? self, opts
       else
@@ -218,7 +215,8 @@ module BunnyMock
     #
     def routes_to?(exchange_or_queue, opts = {})
       route = exchange_or_queue.respond_to?(:name) ? exchange_or_queue.name : exchange_or_queue
-      @routes.key? opts.fetch(:routing_key, route)
+      rk = opts.fetch(:routing_key, route)
+      @routes.key?(rk) && @routes[rk].any? { |r| r == exchange_or_queue }
     end
 
     def has_binding?(exchange_or_queue, opts = {}) # rubocop:disable Style/PredicateName
@@ -245,12 +243,17 @@ module BunnyMock
 
     # @private
     def add_route(key, xchg_or_queue)
-      @routes[key] = xchg_or_queue
+      @routes[key] ||= []
+      @routes[key] << xchg_or_queue
     end
 
     # @private
-    def remove_route(key)
-      @routes.delete key
+    def remove_route(key, xchg_or_queue)
+      instance = xchg_or_queue.respond_to?(:name) ? xchg_or_queue.name : xchg_or_queue
+      @routes[key].delete_if do |r|
+        route = r.respond_to?(:name) ? r.name : r
+        route == instance
+      end if @routes.key? key
     end
   end
 end

data/lib/bunny_mock/exchanges/direct.rb

@@ -16,7 +16,7 @@ module BunnyMock
       # @api public
       #
       def deliver(payload, opts, key)
-        @routes[key].publish payload, opts if @routes[key]
+        @routes[key].each { |route| route.publish payload, opts } if @routes[key]
       end
     end
   end

data/lib/bunny_mock/exchanges/fanout.rb

@@ -16,7 +16,7 @@ module BunnyMock
       # @api public
       #
       def deliver(payload, opts, _key)
-        @routes.each_value { |destination| destination.publish(payload, opts) }
+        @routes.values.flatten.each { |destination| destination.publish(payload, opts) }
       end
     end
   end

data/lib/bunny_mock/exchanges/headers.rb

@@ -25,7 +25,7 @@ module BunnyMock
       #
       def deliver(payload, opts, key)
         # ~: proper headers exchange implementation
-        @routes[key].publish payload, opts if @routes[key]
+        @routes[key].each { |route| route.publish payload, opts } if @routes[key]
       end
     end
   end

data/lib/bunny_mock/exchanges/topic.rb

@@ -25,7 +25,7 @@ module BunnyMock
       #
       def deliver(payload, opts, key)
         delivery_routes = @routes.dup.keep_if { |route, _| key =~ route_to_regex(route) }
-        delivery_routes.values.each { |dest| dest.publish(payload, opts) }
+        delivery_routes.values.flatten.each { |dest| dest.publish(payload, opts) }
       end
 
       private

data/lib/bunny_mock/queue.rb

@@ -65,6 +65,22 @@ module BunnyMock
 
       # add to messages
       @messages << { message: payload, options: opts }
+      yield_consumers
+      self
+    end
+
+    ##
+    # Adds a consumer to the queue (subscribes for message deliveries).
+    #
+    # All params are ignored atm. Takes a block which is called when a message is delivered
+    # to the queue
+    #
+    # @api public
+    #
+    def subscribe(*_args, &block)
+      @consumers ||= []
+      @consumers << block
+      yield_consumers
 
       self
     end
@@ -109,11 +125,11 @@ module BunnyMock
       if exchange.respond_to?(:remove_route)
 
         # we can do the unbinding ourselves
-        exchange.remove_route opts.fetch(:routing_key, @name)
+        exchange.remove_route opts.fetch(:routing_key, @name), self
       else
 
         # we need the channel to lookup the exchange
-        @channel.queue_unbind opts.fetch(:routing_key, @name), exchange
+        @channel.queue_unbind self, opts.fetch(:routing_key, @name), exchange
       end
     end
 
@@ -134,13 +150,11 @@ module BunnyMock
       check_queue_deleted!
 
       if exchange.respond_to?(:routes_to?)
-
         # we can do the check ourselves
-        exchange.routes_to? opts.fetch(:routing_key, @name)
+        exchange.routes_to? self, opts
       else
-
         # we need the channel to lookup the exchange
-        @channel.xchg_routes_to? opts.fetch(:routing_key, @name), exchange
+        @channel.xchg_routes_to? self, opts.fetch(:routing_key, @name), exchange
       end
     end
 
@@ -223,5 +237,17 @@ module BunnyMock
 
       [di, mp, message[:message]]
     end
+
+    # @private
+    def yield_consumers
+      return if @consumers.nil?
+      @consumers.each do |c|
+        # rubocop:disable AssignmentInCondition
+        while message = all.pop
+          response = pop_response(message)
+          c.call(response)
+        end
+      end
+    end
   end
 end

data/lib/bunny_mock/version.rb

@@ -3,5 +3,5 @@
 
 module BunnyMock
   # @return [String] Version of the library
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 end

data/spec/integration/queue_subscribe_spec.rb

@@ -0,0 +1,44 @@
+describe BunnyMock::Queue, '#subscribe' do
+  before do
+    @ch1 = @session.channel
+    @ch2 = @session.channel
+  end
+
+  context 'when delevered to an exchange' do
+    it 'should be delevered in all queues bound to the routing key' do
+      t = @ch1.topic 'amq.topic'
+      q1 = @ch1.queue 'q1'
+      q2 = @ch1.queue 'q2'
+      q3 = @ch2.queue 'q3'
+      q4 = @ch2.queue 'q4'
+      q1.bind(t, routing_key: 'rk1')
+      q2.bind(t, routing_key: 'rk1')
+      q3.bind(t, routing_key: 'rk1')
+      q4.bind(t, routing_key: 'rk1')
+
+      delivered = 0
+      q1.subscribe do |_, _, body|
+        expect(body).to eq 'test'
+        delivered += 1
+      end
+
+      q2.subscribe do |_, _, body|
+        expect(body).to eq 'test'
+        delivered += 1
+      end
+
+      q3.subscribe do |_, _, body|
+        expect(body).to eq 'test'
+        delivered += 1
+      end
+
+      q4.subscribe do |_, _, body|
+        expect(body).to eq 'test'
+        delivered += 1
+      end
+
+      t.publish('test', { routing_key: 'rk1' })
+      expect(delivered).to eq 4
+    end
+  end
+end

data/spec/unit/bunny_mock/queue_spec.rb

@@ -164,6 +164,16 @@ describe BunnyMock::Queue do
     end
   end
 
+  context '#subscribe' do
+
+    it 'should consume messages delivered' do
+      @queue.subscribe do |_delivery, _headers, body|
+        expect(body).to eq('test')
+      end
+      @queue.publish 'test'
+    end
+  end
+
   context '#purge' do
 
     it 'should clear all messages' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bunny-mock
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Andrew Rempe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2016-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -129,6 +129,7 @@ files:
 - lib/bunny_mock/session.rb
 - lib/bunny_mock/version.rb
 - spec/integration/queue_pop_spec.rb
+- spec/integration/queue_subscribe_spec.rb
 - spec/spec_helper.rb
 - spec/unit/bunny_mock/channel_spec.rb
 - spec/unit/bunny_mock/exchange_spec.rb
@@ -164,6 +165,7 @@ specification_version: 4
 summary: Mocking for the popular Bunny client for RabbitMQ
 test_files:
 - spec/integration/queue_pop_spec.rb
+- spec/integration/queue_subscribe_spec.rb
 - spec/spec_helper.rb
 - spec/unit/bunny_mock/channel_spec.rb
 - spec/unit/bunny_mock/exchange_spec.rb