activejob-dispatch_rider 1.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ad8cd41d0e457743dd03943aba4efc40af19e52c
-  data.tar.gz: 5e59ba98d4aa917747e82772361b46ab3b3e3fd0
+SHA256:
+  metadata.gz: db7c7477074fd23481d8a9b69e679543200f5102e9c50793edef4b329f211831
+  data.tar.gz: 14afa06d887d740449067514cfc74e98665f31da6fdc5bab1f73c72288624ac5
 SHA512:
-  metadata.gz: 47b37f3ba16b43eb15f8fbbbf22303befdc0064e940d78ea5893c45ed8685c4adfce13caaf5e155b702d4f1cb276fa99aaefb99af58476dbb989cde3677a9599
-  data.tar.gz: 10c278700fc385c817c430e0f9a5ad6bb87b689674b4d7bdac4179288a20839759e085f0eb8fd8daee401c2f3664c423dbcbc48b042895510ed110764291dce4
+  metadata.gz: e0e2644b009e6def66cbfca386d03f9120db66203ee4332922f47a2d2c69bb7eab2f31ecaa9348b6eb5f104b8db9954a211f8e8aace6008130194ba02dc9058a
+  data.tar.gz: c755ec69b3923b912c8d9d77095343ce1da6f2a6acd2bf7907f22a85987422bf4a7fafc97fff5e2c3207f8811e4d46e2eecddabdf3c45b92d65c397c8d11a6a2

data/.gitignore

@@ -7,6 +7,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+spectmp
 *.bundle
 *.so
 *.o

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+addons:
+  apt:
+    packages:
+      - libgmp-dev
+rvm:
+  - 2.4.6
+  - 2.5.5
+  - 2.6.3
+script: "bundle exec rspec"
+

data/README.md

@@ -139,3 +139,9 @@ CallAndWelcomeCustomer.perform_later Customer.find_by_name!("Smith"),
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create a new Pull Request
+
+## Contributors
+
+Special thanks to those who contributed to this project. :smile:
+
+* [@fredbaa](https://github.com/fredbaa)

data/activejob-dispatch_rider.gemspec

@@ -18,10 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activejob"
-  spec.add_dependency "dispatch-rider"
+  spec.add_dependency "activejob", '~> 5.1.0'
+  spec.add_dependency "dispatch-rider", "~> 1.7"
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "codeclimate-test-reporter"
+  spec.add_development_dependency "sqlite3"
 end

data/lib/activejob/dispatch_rider.rb

@@ -1,12 +1,15 @@
-require "activejob/dispatch_rider/version"
 require "active_job"
 require "dispatch-rider"
-require "dispatch_rider_active_job_handler"
 
 module ActiveJob
   module DispatchRider
-    # Your code goes here...
   end
 end
 
-require "activejob/queue_adapters/dispatch_rider_adapter"
+require_relative "dispatch_rider/version"
+require_relative "dispatch_rider/job_handler"
+require_relative "dispatch_rider/handler_registrar_fallback"
+require_relative "queue_adapters/dispatch_rider_adapter"
+
+# Handle all unregistered messages as messages coming from ActiveJobs.
+DispatchRider::Registrars::Handler.prepend ActiveJob::DispatchRider::HandlerRegistrarFallback

data/lib/activejob/dispatch_rider/handler_registrar_fallback.rb

@@ -0,0 +1,16 @@
+module ActiveJob
+  module DispatchRider
+    # This module is prepended to `DispatchRider::Registrars::Handler` to allow it to cover any
+    # ActiveJob messages. The assumption is that if the message's subject doesn't have a registered
+    # native `DispatchRider::Handler` then the job is delegated to
+    # `ActiveJob::DispatchRider::JobHandler`. `ActiveJob::DispatchRider::JobHandler` essentially
+    # just let ActiveJob process the message as it would process them normally.
+    module HandlerRegistrarFallback
+      def fetch(*)
+        super
+      rescue ::DispatchRider::NotRegistered
+        JobHandler
+      end
+    end
+  end
+end

data/lib/activejob/dispatch_rider/job_handler.rb

@@ -0,0 +1,10 @@
+module ActiveJob
+  module DispatchRider
+    # Generic DispatchRider handler for ActiveJob.
+    class JobHandler < ::DispatchRider::Handlers::Base
+      def process(job_data)
+        ::ActiveJob::Base.execute job_data
+      end
+    end
+  end
+end

data/lib/activejob/dispatch_rider/version.rb

@@ -1,5 +1,5 @@
 module ActiveJob
   module DispatchRider
-    VERSION = "1.0.0"
+    VERSION = "2.1.0"
   end
 end

data/lib/activejob/queue_adapters/dispatch_rider_adapter.rb

@@ -2,21 +2,17 @@ module ActiveJob
   module QueueAdapters
     # Adds support for DispatchRider to ActiveJob.
     class DispatchRiderAdapter
-      class << self
         # @param [ActiveJob::Base] job
         def enqueue(job)
-          publisher.publish destinations: Array(job.queue_name),
-                            message: {
-                              subject: "dispatch_rider_active_job_handler",
-                              body: job.serialize
-                            }
+          publisher.publish job_details_for(job)
         end
 
-        def enqueue_at(*)
-          raise NotImplementedError,
-                "This queueing backend does not support scheduling jobs. To "\
-                "see what features are supported go to "\
-                "http://api.rubyonrails.org/classes/ActiveJob/QueueAdapters.html"
+        # @param [ActiveJob::Base] job
+        # @param [Float] scheduled_at - float representing time (blame AJ)
+        def enqueue_at(job, scheduled_at)
+          scheduled_job_details = job_details_for(job).merge(scheduled_at: Time.at(scheduled_at))
+
+          ::DispatchRider::ScheduledJob.create! scheduled_job_details
         end
 
         private
@@ -24,7 +20,16 @@ module ActiveJob
         def publisher
           @publisher ||= ::DispatchRider::Publisher.new
         end
-      end
+
+        def job_details_for(job)
+          {
+            destinations: Array(job.queue_name),
+            message: {
+              subject: job.class.name.underscore,
+              body: job.serialize.merge(guid: job.job_id)
+            }
+          }
+        end
     end
   end
 end

data/spec/{dispatch_rider_active_job_handler_spec.rb → activejob/dispatch_rider/job_handler_spec.rb}

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe DispatchRiderActiveJobHandler do
+describe ActiveJob::DispatchRider::JobHandler do
 
   let!(:job_class) {
     job_class = Class.new(ActiveJob::Base) do
@@ -27,7 +27,7 @@ describe DispatchRiderActiveJobHandler do
           "_aj_symbol_keys" => ["foo"]
         }
       ],
