recurring_active_job 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db5fcab0fb358e480791ac6e5edc3022a7eea74389a721aa01d6db3bf762839a
-  data.tar.gz: c7bf5cb3943b2d18cd42a80820a1a65936b4b70dd8a017def66e63a5c5bba4bf
+  metadata.gz: 3fae517957eb8fac2b6eb06280371965354866c1d848fe72f728a6ced95bc69f
+  data.tar.gz: 6f72d60ec0196a6c0e98fc9b891f7461e4107afaf3a84139c2ed97f2f7a1a3f8
 SHA512:
-  metadata.gz: fe5f736bec2bc1d283a3d8da25768afffb5cc6686096e3b6a28b92c4044393966851e13b01a2b8e18a1931ab036b7a26c204dad14360489c2781416276231f90
-  data.tar.gz: 49ccafa5e1d73a3ce27f63975549baa1b7a7f3a44ae7ec37dfcc93510f5e72f4d07cbecc23d6c2bc172c941720380909d7eb4dfd3b58b750d673a464afc9d490
+  metadata.gz: 1799830197e836e0d2e6e734fe2a21cb4b785dbbee1f5e468d29503a9a9e3c8f71b5c9b6972f84ac2f2a32727530e1c267c0822f7a3272973864a834e0d4f64b
+  data.tar.gz: b33e9b50033f2d1be5a79cf4c75be5c3744b33d500558eb9d545f0653187111003a3e244d0c5191f1432d1d40b61a8b4071e3de436b116fa70f2e7ddffbaea95

data/README.md

@@ -3,7 +3,7 @@
 #### Adapter agnostic ActiveJob scheduler based on time spent between executions.
 
 <!--- Version informartion -->
-*You are viewing the README of version [v0.3.0](https://github.com/thisismydesign/recurring_active_job/releases/tag/v0.3.0). You can find other releases [here](https://github.com/thisismydesign/recurring_active_job/releases).*
+*You are viewing the README of version [v0.4.0](https://github.com/thisismydesign/recurring_active_job/releases/tag/v0.4.0). You can find other releases [here](https://github.com/thisismydesign/recurring_active_job/releases).*
 <!--- Version informartion end -->
 
 | Branch | Status |
@@ -107,13 +107,11 @@ Add a shared context to be included when testing Recurring jobs:
 `spec/support/shared_context_for_recurring_active_job.rb`
 ```ruby
 RSpec.shared_context "recurring active job" do
-  let(:recurring_active_job) { build_stubbed(:recurring_active_job) }
+  let(:recurring_active_job) { create(:recurring_active_job) }
   let(:recurring_active_job_params) { { recurring_active_job_id: recurring_active_job.id } }
 
   before do
     allow(RecurringActiveJob::Model).to receive(:find).and_return(recurring_active_job)
-    allow(recurring_active_job).to receive(:save!)
-    allow(recurring_active_job).to receive(:destroy!)
   end
 end
 ```
@@ -127,6 +125,32 @@ RSpec.describe MyJob do
 end
 ```
 
+### Custom error handling
+
+`RecurringActiveJob` defines the following generic error handling which is required for some features (but raises the original error at the end):
+
+```ruby
+rescue_from(StandardError) do |e|
+  handle_exception(e)
+end
+```
+
+To define your own error handling but keep those features working you can redefine `handle_exception` like this:
+
+```ruby
+rescue_from(StandardError) do |e|
+  handle_exception(e)
+end
+
+# ...
+
+def handle_exception(e)
+  super rescue StandardError
+
+  # ...
+end
+```
+
 ## Feedback
 
 Feedback is appreciated.

data/lib/recurring_active_job/base.rb

@@ -6,14 +6,8 @@ module RecurringActiveJob
       attr_accessor :logger
     end
 
-    retry_on(StandardError, attempts: 0) do |job, e|
-      recurring_active_job = RecurringActiveJob::Model.find(job.arguments.first&.dig(:recurring_active_job_id))
-      if ActiveJob.gem_version < Gem::Version.new("5.2.0")
-        recurring_active_job.update!(last_error: e, last_error_details: e)
-      else
-        recurring_active_job.update!(last_error: "#{e.class}: #{e.message}", last_error_details: ruby_style_error(e))
-      end
-      raise e
+    rescue_from(StandardError) do |e|
+      handle_exception(e)
     end
 
     before_enqueue do |job|
@@ -76,7 +70,17 @@ module RecurringActiveJob
       self.class.logger
     end
 
-    def self.ruby_style_error(e)
+    def handle_exception(e)
+      recurring_active_job = RecurringActiveJob::Model.find(arguments.first&.dig(:recurring_active_job_id))
+      if ActiveJob.gem_version < Gem::Version.new("5.2.0")
+        recurring_active_job.update!(last_error: e, last_error_details: e)
+      else
+        recurring_active_job.update!(last_error: "#{e.class}: #{e.message}", last_error_details: ruby_style_error(e))
+      end
+      raise e
+    end
+
+    def ruby_style_error(e)
       e.backtrace.join("\n\t")
       .sub("\n\t", ": #{e}#{e.class ? " (#{e.class})" : ''}\n\t")
     end

data/lib/recurring_active_job/version.rb

@@ -1,3 +1,3 @@
 module RecurringActiveJob
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: recurring_active_job
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - thisismydesign
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-24 00:00:00.000000000 Z
+date: 2018-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob