basquiat 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c58b903c923eb880488c658ccd185076edac51ccc279cdc3e03833676a6a1770
-  data.tar.gz: c68e49c4012d1d52b199d22df0ce6a04cfd9f551361e516e927f8679d0cc9719
+  metadata.gz: bc25a020cacd1dff67867ecf85f81c82e4feae712aafdcebd26f7076d11c740c
+  data.tar.gz: fc480994ad88edfcb3d61e990e900d32f34e55164aaa149a5e254eeb459db3a3
 SHA512:
-  metadata.gz: 99dee9a41070083aa8cc9c8f1dd762444684246c4592e97ea6b26b2eee35be88cb200d5704e1771bb076be0f1cce6a58b3796f99675d589ea3d47baf0167d102
-  data.tar.gz: 5299eba89ddd38bbaeb081aa8bae8ddeede2614b95745c42a68c5e71a8aaaa974406b2e5fb33b212a54fe06e820e1b9cfa897f3495a9127747f5c18fd28d0a4e
+  metadata.gz: 3f8442912b5a26b0223c22d8abdc0a580c06d935ed346a4b57092b58c90440de0f2861396ea9e651e4881650adaaed55b210942a653bf3b56481f804c554e335
+  data.tar.gz: 99e0ab18b267398e71c2dc25d0c933e2e6caa939868037e9383a803815a137f7278662f47d7e0902decdf9afd1c82d8cdeffce74ec79dcb1ffa42966e7c50d76

data/README.md

@@ -74,6 +74,7 @@ end
 The available options are:
 
 - config_file= Receive a path to an YAML file (example here)
+- connection= Makes Basquiat to use a provided Bunny connection
 - queue_name= The default queue name
 - exchange_name= The default exchange name
 - environment= Forces the environment to something other than the value of BASQUIAT_ENV

data/lib/basquiat/adapters/rabbitmq/configuration.rb

@@ -22,7 +22,7 @@ module Basquiat
                          durable: true,
                          options: {}
                        },
-                       publisher: { confirm: true, persistent: false, session_pool: { size: 1, timeout: 5 } },
+                       publisher: { confirm: true, persistent: false },
                        consumer: { prefetch: 1000, manual_ack: true },
                        requeue: { enabled: false } }
         end

data/lib/basquiat/adapters/rabbitmq/connection.rb

@@ -7,9 +7,12 @@ module Basquiat
       class Connection < SimpleDelegator
         # @param hosts: [Array<String>] IPs or FQDN of the RabbitMQ instances
         # @param port [Fixnum] Port that the RabbitMQ instances run
+        # @option failover: [Fixnum|Symbol] :heartbeat (:server) Heartbeat timeout to offer to the server
         # @option failover: [Fixnum] :max_retries (5) Maximum number of reconnection retries
         # @option failover: [Fixnum] :default_timeout (5) Interval between to reconnect attempts
         # @option failover: [Fixnum] :connection_timeout (5) Allowed time before a connection attempt timeouts
+        # @option failover: [Fixnum] :read_timeout (30) TCP socket read timeout in seconds
+        # @option failover: [Fixnum] :write_timeout (30) TCP socket write timeout in seconds
         # @option auth: [String] :user ('guest')
         # @option auth: [String] :password ('guest')
         def initialize(hosts:, port: 5672, failover: {}, auth: {})
@@ -22,7 +25,7 @@ module Basquiat
         # Creates a channel
         # @return [Bunny::Channel]
         def create_channel
-          connection.start
+          connection.start unless connected?
           Basquiat.logger.debug 'Creating a new channel'
           connection.create_channel
         end
@@ -53,14 +56,17 @@ module Basquiat
         end
 
         def connection
-          @connection ||= Bunny.new(
+          @connection ||= Basquiat.configuration.connection || Bunny.new(
             hosts:                     @hosts,
             port:                      @port,
             username:                  @auth.fetch(:user, 'guest'),
             password:                  @auth.fetch(:password, 'guest'),
+            heartbeat:                 @failover.fetch(:heartbeat, :server),
             recovery_attempts:         @failover.fetch(:max_retries, 5),
             network_recovery_interval: @failover.fetch(:default_timeout, 5),
             connection_timeout:        @failover.fetch(:connection_timeout, 5),
+            read_timeout:              @failover.fetch(:read_timeout, 30),
+            write_timeout:             @failover.fetch(:write_timeout, 30),
             logger:                    Basquiat.logger
           )
           __setobj__(@connection)

data/lib/basquiat/adapters/rabbitmq_adapter.rb

@@ -43,7 +43,11 @@ module Basquiat
       # @param message [Hash] the message to be publish
       # @param props [Hash] other properties you wish to publish with the message, such as custom headers etc.
       def publish(event, message, props: {})
-        session_pool.with { |session| session.publish(event, message, props) }
+        if options[:publisher][:session_pool]
+          session_pool.with { |session| session.publish(event, message, props) }
+        else
+          session.publish(event, message, props)
+        end
         disconnect unless options[:publisher][:persistent]
       end
 
@@ -90,8 +94,8 @@ module Basquiat
       # Lazy initializes and return the session pool
       # @return [ConnectionPool<Session>]
       def session_pool
-        @session_pool ||= ConnectionPool.new(size: options[:publisher][:session_pool][:size],
-                                             timeout: options[:publisher][:session_pool][:timeout]) do
+        @session_pool ||= ConnectionPool.new(size: options[:publisher][:session_pool].fetch(:size, 1),
+                                             timeout: options[:publisher][:session_pool].fetch(:timeout, 5)) do
           Session.new(connection.create_channel, @configuration.session_options)
         end
       end

data/lib/basquiat/support/configuration.rb

@@ -32,10 +32,12 @@ module Basquiat
     #     or :development
     attr_writer :queue_name, :exchange_name, :logger, :environment
 
+    # @!attribute connection - Makes Basquiat to use a provided connection
+    #   @return [Object] the provided connection
     # @!attribute rescue_proc
     #   @return [#call] return the callable to be executed when some exception is thrown. The callable receives the
     #     exception and message
-    attr_accessor :rescue_proc
+    attr_accessor :connection, :rescue_proc
 
     def queue_name
       @queue_name || 'basquiat.queue'

data/lib/basquiat/version.rb

@@ -2,5 +2,5 @@
 
 # Version file
 module Basquiat
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 end

data/spec/lib/adapters/rabbitmq_adapter_spec.rb

@@ -37,6 +37,8 @@ RSpec.describe Basquiat::Adapters::RabbitMq do
             publisher: { persistent: true, session_pool: { size: 10 } } }
         end
 
+        before { Basquiat.configure { |c| c.connection = Bunny.new.tap(&:start) } }
+
         it '#publish [enqueue a message 10 times concurrently]' do
           expect do
             threads = []
@@ -48,6 +50,8 @@ RSpec.describe Basquiat::Adapters::RabbitMq do
             threads.each(&:join)
           end.not_to raise_error
         end
+
+        after { Basquiat.configure { |c| c.connection = nil } }
       end
     end
 

data/spec/lib/support/configuration_spec.rb

@@ -37,6 +37,17 @@ RSpec.describe Basquiat::Configuration do
       expect(config.exchange_name).to eq('basquiat.exchange')
     end
 
+    it '#connection' do
+      expect(config.connection).to be_nil
+    end
+
+    it '#connection=' do
+      connection = spy('connection')
+      config.connection = connection
+
+      expect(config.connection).to eq(connection)
+    end
+
     it '#logger' do
       expect(config.logger).not_to be_nil
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: basquiat
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Marcello "mereghost" Rocha
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-06 00:00:00.000000000 Z
+date: 2018-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler