advanced-sneakers-activejob 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83290368db4ab9594638a5e8e8c33a19fbf3e25c80eda701da5e8cb8d9a7c01e
-  data.tar.gz: 512fda41a0c8ee3cd655ca0779c5f8057b0af86b00c7f88d569a2b267c51f25e
+  metadata.gz: 2ae17fa99114e9d196dfb9c0597250dd67fabb59bbf5bd687a16e0ec08876457
+  data.tar.gz: 655068e7718b730183051637ba4a9532e906655a811721df371eb7ba2b68ad41
 SHA512:
-  metadata.gz: 00a6507d677dabf7750080aff743bade38ecc6a2b77a8a33c7fb8db784508be114dbbc62426be14a9c26a1e44c4c9ee20fb1d319f12f631cacb8251bbf8d1f93
-  data.tar.gz: e83397b48629df2df3461a5b6825d42ab0f51ce46fdf44444eb017cfa976b1d69b5f44d2cec56b14155827858df16ec4f3fc35e776ce2dd58c263163cfe13802
+  metadata.gz: 354d6f85a842408cb17e214b20ab5a0eb25815ce2e54ba727e8a4ac3309cd220e6a2e33c777f2bf13a97381d41777d8e50d63d1ab95a2b4c0a67680b3f992330
+  data.tar.gz: 9a3552f273d1da9ace5d808aab2b519f1c21d2dbebcecb72c272c699f8914b2381e44e4c8e023f939391aa86f6648bc8673a1a763a705d8f4141024151c8437f

data/CHANGELOG.md

@@ -1,4 +1,9 @@
-## Changes Between 0.2.0 and 0.2.2
+## Changes Between 0.2.2 and 0.2.3
+
+### Refactored support for ActiveJob prefix https://github.com/veeqo/advanced-sneakers-activejob/pull/3
+### Support for custom adapter per job https://github.com/veeqo/advanced-sneakers-activejob/pull/4
+
+## Changes Between 0.2.1 and 0.2.2
 
 Cleanup of `puts` and logger mistakenly introduced in previous version
 

data/lib/advanced_sneakers_activejob.rb

@@ -31,18 +31,36 @@ module AdvancedSneakersActiveJob
     end
 
     def define_consumer(queue_name:)
-      @consumers ||= {}
-
-      @consumers[queue_name] ||= begin
-        klass = Class.new(ActiveJob::QueueAdapters::AdvancedSneakersAdapter::JobWrapper)
-        klass.include Sneakers::Worker
-        const_set([queue_name, 'queue_consumer'].join('_').classify, klass)
-        klass.from_queue(queue_name, AdvancedSneakersActiveJob.config.sneakers)
-      end
+      name = consumer_name(queue_name: queue_name)
+
+      return const_get(name) if const_defined?(name)
+
+      klass = Class.new(ActiveJob::QueueAdapters::AdvancedSneakersAdapter::JobWrapper)
+      const_set(name, klass)
+      klass.include Sneakers::Worker
+      klass.from_queue(queue_name, AdvancedSneakersActiveJob.config.sneakers)
+
+      klass
     end
 
     def publisher
       @publisher ||= AdvancedSneakersActiveJob::Publisher.new
     end
+
+    # Based on ActiveSupport::Inflector#parameterize
+    def consumer_name(queue_name:)
+      # replace accented chars with their ascii equivalents
+      parameterized_string = ::ActiveSupport::Inflector.transliterate(queue_name)
+      # Turn unwanted chars into the separator
+      parameterized_string.gsub!(/[^a-z0-9\-_]+/, '_')
+      # No more than one of the separator in a row.
+      parameterized_string.gsub!(/_{2,}/, '_')
+      # Remove leading/trailing separator.
+      parameterized_string.gsub!(/^_|_$/, '')
+      # Ruby does not allow classes with leading digits
+      parameterized_string.gsub!(/\A(\d)/, 'queue\1')
+
+      [parameterized_string, 'consumer'].join('_').classify
+    end
   end
 end

data/lib/advanced_sneakers_activejob/active_job_patch.rb

@@ -19,30 +19,11 @@ module AdvancedSneakersActiveJob
         end
       end
 
-      def queue_as(*args)
-        super(*args)
-        define_consumer
-      end
-
       def message_options(options)
         raise ArgumentError, 'message_options accepts Hash argument only' unless options.is_a?(Hash)
 
         self.publish_options = options.symbolize_keys
       end
-
-      private
-
-      def define_consumer
-        AdvancedSneakersActiveJob.define_consumer(queue_name: queue_name_without_prefix)
-      end
-
-      def queue_name_without_prefix
-        name = queue_name.respond_to?(:call) ? queue_name.call : queue_name
-
-        return name if queue_name_prefix.blank?
-
-        name.to_s.sub([queue_name_prefix, queue_name_delimiter].join, '')
-      end
     end
   end
 end

data/lib/advanced_sneakers_activejob/publisher.rb

@@ -170,9 +170,9 @@ module AdvancedSneakersActiveJob
 
     def delayed_queue_name(delay:)
       [
-        config_delayed_queue_prefix,
-        delay
-      ].join(':')
+        ::ActiveJob::Base.queue_name_prefix,
+        [config_delayed_queue_prefix, delay].join(':')
+      ].compact.join(::ActiveJob::Base.queue_name_delimiter)
     end
 
     def create_delayed_queue_and_binding(queue_name:, delay:)

data/lib/advanced_sneakers_activejob/railtie.rb

@@ -12,7 +12,6 @@ module AdvancedSneakersActiveJob
     initializer 'advanced_sneakers_activejob.discover_default_job' do
       ActiveSupport.on_load(:active_job) do
         ActiveJob::Base.include AdvancedSneakersActiveJob::ActiveJobPatch
-        ActiveJob::Base.queue_as # Enforce definition of ActiveJob::Base::Consumer (default queue)
       end
     end
 

data/lib/advanced_sneakers_activejob/tasks.rb

@@ -5,7 +5,7 @@ require 'sneakers/tasks'
 task :environment
 
 namespace :sneakers do
-  desc 'Start work for ActiveJob only (set $WORKERS=AdvancedSneakersActiveJob::FooQueueConsumer for processing of :foo queue)'
+  desc 'Start work for ActiveJob only (set $WORKERS=AdvancedSneakersActiveJob::FooConsumer for processing of :foo queue)'
   task :active_job do
     Rake::Task['environment'].invoke
 

data/lib/advanced_sneakers_activejob/version.rb

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

data/lib/advanced_sneakers_activejob/workers_registry.rb

@@ -4,7 +4,7 @@ module AdvancedSneakersActiveJob
   # Sneakers uses Sneakers::Worker::Classes array to track all workers.
   # WorkersRegistry mocks original array to track ActiveJob workers separately.
   class WorkersRegistry
-    attr_reader :sneakers_workers, :activejob_workers
+    attr_reader :sneakers_workers
 
     delegate :activejob_workers_strategy, to: :'AdvancedSneakersActiveJob.config'
 
@@ -17,7 +17,7 @@ module AdvancedSneakersActiveJob
 
     def <<(worker)
       if worker <= ActiveJob::QueueAdapters::AdvancedSneakersAdapter::JobWrapper
-        activejob_workers << worker
+        @activejob_workers << worker
       else
         sneakers_workers << worker
       end
@@ -36,12 +36,37 @@ module AdvancedSneakersActiveJob
       end
     end
 
-    # For cleaner output on inspecting Sneakers::Worker::Classes in console.
-    def inspect
+    def to_hash
       {
         sneakers_workers: sneakers_workers,
         activejob_workers: activejob_workers
       }
     end
+
+    alias to_h to_hash
+
+    # For cleaner output on inspecting Sneakers::Worker::Classes in console.
+    alias inspect to_hash
+
+    def activejob_workers
+      define_active_job_consumers
+
+      @activejob_workers
+    end
+
+    private
+
+    def define_active_job_consumers
+      active_job_classes_with_matching_adapter.each do |worker|
+        AdvancedSneakersActiveJob.define_consumer(queue_name: worker.new.queue_name)
+      end
+    end
+
+    def active_job_classes_with_matching_adapter
+      ([ActiveJob::Base] + ActiveJob::Base.descendants).select do |klass|
+        klass.queue_adapter == ::ActiveJob::QueueAdapters::AdvancedSneakersAdapter ||
+          klass.queue_adapter.is_a?(::ActiveJob::QueueAdapters::AdvancedSneakersAdapter)
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: advanced-sneakers-activejob
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Rustam Sharshenov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-05 00:00:00.000000000 Z
+date: 2020-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob