advanced-sneakers-activejob 0.3.6 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c9c85eff744ad5d1de5009fc25cf53ad1b11922d4ed75b65c87045615850143
-  data.tar.gz: a67cc5ac97620471e7424066acab3ac5b513da37888ccd70599946c107b0a0fe
+  metadata.gz: 7828be1674a92df4c43f0e86df282461e158438252ea16439d26f3ffc3bf1a22
+  data.tar.gz: 1e0248e9dd8b8af0b3c5b5da1294bc970f93f501bfb8185c19c1da486d78514f
 SHA512:
-  metadata.gz: 2ba5450df0c6b7dd824c468d5962d77085c2cabcf3db3b009485cee68c917fbdf3d3109355b9148176f4841c388065402c9ce15c7bd2093bc89eec47cf6488a5
-  data.tar.gz: b9780aa81dc55deb3a311ba5d658b5c584398ee4df82a2e963acca9d9429bbfa6fbd34f3e1794e4e407ba7624456e6ea92cb19e47de22d8f3ccb7670cd76b323
+  metadata.gz: bd60af5cc86febf88ec62c11dbe5b90b5528f96d1b7b4a357cec61e01260e3b587a4e3e69b171508866685827468c1084a294baa3e5a2ba8c7cbf35a8cae20f0
+  data.tar.gz: 546258b0a88d0a105ac120dcb90c68c3608f8a4123e5ad556881f5fed331bb18a68ea074801f286d5c3d64ecc2814a75fd1fc0ad5866708908a230cf09e3e5b6

data/.rubocop.yml

@@ -12,6 +12,12 @@ Lint/SuppressedException:
   Exclude:
     - spec/**/*
 
+Lint/ConstantDefinitionInBlock:
+  Enabled: false
+
+Gemspec/RequiredRubyVersion:
+  Enabled: false
+
 Metrics/ClassLength:
   Enabled: false
 

data/CHANGELOG.md

@@ -4,7 +4,13 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## [Unreleased](https://github.com/veeqo/advanced-sneakers-activejob/compare/v0.3.6...HEAD)
+## [Unreleased](https://github.com/veeqo/advanced-sneakers-activejob/compare/v0.4.0...HEAD)
+
+
+## [0.4.0](https://github.com/veeqo/advanced-sneakers-activejob/compare/v0.3.6...v0.4.0) - 2020-11-17
+
+### Added
+- [#15](https://github.com/veeqo/advanced-sneakers-activejob/pull/15) Add ability to set AMQP message options per job
 
 
 ## [0.3.6](https://github.com/veeqo/advanced-sneakers-activejob/compare/v0.3.5...v0.3.6) - 2020-09-18

data/README.md

@@ -66,7 +66,7 @@ Take into accout that **this process is asynchronous**. It means that in case of
 
 ## Custom message options
 
-Advanced sneakers adapter allows to set custom message options (e.g. [routing keys](https://www.rabbitmq.com/tutorials/tutorial-four-ruby.html)).
+Advanced sneakers adapter allows to set [custom message options](http://reference.rubybunny.info/Bunny/Exchange.html#publish-instance_method) (e.g. [routing keys](https://www.rabbitmq.com/tutorials/tutorial-four-ruby.html)) on class-level.
 
 ```ruby
 class MyJob < ActiveJob::Base
@@ -96,6 +96,14 @@ class MyJob < ActiveJob::Base
 end
 ```
 
+And also supports custom message options per job
+```ruby
+MyJob.set(priority: 1, headers: { 'foo' => 'bar' }).perform_later('baz')
+```
+
+Read more about message properties:
+- https://www.rabbitmq.com/publishers.html#message-properties
+- http://reference.rubybunny.info/Bunny/Exchange.html#publish-instance_method
 
 Take into accout that **custom message options are used for publishing only**.
 

data/lib/active_job/queue_adapters/advanced_sneakers_adapter.rb

@@ -47,11 +47,7 @@ module ActiveJob
         end
 
         def build_publish_params(job)
-          params = job.class.publish_options.dup || {}
-
-          params.each do |key, value|
-            params[key] = value.call(job) if value.respond_to?(:call)
-          end
+          params = merged_publish_options(job)
 
           unless params.key?(:routing_key)
             params[:routing_key] = job.queue_name.respond_to?(:call) ? job.queue_name.call : job.queue_name
@@ -59,6 +55,18 @@ module ActiveJob
 
           params
         end
+
+        def merged_publish_options(job)
+          publish_options = job.class.publish_options.deep_dup || {}
+
+          publish_options.each do |key, value|
+            publish_options[key] = value.call(job) if value.respond_to?(:call)
+          end
+
+          publish_options.deep_merge!(job.publish_options) if job.publish_options.present?
+
+          publish_options
+        end
       end
 
       delegate :enqueue, :enqueue_at, to: :'ActiveJob::QueueAdapters::AdvancedSneakersAdapter' # compatibility with Rails 5+

data/lib/advanced_sneakers_activejob/active_job_patch.rb

@@ -6,7 +6,7 @@ module AdvancedSneakersActiveJob
 
     included do
       # AMQP message contains metadata which might be helpful for consumer (e.g. job.delivery_info.routing_key)
-      attr_accessor :delivery_info, :headers
+      attr_accessor :delivery_info, :headers, :publish_options
 
       class_attribute :publish_options, instance_accessor: false
     end
@@ -25,5 +25,13 @@ module AdvancedSneakersActiveJob
         self.publish_options = options.symbolize_keys
       end
     end
+
+    def enqueue(options = {})
+      # Since ActiveJob v5 :priority option is supported natively https://github.com/rails/rails/pull/19425
+      # publish_options holds its own :priority to "backport" priority feature to ActiveJob v4
+      self.publish_options = options.except(:wait, :wait_until, :queue)
+
+      super
+    end
   end
 end

data/lib/advanced_sneakers_activejob/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AdvancedSneakersActiveJob
-  VERSION = '0.3.6'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: advanced-sneakers-activejob
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
 platform: ruby
 authors:
 - Rustam Sharshenov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-18 00:00:00.000000000 Z
+date: 2020-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Advanced Sneakers adapter for ActiveJob