activejob-status 0.2.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f631add9a816c630d494258c0c62b8357f04d6cf1dcb4c8681646f294b1af1e
-  data.tar.gz: 1bf02e33cfc7ae8e5ffddfd72466efd181d241cab6cfa1a07b75094fd241c18c
+  metadata.gz: 93c7fee3b739316143dadbbc360b14c1557c30e6a83199d606675d4eb5164f7b
+  data.tar.gz: eef77191de849b3f4a063569a0b9016c55fb1c94b3c1856d8ed89e69bedb9631
 SHA512:
-  metadata.gz: 71af5a019d4004e27400abc14ee1b3d5c83a794d86096f0dd821a5f8fd52782b303beaac6b31533b6b50e74e44c2254d7e9bbed52d3439556f79aff6fa349ad9
-  data.tar.gz: b5ab17ba47d02f4a0493fc92b34684b261c1720da1da18627a050a7746129febdbcc30e750970d356948b738ab306a4fc8cecb2ca7dc35ccbf1a9c477a46dea8
+  metadata.gz: 3bf621c0950c2c55e03d8aca6ffd38e327d0ae4afd5a55d130af80c02e4d81a5dc4557133dd7dd4ee394113ba3e3ebfc831feb268aee2fdc7caef9d2fde6d9b6
+  data.tar.gz: d0a5aac3bf768f3c17f396dc09c6386364bea3291862ca6144df032c5d7aacdae0a351347e86ff480dde17d322ad9353e19f64664280a9d27d7503d3aa5e2918

data/lib/activejob-status/status.rb

@@ -8,7 +8,8 @@ module ActiveJob
 
       def initialize(job, options = {})
         options = ActiveJob::Status.options.merge(options)
-        @storage = ActiveJob::Status::Storage.new(options)
+        @defaults = options.fetch(:includes, [])
+        @storage = ActiveJob::Status::Storage.new(options.without(:includes))
         @job = job
       end
 
@@ -21,11 +22,13 @@ module ActiveJob
       end
       alias_method :to_h, :read
 
-      def update(message, options = {})
-        @job.progress.instance_variable_set(:@progress, message[:progress]) if message.include?(:progress)
-        @job.progress.instance_variable_set(:@total, message[:total]) if message.include?(:total)
+      def update(payload, options = {})
+        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, message, **options)
+        @storage.update(@job, payload, **options)
       end
 
       def delete
@@ -51,6 +54,27 @@ module ActiveJob
       def status_inquiry
         status.to_s.inquiry
       end
+
+      # 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)
+        update(payload, force: true)
+      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.original_message} if @defaults.include?(:exception)
+        update(payload, force: true)
+      end
     end
   end
 end

data/lib/activejob-status/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveJob
   module Status
-    VERSION = "0.2.2"
+    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"
@@ -13,16 +15,17 @@ module ActiveJob
 
     DEFAULT_OPTIONS = {
       expires_in: 60 * 30,
-      throttle_interval: 0
+      throttle_interval: 0,
+      includes: %i[status]
     }.freeze
 
     included do
-      before_enqueue { |job| job.status[:status] = :queued }
-      before_perform { |job| job.status[:status] = :working }
-      after_perform { |job| job.status[:status] = :completed }
+      before_enqueue { |job| job.status.update_defaults(:queued) }
+      before_perform { |job| job.status.update_defaults(:working) }
+      after_perform { |job| job.status.update_defaults(:completed) }
 
       rescue_from(Exception) do |e|
-        status[:status] = :failed
+        status.catch_exception(e)
         raise e
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activejob-status
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Savater Sebastien
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-22 00:00:00.000000000 Z
+date: 2022-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -38,118 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.20'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.20'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.11'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.4'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: standard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.0
 description:
 email:
 - savater.sebastien@gmail.com
@@ -182,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Monitor your jobs