-      "guid" => "d9188320-580d-481f-a579-c3c521beccb8",
+      "guid" => "8b71ac6b-2854-4287-8d1b-15085b70280b",
     }
   }
 

data/spec/activejob/queue_adapters/dispatch_rider_adapter_spec.rb

@@ -50,8 +50,9 @@ describe ActiveJob::QueueAdapters::DispatchRiderAdapter do
       example("queued item") {
         foo_job_class.perform_later foo: "bar"
 
-        expect(foo_queued_item["subject"]).to eq("dispatch_rider_active_job_handler")
+        expect(foo_queued_item["subject"]).to eq("foo_aj_job")
         expect(foo_queued_item["body"]["job_class"]).to eq("FooAjJob")
+        expect(foo_queued_item["body"]["guid"]).to eq(foo_queued_item["body"]["job_id"])
         expect(foo_queued_item["body"]["queue_name"]).to eq("foo")
         expect(foo_queued_item["body"]["arguments"].first).to include("foo" => "bar")
       }
@@ -64,10 +65,15 @@ describe ActiveJob::QueueAdapters::DispatchRiderAdapter do
     end
 
     describe ".enqueue_at" do
-      let(:job) { double :job }
-      let(:timestamp) { Time.now }
+      let(:tomorrow_midnight) { Date.tomorrow.midnight }
 
-      example { expect { adapter.enqueue_at job, timestamp }.to raise_error NotImplementedError }
+      example {
+        expect {
+          foo_job_class.set(wait_until: tomorrow_midnight).perform_later foo: "bar"
+        }.to change(DispatchRider::ScheduledJob, :count).by 1
+
+        expect(DispatchRider::ScheduledJob.last.scheduled_at).to eq tomorrow_midnight
+      }
     end
   end
 end

data/spec/dispatch_rider/registrars/handler_spec.rb

@@ -0,0 +1,7 @@
+require "spec_helper"
+
+describe DispatchRider::Registrars::Handler do
+  subject(:registrar) { described_class.new }
+
+  example { expect(registrar.fetch "foo").to eq ActiveJob::DispatchRider::JobHandler }
+end

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
+require "sqlite3"
 
 require "activejob/dispatch_rider"
 
@@ -109,4 +108,20 @@ RSpec.configure do |config|
   # as the one that triggered the failure.
   Kernel.srand config.seed
 =end
+
+  config.before(:suite) do
+    FileUtils.mkdir_p "tmp"
+    FileUtils.rm_f "tmp/lite.db"
+    FileUtils.rm_rf "spectmp"
+    SQLite3::Database.new "tmp/lite.db"
+    ActiveRecord::Base.establish_connection adapter: :sqlite3, database: File.dirname(__FILE__) + "tmp/lite.db"
+    ActiveRecord::Schema.define(version: 1) do
+      extend DispatchRider::ScheduledJob::Migration
+      create_scheduled_jobs_table
+    end
+  end
+
+  config.after do
+    DispatchRider::ScheduledJob.destroy_all
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activejob-dispatch_rider
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Ronald Maravilla
@@ -9,36 +9,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-09 00:00:00.000000000 Z
+date: 2021-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: dispatch-rider
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -105,17 +105,20 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
 - activejob-dispatch_rider.gemspec
 - circle.yml
 - lib/activejob/dispatch_rider.rb
+- lib/activejob/dispatch_rider/handler_registrar_fallback.rb
+- lib/activejob/dispatch_rider/job_handler.rb
 - lib/activejob/dispatch_rider/version.rb
 - lib/activejob/queue_adapters/dispatch_rider_adapter.rb
-- lib/dispatch_rider_active_job_handler.rb
+- spec/activejob/dispatch_rider/job_handler_spec.rb
 - spec/activejob/queue_adapters/dispatch_rider_adapter_spec.rb
-- spec/dispatch_rider_active_job_handler_spec.rb
+- spec/dispatch_rider/registrars/handler_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/payrollhero/activejob-dispatch_rider
 licenses:
@@ -136,13 +139,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.0.9
 signing_key: 
 specification_version: 4
 summary: "'ActiveJob::DispatchRider' adds `DispatchRider` support for `ActiveJob`."
 test_files:
+- spec/activejob/dispatch_rider/job_handler_spec.rb
 - spec/activejob/queue_adapters/dispatch_rider_adapter_spec.rb
-- spec/dispatch_rider_active_job_handler_spec.rb
+- spec/dispatch_rider/registrars/handler_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/lib/dispatch_rider_active_job_handler.rb

@@ -1,6 +0,0 @@
-# Generic DispatchRider handler for ActiveJob.
-class DispatchRiderActiveJobHandler < DispatchRider::Handlers::Base
-  def process(job_data)
-    ::ActiveJob::Base.execute job_data
-  end
-end