mercury_amqp 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef40a35dae3b1d1db2beb819ebe1766437ff9c3c
-  data.tar.gz: 15cf5e985cf94f764c8a20be782ad752cd665927
+  metadata.gz: 16118238db6731dd009db956a965bdc70f73c6c5
+  data.tar.gz: fcf5cdbe1e5fcf2a45835dc8fce12933acf65216
 SHA512:
-  metadata.gz: 09651918c0545cfdefc67d701b93a14176ffb38120a5eb81d4091465e9d8b8368e8d3021ca2cd8eacf75824342943a1e956e92d99773626d3a8d27ca981bc31e
-  data.tar.gz: 785a0ad5cf45c076e7a5a90588f087033108411aeffab3e10e447efb26c7a7886b91419fc4a0fcb808779d4559a268dc58601041b70e5496e35469421c849355
+  metadata.gz: 23d4b1f2bfee00745bac70bba0f362e022a5360c7c6bd1d6b7e76a756d7b6aeb45ee74181e2f45f5628d2602fb66c42d9e5ebe682fc58648034eaf200722db7a
+  data.tar.gz: c48a33ed99cb871992de68403a43dac7fee3f1ad8ced8a6513f7608c1f8f9c574af3f2e75c907f467f3d091c397d5597ac11cb385697e55646ac13347b857873

data/.ruby-version

@@ -0,0 +1 @@
+2.4.1

data/lib/mercury/cps/methods.rb

@@ -10,7 +10,7 @@ class Mercury
       end
 
       def seql(&block)
-        Cps.seql(2, &block)
+        Cps.seql(&block)
       end
 
       def seqp(&block)

data/lib/mercury/cps/seq_with_let.rb

@@ -1,9 +1,7 @@
-require 'binding_of_caller'
-
 class Mercury
   class Cps
     # Syntactic sugar for and_then chains.
-    def self.seql(depth=1, &block)
+    def self.seql(&block)
       # EXPERIMENTAL
       # The trick here is to execute the block in a context where
       # 1. we can simulate local let-bound variables, and
@@ -17,7 +15,7 @@ class Mercury
       #
       # Note: parent instance variables are not available inside the block.
       # Note: keyword arguments are not proxied to methods called in the parent binding
-      context = SeqWithLet.new(binding.of_caller(depth))
+      context = SeqWithLet.new(block.binding)
       context.instance_exec(&block)
       context.__chain
     end

data/lib/mercury/mercury.rb

@@ -114,14 +114,29 @@ class Mercury
     guard_public(k)
     with_source(source_name) do |exchange|
       with_work_queue(worker_group, exchange, tag_filter) do |queue|
-        queue.subscribe(ack: true) do |metadata, payload|
-          handler.call(make_received_message(payload, metadata, work_queue_name: worker_group))
-        end
+        subscribe_worker(queue, handler)
         k.call
       end
     end
   end
 
+  # Production code should not call this.
+  # Only test/tool code should call this, and only if you're sure
+  # the worker queue already exists and is bound to the source
+  def start_queue_worker(worker_group, handler, &k)
+    guard_public(k)
+    @channel.queue(worker_group, work_queue_opts) do |queue|
+      subscribe_worker(queue, handler)
+      k.call
+    end
+  end
+
+  private def subscribe_worker(queue, handler)
+    queue.subscribe(ack: true) do |metadata, payload|
+      handler.call(make_received_message(payload, metadata, work_queue_name: queue.name))
+    end
+  end
+
   def delete_source(source_name, &k)
     guard_public(k)
     with_source(source_name) do |exchange|
@@ -202,11 +217,11 @@ class Mercury
 
   def dispatch_publisher_confirm(basic_ack)
     confirmed_tags =
-      if basic_ack.multiple
-        @confirm_handlers.keys.select { |tag| tag <= basic_ack.delivery_tag }.sort # sort just to be deterministic
-      else
-        [basic_ack.delivery_tag]
-      end
+        if basic_ack.multiple
+          @confirm_handlers.keys.select { |tag| tag <= basic_ack.delivery_tag }.sort # sort just to be deterministic
+        else
+          [basic_ack.delivery_tag]
+        end
     confirmed_tags.each do |tag|
       @confirm_handlers.delete(tag).call
     end
@@ -310,9 +325,10 @@ class Mercury
 
   def bind_queue(exchange, queue_name, tag_filter, opts, &k)
     tag_filter ||= '#'
-    queue = @channel.queue(queue_name, opts)
-    queue.bind(exchange, routing_key: tag_filter) do
-      k.call(queue)
+    @channel.queue(queue_name, opts) do |queue|
+      queue.bind(exchange, routing_key: tag_filter) do
+        k.call(queue)
+      end
     end
   end
 

data/lib/mercury/monadic.rb

@@ -28,6 +28,7 @@ class Mercury
     wrap(:republish)
     wrap(:start_listener)
     wrap(:start_worker)
+    wrap(:start_queue_worker)
     wrap(:delete_source)
     wrap(:delete_work_queue)
     wrap(:source_exists?)

data/mercury_amqp.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'mercury_amqp'
-  spec.version       = '0.9.0'
+  spec.version       = '0.10.0'
   spec.authors       = ['Peter Winton']
   spec.email         = ['wintonpc@gmail.com']
   spec.summary       = 'AMQP-backed messaging layer'
@@ -28,6 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'oj', '~> 3.0'
   spec.add_runtime_dependency 'amqp', '~> 1.5'
   spec.add_runtime_dependency 'bunny', '~> 2.1'
-  spec.add_runtime_dependency 'binding_of_caller', '~> 0.7'
   spec.add_runtime_dependency 'activesupport', '> 4.0', '< 6.0'
 end

data/spec/lib/mercury/monadic_spec.rb

@@ -76,7 +76,7 @@ describe Mercury::Monadic do
         end
       end
       seql do
-        and_then { m.start_worker('worker1', source1, handle_msg) }
+        and_then { m.start_worker(queue1, source1, handle_msg) }
         and_then { m.publish(source1, {'id' => 1, 'sleep_seconds' => 0.1}) }
         and_then { m.publish(source1, {'id' => 2, 'sleep_seconds' => 0.1}) }
         and_then { wait_until { events.size == 4 } }
@@ -87,6 +87,20 @@ describe Mercury::Monadic do
     end
   end
 
+  it 'subscribes to a preexisting queue' do
+    test_with_mercury do |m|
+      msgs = []
+      seql do
+        let(:other_m) { Mercury::Monadic.open }
+        and_then { other_m.start_worker(queue1, source1, :nack.to_proc) }
+        and_then { other_m.close }
+        and_then { m.start_queue_worker(queue1, msgs.method(:push)) }
+        and_then { m.publish(source1, {'id' => 1}) }
+        and_then { wait_until { msgs.size == 1 } }
+      end
+    end
+  end
+
   itt 'sends and receives tagged messages' do
     test_with_mercury do |m|
       msgs = []

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mercury_amqp
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Peter Winton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2018-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,20 +150,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: binding_of_caller
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -193,6 +179,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - CHANGES.md
 - Gemfile
 - README.md
@@ -250,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: AMQP-backed messaging layer