mercury_amqp 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 046bcdd150e6875d732e623389624a2d26abb08c
-  data.tar.gz: 1d5bc9696f0bd8ee418ba99c3326c4c6cfb5fa2d
+  metadata.gz: 95133530de1763cec95808562a5e7fc63051357c
+  data.tar.gz: 0c67f736b817ae297846b28daee0ecaba4b5db44
 SHA512:
-  metadata.gz: 98d86ee54503071de7bec6037b6539f6931e15fef44428ad85ba6ed32ed7e38ab9a735973c3e039b6268b4dec39caaf13cb764b408c0b41988c045eb690d1cb9
-  data.tar.gz: 9bbe848304af07e201adbeadbe0452826694a0b89e862d4958461069c284584c00b15408a12682b068edf7386b39e56708f9c56b38611e961b4f09e6b5ed1747
+  metadata.gz: 6d41a7d999b7f16ba2a19cd5a1bf625bf0899cffadfa08ae0d4a7d0db636ee37786ab752747a2e0e59a5a609d22be36bbf2ef1921aaa01edcb0c58a20ae49427
+  data.tar.gz: 31cee609bd834fc298f7879fb8ef26d65f3cd6cbe5219825c409a638049a9747fbacd9f01711d2d603d96182e611ab7f0280869d31d805bb3526b1e08d7b810a

data/lib/mercury/fake/queue.rb

@@ -27,13 +27,13 @@ class Mercury
 
       def ack_or_reject_message(msg)
         msgs.delete(msg) or raise 'tried to delete message that was not in queue!!'
-        msg.subscriber.busy = false
+        msg.subscriber.handle_capacity += 1
         deliver # a subscriber just freed up
       end
 
       def nack(msg)
         msg.delivered = false
-        msg.subscriber.busy = false
+        msg.subscriber.handle_capacity += 1
         deliver
       end
 
@@ -57,7 +57,7 @@ class Mercury
             subscriber = idle_subscribers.sample
             if @require_ack
               msg.delivered = true
-              subscriber.busy = true
+              subscriber.handle_capacity -= 1
             else
               msgs.delete(msg)
             end
@@ -73,7 +73,7 @@ class Mercury
       end
 
       def idle_subscribers
-        subscribers.reject(&:busy)
+        subscribers.reject { |s| s.handle_capacity == 0 }
       end
     end
   end

data/lib/mercury/fake/subscriber.rb

@@ -2,11 +2,11 @@ class Mercury
   class Fake
     class Subscriber
       attr_reader :handler
-      attr_accessor :busy
+      attr_accessor :handle_capacity
 
-      def initialize(handler)
+      def initialize(handler, handle_capacity)
         @handler = handler
-        @busy = false
+        @handle_capacity = handle_capacity
       end
     end
   end

data/lib/mercury/fake.rb

@@ -15,8 +15,9 @@ require 'mercury/fake/subscriber'
 # broken sockets, etc.
 class Mercury
   class Fake
-    def initialize(domain=:default)
+    def initialize(domain=:default, parallelism: 1)
       @domain = Fake.domains[domain]
+      @parallelism = parallelism
     end
 
     def self.domains
@@ -46,7 +47,7 @@ class Mercury
       assert_not_closed
       q = ensure_queue(source_name, tag_filter, !!worker_group, worker_group)
       ret(k) # it's important we show the "start" operation finishing before delivery starts (in add_subscriber)
-      q.add_subscriber(Subscriber.new(handler))
+      q.add_subscriber(Subscriber.new(handler, @parallelism))
     end
     private :start_worker_or_listener
 

data/lib/mercury/mercury.rb

@@ -24,10 +24,11 @@ class Mercury
                  vhost: '/',
                  username: 'guest',
                  password: 'guest',
+                 parallelism: 1,
                  &k)
     AMQP.connect(host: host, port: port, vhost: vhost, username: username, password: password) do |amqp|
       @amqp = amqp
-      @channel = AMQP::Channel.new(amqp, prefetch: 1) do
+      @channel = AMQP::Channel.new(amqp, prefetch: parallelism) do
         @channel.confirm_select
         install_default_error_handler
         k.call(self)

data/lib/mercury/version.rb

@@ -1,3 +1,3 @@
 class Mercury
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/spec/lib/mercury/monadic_spec.rb

@@ -48,6 +48,46 @@ describe Mercury::Monadic do
     end
   end
 
+  itt 'broadcasts messages to listeners' do
+    test_with_mercury do |m|
+      msgs1 = []
+      msgs2 = []
+      seql do
+        and_then { m.start_listener(source1, &msgs1.method(:push)) }
+        and_then { m.start_listener(source1, &msgs2.method(:push)) }
+        and_then { m.publish(source1, msg1) }
+        and_then { wait_until { msgs1.size == 1 && msgs2.size == 1 } }
+        and_lift do
+          expect(msgs1[0].content).to eql(msg1)
+          expect(msgs2[0].content).to eql(msg1)
+        end
+      end
+    end
+  end
+
+  itt 'it receives messages in parallel' do
+    test_with_mercury(parallelism: 2) do |m|
+      events = []
+      handle_msg = proc do |msg|
+        content = msg.content
+        events.push "received #{content['id']}"
+        EventMachine.add_timer(content['sleep_seconds']) do
+          events.push "finished #{content['id']}"
+          msg.ack
+        end
+      end
+      seql do
+        and_then { m.start_worker('worker1', source1, handle_msg) }
+        and_then { m.publish(source1, {'id' => 1, 'sleep_seconds' => 0.01}) }
+        and_then { m.publish(source1, {'id' => 2, 'sleep_seconds' => 0.01}) }
+        and_then { wait_until { events.size == 4 } }
+        and_lift do
+          expect(events).to eql ['received 1', 'received 2', 'finished 1', 'finished 2']
+        end
+      end
+    end
+  end
+
   itt 'sends and receives tagged messages' do
     test_with_mercury do |m|
       msgs = []
@@ -338,10 +378,10 @@ describe Mercury::Monadic do
   end
 
   # the block must return a Cps
-  def test_with_mercury(&block)
+  def test_with_mercury(parallelism: 1, &block)
     sources = [source1, source2]
     queues = [queue1, queue2]
-    test_with_mercury_cps(sources, queues, &block)
+    test_with_mercury_cps(sources, queues, parallelism: parallelism, &block)
   end
 end
 

data/spec/spec_helper.rb

@@ -4,10 +4,10 @@ require 'mercury/fake'
 include Mercury::TestUtils
 
 # the block must return a Cps
-def test_with_mercury_cps(sources, queues, &block)
+def test_with_mercury_cps(sources, queues, parallelism: 1, &block)
   em do
     seql do
-      let(:m)  { Mercury::Monadic.open }
+      let(:m)  { Mercury::Monadic.open(parallelism: parallelism) }
       and_then { delete_sources_and_queues_cps(sources, queues) }
       and_then { block.call(m) }
       and_then { delete_sources_and_queues_cps(sources, queues) }
@@ -28,8 +28,8 @@ module MercuryFakeSpec
       it(name, &block)
       context 'with Mercury::Fake' do
         before :each do
-          allow(Mercury).to receive(:open) do |&k|
-            EM.next_tick { k.call(Mercury::Fake.new) }
+          allow(Mercury).to receive(:open) do |parallelism:1, &k|
+            EM.next_tick { k.call(Mercury::Fake.new(parallelism: parallelism)) }
           end
         end
         it(name, &block)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mercury_amqp
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Peter Winton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler