activejob-dispatch_rider 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad8cd41d0e457743dd03943aba4efc40af19e52c
-  data.tar.gz: 5e59ba98d4aa917747e82772361b46ab3b3e3fd0
+  metadata.gz: 2154aefe422c1bd365aa5539c0981fc5a2376011
+  data.tar.gz: 0c5b75841bd49d5970c3e38eca1be3644804dd91
 SHA512:
-  metadata.gz: 47b37f3ba16b43eb15f8fbbbf22303befdc0064e940d78ea5893c45ed8685c4adfce13caaf5e155b702d4f1cb276fa99aaefb99af58476dbb989cde3677a9599
-  data.tar.gz: 10c278700fc385c817c430e0f9a5ad6bb87b689674b4d7bdac4179288a20839759e085f0eb8fd8daee401c2f3664c423dbcbc48b042895510ed110764291dce4
+  metadata.gz: 3e95b5deb170e20a1cbff1d003cb1aebf92db5d06b6811c343b1e4c389cae6453e3ce393c6dbf4d18209de0ae86c27a1c111bacf3047085c5be8d4cba421af5c
+  data.tar.gz: 0b101afa949ad24023667a1779b507164d5cb058b908d45cdc7a2fdbf7301f5ab9611499737b07409f7260c34be494d6193a45eb92b177245a53b3fc9d7cad31

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/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 = "1.0.1"
   end
 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/queue_adapters/dispatch_rider_adapter.rb

@@ -7,8 +7,8 @@ module ActiveJob
         def enqueue(job)
           publisher.publish destinations: Array(job.queue_name),
                             message: {
-                              subject: "dispatch_rider_active_job_handler",
-                              body: job.serialize
+                              subject: job.class.name.underscore,
+                              body: job.serialize.merge(guid: job.job_id)
                             }
         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")
       }

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activejob-dispatch_rider
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Ronald Maravilla
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-09 00:00:00.000000000 Z
+date: 2015-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -111,11 +111,13 @@ files:
 - 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:
@@ -142,7 +144,8 @@ 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