activejob-status 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: caa59f53f6175aea2f38a219adfd4a707fc3fb8460265aeff78adc7b09a494f2
-  data.tar.gz: f8775e045b684ba6cc1215e2e7570ba8e7b4f10ad889d7fb5d78bea44a5b62f1
+  metadata.gz: 93c7fee3b739316143dadbbc360b14c1557c30e6a83199d606675d4eb5164f7b
+  data.tar.gz: eef77191de849b3f4a063569a0b9016c55fb1c94b3c1856d8ed89e69bedb9631
 SHA512:
-  metadata.gz: a15529aeaab2bf3e25a5a56fab998e867f9af6fd3f835b788a84f001f9f4be4f974c8e7e2d3d40f8f45b6d764b40984af69a11cc95c9edece1e6e987c8e5dee8
-  data.tar.gz: 48fa3e3ee20a768007b830b5f5019d958594c4ec26ffd8d0bdb8bcd7d0dbdbd8d6da63408df591bda657b5de93bc991f08f84b7b8076cf699ed86385671d72e2
+  metadata.gz: 3bf621c0950c2c55e03d8aca6ffd38e327d0ae4afd5a55d130af80c02e4d81a5dc4557133dd7dd4ee394113ba3e3ebfc831feb268aee2fdc7caef9d2fde6d9b6
+  data.tar.gz: d0a5aac3bf768f3c17f396dc09c6386364bea3291862ca6144df032c5d7aacdae0a351347e86ff480dde17d322ad9353e19f64664280a9d27d7503d3aa5e2918

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,12 @@ 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)
+        payload[:exception] = {class: e.class.name, message: e.original_message} if @defaults.include?(:exception)
         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.0"
   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.0
 platform: ruby
 authors:
 - Savater Sebastien
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-02 00:00:00.000000000 Z
+date: 2022-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob