twingly-amqp 5.2.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9addd8c457e9a56236f8e77d5c8a695859b39c8e2f77660e5cea41d66b515095
-  data.tar.gz: e9c37097b065eeb9a60f25f659597975452a7b26c643d8fd81bd165bf2b6fa0a
+  metadata.gz: 72327e797eeb0baacb83fa4a8680f6108a2cacdc6aa1185bbd3dfd855a1738c9
+  data.tar.gz: a0fee780601c0d0bed3afa6f4a70e99fe775c09c3f72b8674f5ac840103252c5
 SHA512:
-  metadata.gz: eebc4870eeca8f9c58298b5f839569338da8e1e862b785512babd5f7fa28492a40a069762c136d65d4c31142d1360b27cf23e5b1044dc3b4f9feac8b1ace623e
-  data.tar.gz: bfbd5d0598e5ba0abbf2d292ef4bee8847ee67dfd1e2d67f9a5c4b8a64a2e2131aa73c91267b9088ee5fa36162f3e7138be0b22c8c081205f290ca8de68cb035
+  metadata.gz: 3d7692b89922e73d8c9056a863f5039371c4ac1962d2419fe5144d00f553ad343b989d3dcc70e727902f3a3c3dc6ad981a6de0cdacd9cb189295413a5b7428ca
+  data.tar.gz: d50510058e01960b482712b3719182ca32a88854c0ded35c967b91cca087cd083f37ac67e892c9f960ca0fc6d00da73ab3792cc9f38bf5d0347db91ffe7d3f41

data/README.md

@@ -1,6 +1,6 @@
 # Twingly::AMQP
 
