mercury_amqp 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22461cdd32d965f465191c9f4270ea23724d9d14
-  data.tar.gz: 4934514f73a40ee799e174eba6dabe11add998c4
+  metadata.gz: c36195df1d069fa7a74656af985d056b77a609cb
+  data.tar.gz: 4800de94a1d94f443d769b26e335b1257595e9f2
 SHA512:
-  metadata.gz: de0a9fa90882b011bdd0011055f2546ad1a7b6d0ed9deadc5e0c7c3c7f759a5824267fa9e6c9c75a834b23f3413be306de6b303766c5e024af32a85f4c750225
-  data.tar.gz: 639003755c8e26bbdcf98b66178d1d32cd91a2c8b7ba4b6efb1a98996915a7715381077d06f895d892358edf719e5975da7ae34e77401cb531d62b85a4447a8b
+  metadata.gz: 89fd0f3e3a2821c4666e885a1c6b5ccfb9e0925620eb0bb657bad0f105a2c0d736896e0995f6dbfcbabec58dc71cf77b4ae559fe423b9eb2c631f4364584d4d1
+  data.tar.gz: fc2643c2a50e24fc33db009b6fd3398018eecc4dea839f375dc58a03fea5ac8b49292e0aec7f41f294d9fa566bad8e855ac0f34e39e45eac5ac6d1f4c5868fb5

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 *~
+*.gem

data/lib/mercury/fake.rb

@@ -28,9 +28,9 @@ class Mercury
       ret(k)
     end
 
-    def publish(source_name, msg, tag: '', &k)
+    def publish(source_name, msg, tag: '', headers: {}, &k)
       assert_not_closed
-      queues.values.select{|q| q.binds?(source_name, tag)}.each{|q| q.enqueue(roundtrip(msg), tag)}
+      queues.values.select{|q| q.binds?(source_name, tag)}.each{|q| q.enqueue(roundtrip(msg), tag, headers)}
       ret(k)
     end
 

data/lib/mercury/fake/metadata.rb

@@ -1,10 +1,13 @@
 class Mercury
   class Fake
     class Metadata
-      def initialize(tag, dequeue, requeue)
+      attr_reader :headers
+
+      def initialize(tag, headers, dequeue, requeue)
         @tag = tag
         @dequeue = dequeue
         @requeue = requeue
+        @headers = headers
       end
 
       def routing_key

data/lib/mercury/fake/queue.rb

@@ -20,8 +20,8 @@ class Mercury
         deliver # new subscriber probably wants a message
       end
 
-      def enqueue(msg, tag)
-        msgs.push(QueuedMessage.new(self, msg, tag, @require_ack))
+      def enqueue(msg, tag, headers)
+        msgs.push(QueuedMessage.new(self, msg, tag, headers, @require_ack))
         deliver # new message. someone probably wants it.
       end
 

data/lib/mercury/fake/queued_message.rb

@@ -4,12 +4,13 @@ require 'mercury/received_message'
 class Mercury
   class Fake
     class QueuedMessage
-      attr_reader :received_msg
+      attr_reader :received_msg, :headers
       attr_accessor :delivered, :subscriber
 
-      def initialize(queue, msg, tag, is_ackable)
-        metadata = Metadata.new(tag, proc{queue.ack_or_reject_message(self)}, proc{queue.nack(self)})
+      def initialize(queue, msg, tag, headers, is_ackable)
+        metadata = Metadata.new(tag, headers, proc{queue.ack_or_reject_message(self)}, proc{queue.nack(self)})
         @received_msg = ReceivedMessage.new(msg, metadata, is_ackable: is_ackable)
+        @headers = headers
         @delivered = false
       end
     end

data/lib/mercury/mercury.rb

@@ -2,12 +2,12 @@ require 'amqp'
 require 'securerandom'
 require 'mercury/wire_serializer'
 require 'mercury/received_message'
-require 'logger'
+require 'logatron/logatron'
 
 class Mercury
   attr_reader :amqp, :channel, :logger
 
-  def self.open(logger: Logger.new(STDOUT), **kws, &k)
+  def self.open(logger: Logatron, **kws, &k)
     @logger = logger
     new(**kws, &k)
     nil
@@ -36,19 +36,19 @@ class Mercury
   end
   private_class_method :new
 
-  def publish(source_name, msg, tag: '', &k)
+  def publish(source_name, msg, tag: '', headers: {}, &k)
     # The amqp gem caches exchange objects, so it's fine to
     # redeclare the exchange every time we publish.
     # TODO: wait for publish confirmations (@channel.on_ack)
     with_source(source_name) do |exchange|
