vx-common-amqp 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d22e0e16e443910a96c0200d9c7e01eec6f9c5b5
-  data.tar.gz: b78374356e36e00925cff0f076673e7adea1f815
+  metadata.gz: 8605e89e5acbbd7370c06ebef9998c728b7b3d7f
+  data.tar.gz: a4798b252013ba3dede1a2267ea4c12a25a06171
 SHA512:
-  metadata.gz: 13c65d9bbbd886758e22d4b712a0792c9386ffb9ecfd72c48c00926f8213efabbb03915b03fa590dac6e7e81c2338ddbd8d16d32a8eb9cd2d11e8e44fb976f22
-  data.tar.gz: 046cab0abc468287b048036bd6491800a4cf3e1f2473a8645e5e9ed18fe139c22cfb1da683b496a03446d234b7f1636ed767f9774dc736eb317bf476dc6d8933
+  metadata.gz: 313792c6ca5f6972775168adf794351e4d6ae6686fa0274df5fb6d78f74a2a0c25b1e66d8b255a78fcbc7ee643d5650c59995dd678b3c4f7a85a801f33e18006
+  data.tar.gz: 620fe489e107e572336eb93118ef040da343c5b85dae9cd1bafced6950076e33588ee4d9ae860fe3e89e1d683bb948887625db0a0b657b97d97831ffe2dd582f

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

@@ -4,8 +4,14 @@ module Vx
       module Consumer::Subscribe
 
         def subscribe
-          session.open
+          start do |x, q|
+            subscription_loop q
+          end
+        end
 
+        def start
+          rs = nil
+          session.open
           session.with_channel do
             x = declare_exchange
             q = declare_queue
@@ -15,11 +21,24 @@ module Vx
               q.bind(x, bind_options)
               debug "successfuly subscribed to #{q.name}:#{x.name}"
 
-              subscription_loop q
+              rs = yield(x, q) if block_given?
             end
 
             debug "shutdown"
           end
+          rs
+        end
+
+        def pop(q)
+          unpacked = nil
+          delivery_info, properties, payload = q.pop(ack: ack)
+
+          if payload
+            debug "recieve ##{delivery_info.delivery_tag.to_i} #{payload.inspect}"
+            unpacked = deserialize_message properties, payload
+          end
+
+          [unpacked, delivery_info, properties]
         end
 
         private

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

@@ -1,7 +1,7 @@
 module Vx
   module Common
     module AMQP
-      VERSION = "0.2.6"
+      VERSION = "0.2.7"
     end
   end
 end

data/spec/lib/amqp/consumer_spec.rb

@@ -312,5 +312,25 @@ describe Vx::Common::AMQP::Consumer do
       expect(subject).to have(3).items
       expect(subject.map(&:values).flatten).to eq [0,1,2]
     end
+
+    it "should receive mesasges using pop method" do
+      consumer_class.ack false
+      collected = []
+
+      Timeout.timeout(3) do
+        consumer_class.start do |_, q|
+          loop do
+            message, _, _ = consumer_class.pop(q)
+            collected << message
+            if message["n"] == 2
+              break
+            end
+          end
+        end
+      end
+
+      expect(collected).to have(3).items
+      expect(collected.map(&:values).flatten).to eq [0,1,2]
+    end
   end
 end

data/vx-common-amqp.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 1.9.3'
 
-  spec.add_runtime_dependency "bunny",     "~> 1.0.0"
+  spec.add_runtime_dependency "bunny",     "~> 1.0.6"
   spec.add_runtime_dependency "vx-common-rack-builder", "~> 0.0.2"
 
   spec.add_development_dependency "bundler", "~> 1.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-common-amqp
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2013-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.6
 - !ruby/object:Gem::Dependency
   name: vx-common-rack-builder
   requirement: !ruby/object:Gem::Requirement