async-job-adapter-active_job 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a39dbb873ca265d9f750235a0be307e24110956aceb8a58e4c5fdebe53cd46ff
-  data.tar.gz: aa5d024057874f46d90345f638d7355e0e7a5fd60dd9b16005ec3d489eb03b79
+  metadata.gz: 9963783ca059ac1a3572fdbcca27ecfb6b0e2512e8994603ba1e1191d77ece61
+  data.tar.gz: f4be3f33865cf8a1d5aeec993b518418c9f422090ed0de4c5ff16aef5a02a276
 SHA512:
-  metadata.gz: 38b2b356333aee50cf84dbff824ef5da4dc3fe91068c6d94a1129e35975c59f4135f85ac4cb4bce5c08c2378138ece5270144737d18825f4bbe16e1c1e948360
-  data.tar.gz: 62e653848d731ed01c794ec08e1d29938887e79632a49837557fe2307678126d29040b84d8b9220be3ca009d15c6454c7777088f138a2f86777597e552b5b153
+  metadata.gz: bc94ed3bad8be7871793b65a36cec6da478515df5cec6f0c733c842fd9af2f3024174314f7f2bab308d4bb7175dbec65b4c62934dae4578b9c9f97d7021108f7
+  data.tar.gz: c232453580b7ee21760449b7e31f69b06cc4f7ee862c885a7eb61e0bc90057fd9e27d9c38bd93e00c94af4e7ede932204fb8a3a3804850c61ae3e619bdb25e28

data/lib/async/job/adapter/active_job/builder.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2024, by Samuel Williams.
+
+require_relative 'queue_adapter'
+require_relative 'queue_handler'
+
+module Async
+	module Job
+		module Adapter
+			module ActiveJob
+				class Builder
+					Pipeline = Struct.new(:adapter, :queue)
+					
+					def initialize
+						@enqueue = []
+						@dequeue = []
+						@handler = QueueHandler::DEFAULT
+						
+						@queue = nil
+					end
+					
+					def enqueue(middleware)
+						@enqueue << middleware
+					end
+					
+					def queue(queue, *arguments, **options)
+						# The handler is the output side of the queue, e.g. a QueueHandler or similar wrapper.
+						# The queue itself is instantiated with the handler.
+						@queue = ->(handler){queue.new(handler, *arguments, **options)}
+					end
+					
+					def dequeue(middleware)
+						@dequeue << middleware
+					end
+					
+					def handler(handler)
+						@handler = handler
+					end
+					
+					def build
+						# To construct the queue, we need the handler.
+						handler = @handler
+						
+						# We then wrap the handler with the middleware in reverse order:
+						@dequeue.reverse_each do |middleware|
+							handler = middleware.new(handler)
+						end
+						
+						# We can now construct the queue with the handler:
+						queue = @queue.call(handler)
+						
+						adapter = queue
+						
+						# We now construct the queue adapter:
+						adapter = @enqueue.reverse_each do |middleware|
+							adapter = middleware.new(queue)
+						end
+						
+						unless adapter.is_a?(QueueAdapter)
+							adapter = QueueAdapter.new(adapter)
+						end
+						
+						# The adapter is the part we provide to ActiveJob, and the handler is the part that actually executes the job:
+						return Pipeline.new(adapter, queue)
+					end
+				end
+			end
+		end
+	end
+end

data/lib/async/job/adapter/active_job/dispatcher.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2024, by Samuel Williams.
+
+require 'async/job'
+require 'thread/local'
+
+require_relative 'builder'
+
+module Async
+	module Job
+		module Adapter
+			module ActiveJob
+				class Dispatcher
+					def initialize(backends, aliases = {})
+						@backends = backends
+						@aliases = aliases
+						
+						@pipelines = {}
+					end
+					
+					attr :backends
+					
+					attr :aliases
+					
+					def [](name)
+						@pipelines.fetch(name) do
+							backend = @backends.fetch(name)
+							@pipelines[name] = build(backend)
+						end
+					end
+					
+					def enqueue(job)
+						name = @aliases.fetch(job.queue_name, job.queue_name)
+						
+						self[name].adapter.enqueue(job)
+					end
+					
+					def enqueue_at(job, timestamp)
+						name = @aliases.fetch(job.queue_name, job.queue_name)
+						
+						self[name].adapter.enqueue_at(job, timestamp)
+					end
+					
+					def start(name)
+						self[name].queue.start
+					end
+					
+					private def build(backend)
+						builder = Builder.new
+						
+						builder.instance_eval(&backend)
+						
+						builder.build
+					end
+				end
+			end
+		end
+	end
+end

data/lib/async/job/adapter/active_job/queue_adapter.rb

@@ -22,17 +22,6 @@ module Async
 						Console.info(self, "Enqueueing job at...", id: job.job_id, timestamp: timestamp)
 						@server.schedule(@coder.dump(job.serialize), timestamp)
 					end
-					
-					def start
-						Async do
-							@server.start
-							
-							@server.each do |id, data|
-								job = @coder.parse(data)
-								::ActiveJob::Base.execute(job)
-							end
-						end
-					end
 				end
 			end
 		end

data/lib/async/job/adapter/active_job/queue_handler.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2024, by Samuel Williams.
+
+require 'json'
+
+module Async
+	module Job
+		module Adapter
+			module ActiveJob
+				class QueueHandler
+					def initialize(coder = JSON)
+						@coder = coder
+					end
+					
+					def call(job)
+						job = @coder.load(job)
+						Console.info(self, "Calling job...", id: job[:job_id])
+						::ActiveJob::Base.execute(job)
+					end
+					
+					DEFAULT = self.new.freeze
+				end
+			end
+		end
+	end
+end

data/lib/async/job/adapter/active_job/railtie.rb

@@ -3,38 +3,77 @@
 # Released under the MIT License.
 # Copyright, 2024, by Samuel Williams.
 
+require 'async/job'
 require 'thread/local'
-require 'async/redis/client'
-require 'async/job/backend/redis/server'
+
+require_relative 'dispatcher'
+
+class Thread
+	attr_accessor :async_job_adapter_active_job_dispatcher
+end
 
 module Async
 	module Job
 		module Adapter
 			module ActiveJob
 				class Railtie < ::Rails::Railtie
-					config.async_job = ActiveSupport::OrderedOptions.new
+					DEFAULT_REDIS = proc do
+						queue Async::Job::Backend::Redis
+					end
+					
+					def initialize
+						@backends = {default: DEFAULT_REDIS}
+						@aliases = {}
+					end
+					
+					attr :backends
+					
+					attr :aliases
+					
+					def backend_for(name, *aliases, &block)
+						@backends[name] ||= block
+						
+						if aliases.any?
+							alias_for(name, *aliases)
+						end
+					end
+					
+					def alias_for(name, *aliases)
+						aliases.each do |alias_name|
+							@aliases[alias_name] = name
+						end
+					end
 					
-					module Dispatcher
-						extend Thread::Local
+					# Used for dispatching jobs to a thread-local backend to avoid thread-safety issues.
+					class ThreadLocalDispatcher
+						def initialize(backends, aliases)
+							@backends = backends
+							@aliases = aliases
+						end
+						
+						def dispatcher
+							Thread.current.async_job_adapter_active_job_dispatcher ||= Dispatcher.new(@backends)
+						end
 						
-						def self.local
-							server = Async::Job::Backend.new(
-								**Railtie.config.async_job
-							)
-							
-							return QueueAdapter.new(server)
+						def enqueue_at(job, timestamp)
+							dispatcher.enqueue_at(job, timestamp)
 						end
 						
-						def self.enqueue(job)
-							self.instance.enqueue(job)
+						def enqueue(job)
+							dispatcher.enqueue(job)
 						end
 						
-						def self.enqueue_at(job, timestamp)
-							self.instance.enqueue_at(job, timestamp)
+						def start(name)
+							dispatcher.start(name)
 						end
 					end
 					
-					config.active_job.queue_adapter = Dispatcher
+					def start(name = :default)
+						config.active_job.queue_adapter.start(name)
+					end
+					
+					config.async_job = self
+					config.active_job.queue_adapter = ThreadLocalDispatcher.new(self.backends, self.aliases)
 				end
 			end
 		end

data/lib/async/job/adapter/active_job/version.rb

@@ -7,7 +7,7 @@ module Async
 	module Job
 		module Adapter
 			module ActiveJob
-				VERSION = "0.2.0"
+				VERSION = "0.3.0"
 			end
 		end
 	end

data/lib/async/job/adapter/active_job.rb

@@ -5,5 +5,4 @@
 
 require_relative 'active_job/version'
 require_relative 'active_job/queue_adapter'
-
 require_relative "active_job/railtie" if defined?(Rails::Railtie)

data/readme.md

@@ -30,6 +30,22 @@ Then run it:
 $ bundle exec ./job-server.rb
 ```
 
+### Configuration
+
+```ruby
+Rails.application.configure do
+	config.async_job.backend_for :default, :critical do
+		queue Async::Job::Backend::Redis, endpoint: Async::IO::Endpoint.tcp('redis.local')
+	end
+	
+	config.async_job.aliases_for :default, :email
+	
+	config.async_job.backend_for :local do
+		queue Async::Job::Backend::Inline
+	end
+end
+```
+
 ## Contributing
 
 We welcome contributions to this project.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-job-adapter-active_job
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -37,7 +37,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-02-24 00:00:00.000000000 Z
+date: 2024-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-job
@@ -74,7 +74,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/async/job/adapter/active_job.rb
+- lib/async/job/adapter/active_job/builder.rb
+- lib/async/job/adapter/active_job/dispatcher.rb
 - lib/async/job/adapter/active_job/queue_adapter.rb
+- lib/async/job/adapter/active_job/queue_handler.rb
 - lib/async/job/adapter/active_job/railtie.rb
 - lib/async/job/adapter/active_job/service.rb
 - lib/async/job/adapter/active_job/version.rb