advanced-sneakers-activejob 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7828be1674a92df4c43f0e86df282461e158438252ea16439d26f3ffc3bf1a22
-  data.tar.gz: 1e0248e9dd8b8af0b3c5b5da1294bc970f93f501bfb8185c19c1da486d78514f
+  metadata.gz: a83b8e71434ad265d08febb7a8c186813c37971b0ce8c83520699a9a0e8bf71d
+  data.tar.gz: 53546ff1d7a72231ac909ad8a3e23c10f5606e0ecc1b6eae431f49de8b3c4af7
 SHA512:
-  metadata.gz: bd60af5cc86febf88ec62c11dbe5b90b5528f96d1b7b4a357cec61e01260e3b587a4e3e69b171508866685827468c1084a294baa3e5a2ba8c7cbf35a8cae20f0
-  data.tar.gz: 546258b0a88d0a105ac120dcb90c68c3608f8a4123e5ad556881f5fed331bb18a68ea074801f286d5c3d64ecc2814a75fd1fc0ad5866708908a230cf09e3e5b6
+  metadata.gz: af2a68a5be7dedd658e7efc835b2fea1904c1e63ea0dd0b4f083405b62c686d8f160a44eaf3119a90e886a8cab73066a6d839cb1d2152f4b27c759edf382cb94
+  data.tar.gz: 4c6365c18cf1aeeb469b6ea2d6df39866149874400a713d2ab785df7d3c09577b9200dcfe0f8a4de336bebc9809933d9bd9ba2ec6f6fb2693f1e76a2f87539fa

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.4.0...HEAD)
+## [Unreleased](https://github.com/veeqo/advanced-sneakers-activejob/compare/v0.5.0...HEAD)
+
+
+## [0.5.0](https://github.com/veeqo/advanced-sneakers-activejob/compare/v0.4.0...v0.5.0) - 2020-11-30
+
+### Changed
+- [#16](https://github.com/veeqo/advanced-sneakers-activejob/pull/16) Switch to bunny-publisher v0.2 (drops republish connection)
 
 
 ## [0.4.0](https://github.com/veeqo/advanced-sneakers-activejob/compare/v0.3.6...v0.4.0) - 2020-11-17

data/README.md

@@ -181,9 +181,6 @@ AdvancedSneakersActiveJob.configure do |config|
 
   # Connection for publisher (fallbacks to connection of consumers)
   config.publish_connection = Bunny.new('CUSTOM_URL', with: { other: 'options' })
-
-  # Unrouted messages republish requires extra connection and will try to "clone" publish_connection unless it is provided
-  config.republish_connection = Bunny.new('CUSTOM_URL', with: { other: 'options' })
 end
 ```
 

data/advanced-sneakers-activejob.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'activejob', '>= 4.2'
-  spec.add_dependency 'bunny-publisher', '~> 0.1'
+  spec.add_dependency 'bunny-publisher', '~> 0.2.0'
   spec.add_dependency 'sneakers', '~> 2.7'
 
   spec.add_development_dependency 'appraisal', '~> 2.3.0'

data/lib/advanced_sneakers_activejob/configuration.rb

@@ -18,7 +18,10 @@ module AdvancedSneakersActiveJob
     config_accessor(:retry_delay_proc) { ->(count) { AdvancedSneakersActiveJob::EXPONENTIAL_BACKOFF[count] } } # seconds
 
     config_accessor(:publish_connection)
-    config_accessor(:republish_connection)
+
+    def republish_connection=(_)
+      ActiveSupport::Deprecation.warn('Republish connection is not used for bunny-publisher v0.2+')
+    end
 
     def sneakers
       custom_config = DEFAULT_SNEAKERS_CONFIG.deep_merge(config.sneakers || {})
@@ -35,7 +38,7 @@ module AdvancedSneakersActiveJob
     end
 
     def publisher_config
-      sneakers.merge(publish_connection: publish_connection, republish_connection: republish_connection)
+      sneakers.merge(publish_connection: publish_connection)
     end
   end
 end

data/lib/advanced_sneakers_activejob/delayed_publisher.rb

@@ -17,24 +17,20 @@ module AdvancedSneakersActiveJob
     attr_reader :dlx_exchange_name
 
     def initialize(exchange:, **options)
-      super(options.merge(exchange: [exchange, 'delayed'].join('-'), exchange_options: { type: 'headers', durable: true }))
+      super(**options.merge(exchange: [exchange, 'delayed'].join('-'), exchange_options: { type: 'headers', durable: true }))
 
       @dlx_exchange_name = exchange
     end
 
     private
 
-    def log_message(publisher, message, options = {})
+    def log_message
       logger.debug do
-        delay = options.dig(:headers, 'delay')
-
-        "Publishing <#{message}> to [#{publisher.exchange.name}] with routing_key [#{options[:routing_key]}] and delay [#{delay}]"
+        "Publishing <#{message}> to [#{@exchange_name}] with routing_key [#{message_options[:routing_key]}] and delay [#{delay}]"
       end
     end
 
-    def declare_republish_queue(_return_info, properties, _message)
-      delay = properties.headers.fetch('delay')
-
+    def declare_republish_queue
       queue_name = delayed_queue_name(delay: delay)
 
       queue_arguments = {
@@ -45,11 +41,15 @@ module AdvancedSneakersActiveJob
 
       logger.debug { "Creating delayed queue [#{queue_name}]" }
 
-      republish_channel.queue(queue_name, durable: true, arguments: queue_arguments)
+      channel.queue(queue_name, durable: true, arguments: queue_arguments)
+    end
+
+    def delay
+      message_options.dig(:headers, 'delay')
     end
 
-    def declare_republish_queue_binding(queue, _return_info, properties, _message)
-      queue.bind(republish_exchange, arguments: { delay: properties.headers.fetch('delay') })
+    def declare_republish_queue_binding(queue)
+      queue.bind(exchange, arguments: { delay: delay })
     end
 
     def delayed_queue_name(delay:)

data/lib/advanced_sneakers_activejob/publisher.rb

@@ -14,9 +14,9 @@ module AdvancedSneakersActiveJob
 
     private
 
-    def log_message(publisher, message, options = {})
+    def log_message
       logger.debug do
-        "Publishing <#{message}> to [#{publisher.exchange.name}] with routing_key [#{options[:routing_key]}]"
+        "Publishing <#{message}> to [#{@exchange_name}] with routing_key [#{message_options[:routing_key]}]"
       end
     end
 

data/lib/advanced_sneakers_activejob/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: advanced-sneakers-activejob
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Rustam Sharshenov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-17 00:00:00.000000000 Z
+date: 2020-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: sneakers
   requirement: !ruby/object:Gem::Requirement
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Advanced Sneakers adapter for ActiveJob