-[![GitHub Build Status](https://github.com/twingly/twingly-amqp/workflows/CI/badge.svg?branch=master)](https://github.com/twingly/twingly-amqp/actions)
+[![GitHub Build Status](https://github.com/twingly/twingly-amqp/workflows/CI/badge.svg)](https://github.com/twingly/twingly-amqp/actions)
 
 A gem for subscribing and publishing messages via RabbitMQ.
 
@@ -59,6 +59,8 @@ subscription = Twingly::AMQP::Subscription.new(
   consumer_threads: 4,                     # Optional
   prefetch:         20,                    # Optional
   max_length:       10_000,                # Optional
+  queue_type:       :quorum,               # Optional, which type of queue to create,
+                                           # possible values are :quorum (default) or :classic
 )
 
 subscription.on_exception { |exception| puts "Oh noes! #{exception.message}" }
@@ -130,6 +132,9 @@ publisher.configure_publish_options do |options|
 end
 
 publisher.publish({ my: "data" })
+
+publisher.publish({ my: "other_data" }, routing_key: "my_other_key") # Override routing_key or other publishing options
+                                                                     # accepted by Bunny::Exchange#publish
 ```
 
 ### Publish delayed messages
@@ -141,6 +146,8 @@ publisher = Twingly::AMQP::DefaultExchangePublisher.delayed(
   target_queue_name: "my_queue",         # Queue which delayed messages will be
                                          #   published to after the delay has elapsed
   delay_ms:          60_000,
+  delay_queue_type:  :quorum,            # Optional. Which type of queue to define the delay queue
+                                         # as. Possible values are :quorum (default) or :classic
 )
 
 # Publishes message to the delay queue. After delay_ms has passed,

data/lib/twingly/amqp/default_exchange_publisher.rb

@@ -11,12 +11,14 @@ module Twingly
         @exchange = connection.create_channel.default_exchange
       end
 
-      def self.delayed(delay_queue_name:, target_queue_name:, delay_ms:, connection: Connection.instance)
+      def self.delayed(delay_queue_name:, target_queue_name:, delay_ms:, delay_queue_type: :quorum,
+                       connection: Connection.instance)
         Utilities.create_queue(delay_queue_name,
                                arguments: {
                                  "x-dead-letter-exchange":    DEFAULT_EXCHANGE,
                                  "x-dead-letter-routing-key": target_queue_name,
-                               })
+                               },
+                               queue_type: delay_queue_type)
 
         new(queue_name: delay_queue_name, connection: connection).tap do |publisher|
           publisher.configure_publish_options do |options|

data/lib/twingly/amqp/publisher.rb

@@ -1,7 +1,7 @@
 module Twingly
   module AMQP
     module Publisher
-      def publish(message)
+      def publish(message, opts = {})
         payload =
           if message.kind_of?(Array)
             message
@@ -11,17 +11,17 @@ module Twingly
             raise ArgumentError
           end
 
-        json_payload = payload.to_json
-        opts         = options.to_h
-        @exchange.publish(json_payload, opts)
+        json_payload       = payload.to_json
+        publishing_options = options.to_h.merge(opts)
+        @exchange.publish(json_payload, publishing_options)
       end
 
-      # only used by tests to avoid sleeping
-      def publish_with_confirm(message)
+      # Only used by tests to lessen the time we need to sleep
+      def publish_with_confirm(message, opts = {})
         channel = @exchange.channel
         channel.confirm_select unless channel.using_publisher_confirmations?
 
-        publish(message)
+        publish(message, opts)
 
         @exchange.wait_for_confirms
       end

data/lib/twingly/amqp/subscription.rb

@@ -3,14 +3,18 @@ module Twingly
     class Subscription
       def initialize(queue_name:, exchange_topic: nil, routing_key: nil,
                      routing_keys: nil, consumer_threads: 1, prefetch: 20,
-                     connection: Connection.instance, max_length: nil)
+                     connection: Connection.instance, max_length: nil,
+                     queue_type: :quorum)
         @queue_name       = queue_name
         @exchange_topic   = exchange_topic
         @routing_keys     = Array(routing_keys || routing_key)
         @consumer_threads = consumer_threads
         @prefetch         = prefetch
         @max_length       = max_length
+        @queue_type       = queue_type
         @cancel           = false
+        @consumer         = nil
+        @blocking         = false
 
         if routing_key
           warn "[DEPRECATION] `routing_key` is deprecated. "\
@@ -18,7 +22,7 @@ module Twingly
         end
 
         @channel = create_channel(connection)
-        @queue   = @channel.queue(@queue_name, queue_options)
+        @queue   = create_queue
 
         if @exchange_topic && @routing_keys.any?
           exchange = @channel.topic(@exchange_topic, durable: true)
@@ -33,12 +37,13 @@ module Twingly
       end
 
       def each_message(blocking: true, &block)
-        consumer = create_consumer(&block)
+        @blocking = blocking
+        @consumer = create_consumer(&block)
 
-        if blocking
+        if @blocking
           sleep 0.01 until cancel?
 
-          consumer.cancel
+          @consumer.cancel
         end
       end
 
@@ -63,6 +68,7 @@ module Twingly
       end
 
       def cancel!
+        @consumer.cancel unless @blocking
         @cancel = true
       end
 
@@ -93,6 +99,17 @@ module Twingly
         channel
       end
 
+      def create_queue
+        case @queue_type
+        when :quorum
+          @channel.quorum_queue(@queue_name, queue_options)
+        when :classic
+          @channel.queue(@queue_name, queue_options)
+        else
+          raise ArgumentError, "Unknown queue type #{@queue_type}"
+        end
+      end
+
       def queue_options
         {
           durable: true,

data/lib/twingly/amqp/utilities.rb

@@ -1,13 +1,19 @@
 module Twingly
   module AMQP
     module Utilities
-      def self.create_queue(queue_name, durable: true, arguments: {}, connection: Connection.instance)
+      def self.create_queue(queue_name, durable: true, arguments: {}, queue_type: :quorum, connection: Connection.instance)
         connection.with_channel do |channel|
-          return channel.queue(
-            queue_name,
-            durable: durable,
-            arguments: arguments,
-          )
+          case queue_type
+          when :quorum
+            # Quorum queues are always durable, see https://www.rabbitmq.com/quorum-queues.html#feature-matrix
+            raise ArgumentError, "durable: false is not supported by quorum queues" unless durable
+
+            return channel.quorum_queue(queue_name, arguments: arguments)
+          when :classic
+            return channel.queue(queue_name, durable: durable, arguments: arguments)
+          else
+            raise ArgumentError, "Unknown queue type '#{queue_type}'"
+          end
         end
       end
     end

data/lib/twingly/amqp/version.rb

@@ -1,5 +1,5 @@
 module Twingly
   module Amqp
-    VERSION = "5.2.0".freeze
+    VERSION = "6.1.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twingly-amqp
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 6.1.0
 platform: ruby
 authors:
 - Twingly AB
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-02 00:00:00.000000000 Z
+date: 2023-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.3
+        version: 2.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.3
+        version: 2.20.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.4.4
 signing_key:
 specification_version: 4
 summary: Ruby library for talking to RabbitMQ