-      exchange.publish(write(msg), **Mercury.publish_opts(tag)) do
+      exchange.publish(write(msg), **Mercury.publish_opts(tag, headers)) do
         k.call
       end
     end
   end
 
-  def self.publish_opts(tag)
-    { routing_key: tag, persistent: true }
+  def self.publish_opts(tag, headers)
+    { routing_key: tag, persistent: true, headers: Logatron.http_headers.merge(headers) }
   end
 
   def start_listener(source_name, handler, tag_filter: '#', &k)
@@ -108,7 +108,9 @@ class Mercury
   private
 
   def make_received_message(payload, metadata, is_ackable)
-    ReceivedMessage.new(read(payload), metadata, is_ackable: is_ackable)
+    msg = ReceivedMessage.new(read(payload), metadata, is_ackable: is_ackable)
+    Logatron.msg_id = msg.headers['X-Ascent-Log-Id']
+    msg
   end
 
   def existence_check(k, &check)

data/lib/mercury/received_message.rb

@@ -12,6 +12,10 @@ class Mercury
       metadata.routing_key
     end
 
+    def headers
+      metadata.headers
+    end
+
     def ack
       @is_ackable or raise 'This message is not ackable'
       metadata.ack

data/lib/mercury/sync.rb

@@ -10,7 +10,7 @@ class Mercury
         ch = conn.create_channel
         ch.confirm_select
         ex = ch.topic(source_name, Mercury.source_opts)
-        ex.publish(WireSerializer.new.write(msg), **Mercury.publish_opts(tag))
+        ex.publish(WireSerializer.new.write(msg), **Mercury.publish_opts(tag, {}))
         ch.wait_for_confirms or raise 'failed to confirm publication'
       ensure
         conn.close

data/lib/mercury/version.rb

@@ -1,3 +1,3 @@
 class Mercury
-  VERSION = '0.1.0'
+  VERSION = '0.1.2'
 end

data/mercury_amqp.gemspec

@@ -20,14 +20,15 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'yard'
+  spec.add_development_dependency 'yard', '~> 0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'json_spec'
-  spec.add_development_dependency 'evented-spec'
-  spec.add_development_dependency 'rspec_junit_formatter'
+  spec.add_development_dependency 'json_spec', '~> 1'
+  spec.add_development_dependency 'evented-spec', '~> 0.9'
+  spec.add_development_dependency 'rspec_junit_formatter', '~> 0'
 
   spec.add_runtime_dependency 'oj', '~> 2.12'
   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 'logatron', '~> 0'
 end

data/spec/lib/mercury/monadic_spec.rb

@@ -2,6 +2,8 @@ require 'rspec'
 require 'spec_helper'
 require 'mercury'
 require 'mercury/monadic'
+require 'securerandom'
+require 'logatron/logatron'
 
 describe Mercury::Monadic do
   include Cps::Methods
@@ -65,6 +67,38 @@ describe Mercury::Monadic do
     end
   end
 
+  itt 'sends and receives headers' do
+    test_with_mercury do |m|
+      msgs = []
+      seql do
+        and_then { m.start_listener(source, &msgs.method(:push)) }
+        and_then { m.publish(source, msg, headers: {'foo' => 'bar'}) }
+        and_then { wait_until { msgs.size == 1 } }
+        and_lift do
+          expect(msgs[0].headers['foo']).to eql 'bar'
+        end
+      end
+    end
+  end
+
+  it 'propagates logatron headers' do
+    real_msg_id = SecureRandom.uuid
+    Logatron.msg_id = real_msg_id
+    test_with_mercury do |m|
+      msgs = []
+      seql do
+        and_then { m.start_listener(source, &msgs.method(:push)) }
+        and_then { m.publish(source, msg) }
+        and_lift { Logatron.msg_id = 'fake_msg_id' }
+        and_then { wait_until { msgs.size == 1 } }
+        and_lift do
+          expect(msgs[0].headers['X-Ascent-Log-Id']).to eql real_msg_id
+          expect(Logatron.msg_id).to eql real_msg_id
+        end
+      end
+    end
+  end
+
   itt 'uses AMQP-style tag filters' do
     test_with_mercury do |m|
       successes = []

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mercury_amqp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Peter Winton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,14 +42,14 @@ dependencies:
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -70,42 +70,42 @@ dependencies:
   name: json_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: evented-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: logatron
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Abstracts common patterns used with AMQP
 email:
 - wintonpc@gmail.com