vx-common-amqp 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16f3b92f0f5a953fcc9200b6704396461c8be8db
-  data.tar.gz: a411d13c2d1112634ccf107f7c00d334c098f9cc
+  metadata.gz: d5afc1faf82bce74cf7e6919a4bcc89792d5bc99
+  data.tar.gz: 0f13f1dee0481bb58fc99f91778a3a46a7b59cf6
 SHA512:
-  metadata.gz: b78866acd40c7871893af4e4bb058aeddacc32b7538f5c935ad0070e1cdd59e35ab96ca42eb34450711594ab92e68dd8f3fc23b5e8a5241993d5de4cd08f5002
-  data.tar.gz: e5d25fc001a9dfb0a20b9b2cbd56b9df593dfafb89700e96282b9fce6a18d46a9b50f015519cb15fefe2efa0963112dd8ea0b00cf8e05f7275554a6e89d407c1
+  metadata.gz: d168cbc35a10d915413039e5030b673b64ec4cd588a033132721ca359bc78abc33c30b6287b746b015d239a8a28a67f53e2c32b5353cffab3129586673c9df01
+  data.tar.gz: efa6725e24213122a358adf76ac7e8f411a410fac2bb6c2b122f130a1a11e46b7de4e71998b1a63167bb40236391bfbda2fa144a9f14d22fae219647d0833db8

data/lib/vx/common/amqp/config.rb

@@ -8,7 +8,7 @@ module Vx
         attr_accessor :default_exchange_options, :default_queue_options,
           :default_publish_options, :default_exchange_type, :pool_timeout,
           :heartbeat, :spawn_attempts, :content_type, :instrumenter, :debug,
-          :on_error, :builder
+          :on_error, :builders
 
         def initialize
           reset!
@@ -26,8 +26,8 @@ module Vx
           @debug || ENV['VX_COMMON_AMQP_DEBUG']
         end
 
-        def use(middleware, *args)
-          @builder.use middleware, *args
+        def use(target, middleware, *args)
+          @builders[target].use middleware, *args
         end
 
         def reset!
@@ -47,7 +47,10 @@ module Vx
           @instrumenter          = nil
           @on_error              = ->(e, env){ nil }
 
-          @builder               = Vx::Common::Rack::Builder.new
+          @builders = {
+            pub: Vx::Common::Rack::Builder.new,
+            sub: Vx::Common::Rack::Builder.new
+          }
 
           @default_exchange_options = {
             durable:     true,

data/lib/vx/common/amqp/consumer/publish.rb

@@ -24,9 +24,11 @@ module Vx
             properties:  options,
           }
 
-          instrument("process_publishing.consumer.amqp", instrumentation) do
-            m = serialize_message message, options[:content_type]
-            x.publish m, options
+          with_pub_middlewares instrumentation do
+            instrument("process_publishing.consumer.amqp", instrumentation) do
+              m = serialize_message message, options[:content_type]
+              x.publish m, options
+            end
           end
 
           self
@@ -36,6 +38,10 @@ module Vx
           Common::AMQP::Formatter.pack(content_type, message)
         end
 
+        def with_pub_middlewares(env, &block)
+          Common::AMQP.config.builders[:pub].to_app(block).call(env)
+        end
+
       end
     end
   end

data/lib/vx/common/amqp/consumer/subscribe.rb

@@ -89,8 +89,8 @@ module Vx
             end.perform payload
           end
 
-          def with_middlewares(env, &block)
-            Common::AMQP.config.builder.to_app(block).call(env)
+          def with_sub_middlewares(env, &block)
+            Common::AMQP.config.builders[:sub].to_app(block).call(env)
           end
 
           def deserialize_message(properties, payload)

data/lib/vx/common/amqp/version.rb

@@ -1,7 +1,7 @@
 module Vx
   module Common
     module AMQP
-      VERSION = "0.3.5"
+      VERSION = "0.3.6"
     end
   end
 end

data/spec/lib/amqp/config_spec.rb

@@ -10,8 +10,13 @@ describe Vx::Common::AMQP::Config do
       end
     end
 
-    config.use mid
-    rs = config.builder.to_app(->(e) { e }).call({})
+    config.use :sub, mid
+    config.use :pub, mid
+
+    rs = config.builders[:pub].to_app(->(e) { e }).call({})
+    expect(rs).to eq(a: 1)
+
+    rs = config.builders[:sub].to_app(->(e) { e }).call({})
     expect(rs).to eq(a: 1)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vx-common-amqp
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Dmitry Galinsky