activejob-status 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d578a534198cba31b4b8bbf48fb9d20625c630bca3f011985a08d570bb46fd3e
-  data.tar.gz: 78f27c54c8d486dd0332b6135cd43ca2fef7fb57414ebaca33d15941b45f9d77
+  metadata.gz: 8f631add9a816c630d494258c0c62b8357f04d6cf1dcb4c8681646f294b1af1e
+  data.tar.gz: 1bf02e33cfc7ae8e5ffddfd72466efd181d241cab6cfa1a07b75094fd241c18c
 SHA512:
-  metadata.gz: 8f4519d605117f1df429a46f04fc2d670719adca040d3822260c4565d898e4f6c386cda28676df55a1b76f2177ad58606e0b3c7b1b0701621fea9f154590f57a
-  data.tar.gz: 6250e8d76b10e8b8fcc0e719456c1ad6f34fb5fb5d92973bc2b09990fb56f7c0337ac345b96e9fbf9402dbc1aa631273ee7b05cec997b5f3cd6cd6339d5e7235
+  metadata.gz: 71af5a019d4004e27400abc14ee1b3d5c83a794d86096f0dd821a5f8fd52782b303beaac6b31533b6b50e74e44c2254d7e9bbed52d3439556f79aff6fa349ad9
+  data.tar.gz: b5ab17ba47d02f4a0493fc92b34684b261c1720da1da18627a050a7746129febdbcc30e750970d356948b738ab306a4fc8cecb2ca7dc35ccbf1a9c477a46dea8

data/lib/activejob-status/progress.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveJob
   module Status
     class Progress
@@ -7,21 +9,19 @@ module ActiveJob
       delegate :status, to: :job, prefix: true
 
       def initialize(job)
-        @job      = job
-        @total    = 100
+        @job = job
+        @total = 100
         @progress = 0
       end
 
       def total=(num)
         @total = num
         job_status.update(to_h, force: true)
-        self
       end
 
       def progress=(num)
         @progress = num
         job_status.update(to_h, force: true)
-        self
       end
 
       def increment(num = 1)
@@ -43,7 +43,7 @@ module ActiveJob
       end
 
       def to_h
-        { progress: @progress, total: @total }
+        {progress: @progress, total: @total}
       end
     end
   end

data/lib/activejob-status/status.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveJob
   module Status
     class Status
@@ -5,21 +7,24 @@ module ActiveJob
       delegate :queued?, :working?, :completed?, :failed?, to: :status_inquiry
 
       def initialize(job, options = {})
-        options  = ActiveJob::Status.options.merge(options)
+        options = ActiveJob::Status.options.merge(options)
         @storage = ActiveJob::Status::Storage.new(options)
-        @job     = job
+        @job = job
       end
 
       def []=(key, value)
-        update({ key => value }, force: true)
+        update({key => value}, force: true)
       end
 
       def read
         @storage.read(@job)
       end
-      alias to_h read
+      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)
+
         @storage.update(@job, message, **options)
       end
 

data/lib/activejob-status/storage.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveJob
   module Status
     class Storage
@@ -5,7 +7,7 @@ module ActiveJob
         options.assert_valid_keys(:expires_in, :throttle_interval)
 
         @expires_in = options[:expires_in]
-        @throttle   = ActiveJob::Status::Throttle.new(options[:throttle_interval])
+        @throttle = ActiveJob::Status::Throttle.new(options[:throttle_interval])
       end
 
       def store

data/lib/activejob-status/throttle.rb

@@ -1,16 +1,17 @@
+# frozen_string_literal: true
 
 module ActiveJob
   module Status
     class Throttle
       def initialize(interval)
-        @interval   = interval
+        @interval = interval
         @started_at = Time.current
       end
 
       def wrap(force: false)
         return yield if force || @interval.nil? || @interval.zero?
 
-        now     = Time.current
+        now = Time.current
         elasped = now - @started_at
         return if @interval > elasped
 

data/lib/activejob-status/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module ActiveJob
   module Status
-    VERSION = '0.2.1'.freeze
+    VERSION = "0.2.2"
   end
 end

data/lib/activejob-status.rb

@@ -1,25 +1,28 @@
-require 'active_support/core_ext/hash'
-require 'activejob-status/storage'
-require 'activejob-status/status'
-require 'activejob-status/progress'
-require 'activejob-status/throttle'
+# frozen_string_literal: true
+
+require "active_support/concern"
+require "active_support/core_ext/hash"
+require "activejob-status/storage"
+require "activejob-status/status"
+require "activejob-status/progress"
+require "activejob-status/throttle"
 
 module ActiveJob
   module Status
     extend ActiveSupport::Concern
 
-    DEFAULT_OPTIONS  = {
-      expires_in:        60 * 30,
+    DEFAULT_OPTIONS = {
+      expires_in: 60 * 30,
       throttle_interval: 0
     }.freeze
 
     included do
-      before_enqueue { |job| job.status.update(status: :queued) }
-      before_perform { |job| job.status.update(status: :working) }
-      after_perform  { |job| job.status.update(status: :completed) }
+      before_enqueue { |job| job.status[:status] = :queued }
+      before_perform { |job| job.status[:status] = :working }
+      after_perform { |job| job.status[:status] = :completed }
 
       rescue_from(Exception) do |e|
-        status.update(status: :failed)
+        status[:status] = :failed
         raise e
       end
     end
@@ -43,7 +46,7 @@ module ActiveJob
       end
 
       def store=(store)
-        store   = ActiveSupport::Cache.lookup_store(*store) if store.is_a?(Array) || store.is_a?(Symbol)
+        store = ActiveSupport::Cache.lookup_store(*store) if store.is_a?(Array) || store.is_a?(Symbol)
         @@store = store
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activejob-status
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Savater Sebastien
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-19 00:00:00.000000000 Z
+date: 2021-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -38,6 +38,118 @@ 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
@@ -70,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Monitor your jobs