twingly-amqp 4.2.1 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 858c1c7b49f3bbd776a0aa0af9f070d1c40f31f9
-  data.tar.gz: ee5ee54beff37137f74fe60d0d4e60dc0db4e893
+  metadata.gz: 4db0f7716677c33ee82f1fc7b0530aa99a9c704b
+  data.tar.gz: a392bce55f82c6f07c39a6df3788bc8c918af654
 SHA512:
-  metadata.gz: ecc06c04e469767a9f9a521989f3ae8f85aec7b18da877f255bda9a12db90575e7d4b5f427624f6d5b7f3e7d94047a6e8ce30c007f14c82f0033341d00c2e12c
-  data.tar.gz: dcf7197d39bdff607daaa44957bb817a4a4f983a697949723051376ac4345595356b0c2b48d25081ae05942948ed8b408df0ee9645e00c7354301ad87af15c18
+  metadata.gz: e8831829877ca9fa5ac54f2ab7cba84f91b33b3e7fe280c0c47b214dcf7365b15b80e37fc330fe5c3433de5e4ab5cf6808802ea272b79d71e54d9997fe139d21
+  data.tar.gz: 83cb819bd56f5a9737129f00bb406d977aa3386a10c0a620188b9f7521dcf7463e535db38b95aa0e06cd227d91264164ce55d9711484d219afcfce13a4804d9d

data/README.md

@@ -59,6 +59,7 @@ subscription = Twingly::AMQP::Subscription.new(
   routing_key:      "url.blog",     # Optional, uses the default exchange if omitted
   consumer_threads: 4,              # Optional
   prefetch:         20,             # Optional
+  max_length:       10_000,         # Optional
 )
 
 subscription.on_exception { |exception| puts "Oh noes! #{exception.message}" }
@@ -80,6 +81,19 @@ subscription.each_message do |message| # An instance of Twingly::AMQP::Message
 end
 ```
 
+#### Non-blocking subscription
+
+```ruby
+subscription.each_message(blocking: false) do |message|
+  puts "Received #{message.payload.inspect}"
+  message.ack
+end
+
+# Do something
+
+subscription.cancel! # Stops the subscriber
+```
+
 ### Publish to a queue on the default exchange
 
 ```ruby

data/lib/twingly/amqp/subscription.rb

@@ -4,12 +4,15 @@ require "twingly/amqp/message"
 module Twingly
   module AMQP
     class Subscription
-      def initialize(queue_name:, exchange_topic: nil, routing_key: nil, consumer_threads: 4, prefetch: 20, connection: nil)
+      def initialize(queue_name:, exchange_topic: nil, routing_key: nil,
+                     consumer_threads: 4, prefetch: 20, connection: nil,
+                     max_length: nil)
         @queue_name       = queue_name
         @exchange_topic   = exchange_topic
         @routing_key      = routing_key
         @consumer_threads = consumer_threads
         @prefetch         = prefetch
+        @max_length       = max_length
 
         connection ||= Connection.instance
         @channel = create_channel(connection)
@@ -24,26 +27,14 @@ module Twingly
         @on_exception_callback          = proc {}
       end
 
-      def each_message(&block)
-        setup_traps
+      def each_message(blocking: true, &block)
+        consumer = create_consumer(&block)
 
-        consumer = @queue.subscribe(subscribe_options) do |delivery_info, metadata, payload|
-          @before_handle_message_callback.call(payload)
-
-          message = Message.new(
-            delivery_info: delivery_info,
-            metadata:      metadata,
-            payload:       payload,
-            channel:       @channel,
-          )
+        if blocking
+          sleep 0.01 until cancel?
 
-          block.call(message)
+          consumer.cancel
         end
-
-        # The consumer isn't blocking, so we wait here
-        sleep 0.5 until cancel?
-
-        consumer.cancel
       end
 
       def before_handle_message(&block)
@@ -54,6 +45,14 @@ module Twingly
         @on_exception_callback = block
       end
 
+      def message_count
+        @queue.status.fetch(:message_count)
+      end
+
+      def raw_queue
+        @queue
+      end
+
       def cancel?
         @cancel
       end
@@ -64,6 +63,21 @@ module Twingly
 
       private
 
+      def create_consumer(&block)
+        @queue.subscribe(subscribe_options) do |delivery_info, metadata, payload|
+          @before_handle_message_callback.call(payload)
+
+          message = Message.new(
+            delivery_info: delivery_info,
+            metadata:      metadata,
+            payload:       payload,
+            channel:       @channel,
+          )
+
+          block.call(message)
+        end
+      end
+
       def create_channel(connection)
         channel = connection.create_channel(nil, @consumer_threads)
         channel.prefetch(@prefetch)
@@ -77,9 +91,16 @@ module Twingly
       def queue_options
         {
           durable: true,
+          arguments: queue_arguments,
         }
       end
 
+      def queue_arguments
+        {}.tap do |arguments|
+          arguments["x-max-length"] = @max_length if @max_length
+        end
+      end
+
       def subscribe_options
         {
           manual_ack:   true,

data/lib/twingly/amqp/version.rb

@@ -1,5 +1,5 @@
 module Twingly
   module Amqp
-    VERSION = "4.2.1".freeze
+    VERSION = "4.3.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twingly-amqp
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.3.0
 platform: ruby
 authors:
 - Twingly AB
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-17 00:00:00.000000000 Z
+date: 2016-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Ruby library for talking to RabbitMQ