activejob-status 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: caa59f53f6175aea2f38a219adfd4a707fc3fb8460265aeff78adc7b09a494f2
-  data.tar.gz: f8775e045b684ba6cc1215e2e7570ba8e7b4f10ad889d7fb5d78bea44a5b62f1
+  metadata.gz: a8a41508ce07744c1b0372a313f3d47a981986145423b5ded100bd1f39b3b37d
+  data.tar.gz: 6dea6ede3e4f251a637ecf5ff7dc1c824145fb7bd2a55edb4f38bfed409f74fe
 SHA512:
-  metadata.gz: a15529aeaab2bf3e25a5a56fab998e867f9af6fd3f835b788a84f001f9f4be4f974c8e7e2d3d40f8f45b6d764b40984af69a11cc95c9edece1e6e987c8e5dee8
-  data.tar.gz: 48fa3e3ee20a768007b830b5f5019d958594c4ec26ffd8d0bdb8bcd7d0dbdbd8d6da63408df591bda657b5de93bc991f08f84b7b8076cf699ed86385671d72e2
+  metadata.gz: 4eab47f16733e16c9006ce3dff76d239ffdf2932e47bcd8eafe30c953d1131292f9fee1f4298f5f642461394f4cb7f1f41407fa8d922a4b1486a34a71f7e32f1
+  data.tar.gz: 9fb5a5f0fc42f5c90b1a8839b856317a7f7544555dfda2e94798ad08fefeb223491b15743af8dcb3df0659351f072f27aaabfc04f7ee82a8ed5b60d56ed2b6fc

data/lib/activejob-status/status.rb

@@ -23,8 +23,10 @@ module ActiveJob
       alias_method :to_h, :read
 
       def update(payload, options = {})
-        @job.progress.instance_variable_set(:@progress, payload[:progress]) if payload.include?(:progress)
-        @job.progress.instance_variable_set(:@total, payload[:total]) if payload.include?(:total)
+        if @job.respond_to?(:progress)
+          @job.progress.instance_variable_set(:@progress, payload[:progress]) if payload.include?(:progress)
+          @job.progress.instance_variable_set(:@total, payload[:total]) if payload.include?(:total)
+        end
 
         @storage.update(@job, payload, **options)
       end
@@ -56,6 +58,8 @@ module ActiveJob
       # Update default data
 
       def update_defaults(status_key)
+        raise "cannot call #update_defaults when status is accessed from outside the job" if @job.is_a?(String)
+
         payload = {}
         payload[:status] = status_key if @defaults.include?(:status)
         payload[:serialized_job] = @job.serialize if @defaults.include?(:serialized_job)
@@ -63,10 +67,18 @@ module ActiveJob
       end
 
       def catch_exception(e)
+        raise "cannot call #catch_exception when status is accessed from outside the job" if @job.is_a?(String)
+
         payload = {}
         payload[:status] = :failed if @defaults.include?(:status)
         payload[:serialized_job] = @job.serialize if @defaults.include?(:serialized_job)
-        payload[:exception] = {class: e.class.name, message: e.message} if @defaults.include?(:exception)
+
+        if @defaults.include?(:exception)
+          message = e.message
+          message = e.original_message if e.respond_to?(:original_message)
+          payload[:exception] = {class: e.class.name, message: message}
+        end
+
         update(payload, force: true)
       end
     end

data/lib/activejob-status/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveJob
   module Status
-    VERSION = "0.3.0"
+    VERSION = "0.4.1"
   end
 end

data/lib/activejob-status.rb

@@ -2,6 +2,8 @@
 
 require "active_support/concern"
 require "active_support/core_ext/hash"
+require "active_support/core_ext/enumerable"
+require "active_job"
 require "activejob-status/storage"
 require "activejob-status/status"
 require "activejob-status/progress"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activejob-status
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Savater Sebastien
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-02 00:00:00.000000000 Z
+date: 2023-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob