Bump version to 1.6.4 and add publishing job configuration options

t

а

f

а

f

f

Author: vadim.kar

Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    rabbit_messaging (1.6.3)
+    rabbit_messaging (1.6.4)
       bunny (~> 2.0)
       kicks
 

lib/rabbit.rb

@@ -18,6 +18,8 @@ class Config
                   :hooks,
                   :queue_name_conversion,
                   :receiving_job_class_callable,
+                  :publishing_job_class_callable,
+                  :default_publishing_job_queue,
                   :handler_resolver_callable,
                   :exception_notifier,
                   :before_receiving_hooks,
@@ -41,6 +43,8 @@ def initialize( # rubocop:disable Metrics/MethodLength
       environment: :production,
       queue_name_conversion: nil,
       receiving_job_class_callable: nil,
+      publishing_job_class_callable: nil,
+      default_publishing_job_queue: :default,
       handler_resolver_callable: nil,
       exception_notifier: nil,
       before_receiving_hooks: [],
@@ -63,6 +67,8 @@ def initialize( # rubocop:disable Metrics/MethodLength
       self.environment = environment.to_sym
       self.queue_name_conversion = queue_name_conversion
       self.receiving_job_class_callable = receiving_job_class_callable
+      self.publishing_job_class_callable = publishing_job_class_callable
+      self.default_publishing_job_queue = default_publishing_job_queue
       self.handler_resolver_callable = handler_resolver_callable
       self.exception_notifier = exception_notifier
       self.before_receiving_hooks = before_receiving_hooks
@@ -163,13 +169,15 @@ def configure
     config.validate!
   end
 
-  def publish(message_options)
+  def publish(message_options, custom_queue_name: nil)
     message = Publishing::Message.new(message_options)
+    publish_job_callable = config.publishing_job_class_callable || Publishing::Job
+    queue_name = custom_queue_name || default_queue_name
 
     if message.realtime?
       Publishing.publish(message)
     else
-      Publishing::Job.set(queue: default_queue_name).perform_later(message.to_hash)
+      publish_job_callable.set(queue: queue_name).perform_later(message.to_hash)
     end
   end
 
@@ -179,6 +187,6 @@ def queue_name(queue, ignore_conversion: false)
   end
 
   def default_queue_name(ignore_conversion: false)
-    queue_name(:default, ignore_conversion: ignore_conversion)
+    queue_name(config.default_publishing_job_queue, ignore_conversion: ignore_conversion)
   end
 end

lib/rabbit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rabbit
-  VERSION = "1.6.3"
+  VERSION = "1.6.4"
 end

spec/units/rabbit_spec.rb

@@ -12,6 +12,7 @@
       message_id: "uuid",
     }
   end
+  let(:additional_params) { {} }
 
   before do
     Rabbit.config.queue_name_conversion = -> (queue) { "#{queue}_prepared" }
@@ -52,8 +53,8 @@
 
     it "publishes" do
       if expect_to_use_job
-        set_params = { queue: "default_prepared" }
-        expect(Rabbit::Publishing::Job).to receive(:set).with(set_params).and_call_original
+        set_params = { queue: expected_queue }
+        expect(job_class).to receive(:set).with(set_params).and_call_original
         perform_params = {
           routing_key: "some_queue",
           event: "some_event",
@@ -68,7 +69,7 @@
           .to receive(:perform_later).with(perform_params).and_call_original
 
       else
-        expect(Rabbit::Publishing::Job).not_to receive(:perform_later)
+        expect(job_class).not_to receive(:perform_later)
       end
 
       expect(publish_logger).to receive(:debug).with(<<~MSG.strip)
@@ -79,7 +80,7 @@
         test_group_id.test_project_id.some_exchange / some_queue / {"foo":"bar"} / some_event / \
         confirm: ...world"}
       MSG
-      described_class.publish(message_options)
+      described_class.publish(message_options, **additional_params)
     end
 
     after do
@@ -96,6 +97,7 @@
     let(:publish_logger)   { double("publish_logger") }
     let(:bunny)            { double("bunny") }
     let(:channel)          { double("channel") }
+    let(:job_class)        { Rabbit::Publishing::Job }
 
     before do
       allow(Bunny).to receive_message_chain(:new, :start).and_return(bunny)
@@ -146,13 +148,64 @@
   context "realtime" do
     let(:realtime) { true }
     let(:expect_to_use_job) { false }
+    let(:expected_queue) { "default_prepared" }
+    let(:job_class) { Rabbit::Publishing::Job }
 
     include_examples "publishes"
   end
 
   context "not realtime" do
     let(:realtime) { false }
     let(:expect_to_use_job) { true }
+    let(:expected_queue) { "default_prepared" }
+    let(:job_class) { Rabbit::Publishing::Job }
+
+    include_examples "publishes"
+  end
+
+  context "with custom job class" do
+    let(:realtime) { false }
+    let(:expect_to_use_job) { true }
+    let(:expected_queue) { "default_prepared" }
+    let(:job_class) { Class.new(Rabbit::Publishing::Job) }
+
+    before do
+      stub_const("CustomJobClass", job_class)
+      allow(Rabbit.config).to receive(:publishing_job_class_callable).and_return(job_class)
+    end
+
+    include_examples "publishes"
+  end
+
+  context "with custom default_publishing_job_queue" do
+    let(:realtime) { false }
+    let(:expect_to_use_job) { true }
+    let(:job_class) { Rabbit::Publishing::Job }
+    let(:default_publishing_job_queue) { :custom_queue }
+    let(:expected_queue) { "passed_to_method_queue" }
+    let(:additional_params) { { custom_queue_name: "passed_to_method_queue" } }
+
+    before do
+      allow(Rabbit.config).to(
+        receive(:default_publishing_job_queue).and_return(default_publishing_job_queue),
+      )
+    end
+
+    include_examples "publishes"
+  end
+
+  context "with custom queue name" do
+    let(:realtime) { false }
+    let(:expect_to_use_job) { true }
+    let(:job_class) { Rabbit::Publishing::Job }
+    let(:default_publishing_job_queue) { :custom_queue }
+    let(:expected_queue) { "custom_queue_prepared" }
+
+    before do
+      allow(Rabbit.config).to(
+        receive(:default_publishing_job_queue).and_return(default_publishing_job_queue),
+      )
+    end
 
     include_examples "publishes"
   end