async-job-adapter-active_job 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9963783ca059ac1a3572fdbcca27ecfb6b0e2512e8994603ba1e1191d77ece61
-  data.tar.gz: f4be3f33865cf8a1d5aeec993b518418c9f422090ed0de4c5ff16aef5a02a276
+  metadata.gz: f3f95cf52e07f98e11adbedad14d9835f1ba64b6e6a9613b95b638e4d941d7f3
+  data.tar.gz: 56e91d6940e972e039a2f2c7b1e7087e88fda0a1d7d3843e02dd76269da05890
 SHA512:
-  metadata.gz: bc94ed3bad8be7871793b65a36cec6da478515df5cec6f0c733c842fd9af2f3024174314f7f2bab308d4bb7175dbec65b4c62934dae4578b9c9f97d7021108f7
-  data.tar.gz: c232453580b7ee21760449b7e31f69b06cc4f7ee862c885a7eb61e0bc90057fd9e27d9c38bd93e00c94af4e7ede932204fb8a3a3804850c61ae3e619bdb25e28
+  metadata.gz: e8a839e220fb8275fdec36ce92d1e032d12c9d81f640f43696e616f12bbb1129137e69b3de1b1f72031edf38f7aa97111952233dbe969ba2df6ae1d71f4d3281
+  data.tar.gz: ed9c0bc33a45762edaf8744f62148e9d690ef769d88ae18ebac6bc5cc258f1fe6dac8bf9bbee98e4bb175e1ac39c570af6f17be4ad3ffdb28e953d847cd0b2f0

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

@@ -6,7 +6,7 @@
 require 'async/job'
 require 'thread/local'
 
-require_relative 'builder'
+require 'async/job/builder'
 
 module Async
 	module Job
@@ -25,6 +25,8 @@ module Async
 					attr :aliases
 					
 					def [](name)
+						name = name.to_sym
+						
 						@pipelines.fetch(name) do
 							backend = @backends.fetch(name)
 							@pipelines[name] = build(backend)
@@ -48,11 +50,16 @@ module Async
 					end
 					
 					private def build(backend)
-						builder = Builder.new
+						builder = Builder.new(Executor::DEFAULT)
 						
 						builder.instance_eval(&backend)
 						
-						builder.build
+						builder.build do |producer|
+							# Ensure that the producer is an interface:
+							unless producer.is_a?(Interface)
+								Interface.new(producer)
+							end
+						end
 					end
 				end
 			end

data/lib/async/job/adapter/active_job/{queue_handler.rb → executor.rb}

@@ -9,17 +9,19 @@ module Async
 	module Job
 		module Adapter
 			module ActiveJob
-				class QueueHandler
-					def initialize(coder = JSON)
-						@coder = coder
+				class Executor
+					def initialize(delegate = nil)
+						@delegate = delegate
 					end
 					
 					def call(job)
-						job = @coder.load(job)
-						Console.info(self, "Calling job...", id: job[:job_id])
+						Console.info(self, "Executing job...", id: job[:job_id])
 						::ActiveJob::Base.execute(job)
+						
+						@delegate&.call(job)
 					end
 					
+					# The default executor, at the end of the pipeline.
 					DEFAULT = self.new.freeze
 				end
 			end

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

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2024, by Samuel Williams.
+
+module Async
+	module Job
+		module Adapter
+			module ActiveJob
+				class Interface
+					def initialize(delegate)
+						@delegate = delegate
+					end
+					
+					def enqueue(job)
+						Console.info(self, "Enqueueing job...", id: job.job_id)
+						@delegate.call(serialize(job))
+					end
+					
+					def enqueue_at(job, timestamp)
+						# We assume the given timestamp is the same as `job.scheduled_at` which is true in every case we've seen so far.
+						Console.info(self, "Scheduling job...", id: job.job_id, scheduled_at: job.scheduled_at)
+						@delegate.call(serialize(job))
+					end
+					
+					protected
+					
+					def serialize(job)
+						job.serialize
+					end
+				end
+			end
+		end
+	end
+end

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

@@ -17,12 +17,12 @@ module Async
 		module Adapter
 			module ActiveJob
 				class Railtie < ::Rails::Railtie
-					DEFAULT_REDIS = proc do
-						queue Async::Job::Backend::Redis
+					DEFAULT_PIPELINE = proc do
+						queue Async::Job::Backend::Inline
 					end
 					
 					def initialize
-						@backends = {default: DEFAULT_REDIS}
+						@backends = {default: DEFAULT_PIPELINE}
 						@aliases = {}
 					end
 					

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

@@ -12,16 +12,18 @@ module Async
 				class Service < Async::Service::Generic
 					def self.each
 						yield :service_class, self
+						yield :queue_name, :default
 					end
 					
 					def setup(container)
 						container.run(name: self.name, restart: true) do |instance|
-							require File.expand_path('config/environment', @environment.evaluator.root)
+							evaluator = @environment.evaluator
+							require File.expand_path('config/environment', evaluator.root)
 							
 							instance.ready!
 							
 							Sync do
-								Railtie::Dispatcher.instance.start
+								Railtie.start(evaluator.queue_name)
 							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.3.0"
+				VERSION = "0.5.0"
 			end
 		end
 	end

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

@@ -4,5 +4,6 @@
 # Copyright, 2024, by Samuel Williams.
 
 require_relative 'active_job/version'
-require_relative 'active_job/queue_adapter'
+require_relative 'active_job/interface'
+require_relative 'active_job/executor'
 require_relative "active_job/railtie" if defined?(Rails::Railtie)

data/readme.md

@@ -32,7 +32,7 @@ $ bundle exec ./job-server.rb
 
 ### Configuration
 
-```ruby
+``` 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')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-job-adapter-active_job
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -37,22 +37,22 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-02-25 00:00:00.000000000 Z
+date: 2024-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-job
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: thread-local
   requirement: !ruby/object:Gem::Requirement
@@ -74,10 +74,9 @@ 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/executor.rb
+- lib/async/job/adapter/active_job/interface.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

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

@@ -1,72 +0,0 @@
-# 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/queue_adapter.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-# Released under the MIT License.
-# Copyright, 2024, by Samuel Williams.
-
-module Async
-	module Job
-		module Adapter
-			module ActiveJob
-				class QueueAdapter
-					def initialize(server, coder = JSON)
-						@server = server
-						@coder = coder
-					end
-					
-					def enqueue(job)
-						Console.info(self, "Enqueueing job...", id: job.job_id)
-						@server.enqueue(@coder.dump(job.serialize))
-					end
-					
-					def enqueue_at(job, timestamp)
-						Console.info(self, "Enqueueing job at...", id: job.job_id, timestamp: timestamp)
-						@server.schedule(@coder.dump(job.serialize), timestamp)
-					end
-				end
-			end
-		end
-	end
-end