little_monster 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f509ccd0ab47ea65d89c120df2c1a922c16c98f2
-  data.tar.gz: 866d835af98d299bb938d9dbf4f4e5a08003fdf6
+  metadata.gz: b07797c5041cc3f6e14775d254e999ed5445aed9
+  data.tar.gz: 80ddf6bc1c80ab4feee8a81893ea62b2d723412e
 SHA512:
-  metadata.gz: cd52c9e1f8fa533596bac9b06e33ff1bc1bb4eea0e05a8455b2f4e3dbbb281b25b83c81b9633d81b83194ce21d215d6c8e98cef961ddb087c10ca8ac7a053ca1
-  data.tar.gz: 743ff7e499d899fc6f9d432f18f337ad447d2f2d9eccf6e9c9af3edd5886fbfa9f3020839b136bd04a30f49952ce42c0e572ed63e2316388d7068996093e9121
+  metadata.gz: ff4b36accdd2a8f9fe3abc773baaaa16cace873133f7ddda15052eefdb55d070a30cd3165575b3706213fea1ada18ac8e76540f3298bed06e3dabda2146b3cc3
+  data.tar.gz: e0d8cc7041571eeaf909f804fb46e9904b4cb52c6ec242997e1f6da7df3915eece262613c8353f096a0dfc56f2b4d4738f3bf7795cd537901f97c1d1f69c52d3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    little_monster (0.1.13)
+    little_monster (0.1.14)
       activesupport
       multi_json
       thor

data/lib/little_monster/core/job_orchrestator.rb

@@ -113,7 +113,14 @@ module LittleMonster::Core
 
     def build_task(task_symbol)
       task = @job.task_class_for(task_symbol).new(@job.data)
-      task.send(:set_default_values, @job.data, @job.id, logger, @job.method(:is_cancelled?))
+      task.send(:set_default_values,
+                data: @job.data,
+                job_id: @job.id,
+                job_logger: logger,
+                cancelled_callback: @job.method(:is_cancelled?),
+                retries: @job.retries,
+                max_retries: @job.max_retries,
+                retry_callback: @job.method(:retry?))
       task
     end
 

data/lib/little_monster/core/task.rb

@@ -4,6 +4,8 @@ module LittleMonster::Core
 
     attr_reader :data
     attr_reader :job_id
+    attr_reader :job_retries
+    attr_reader :job_max_retries
 
     def initialize(data, job_id = nil)
       @data = data
@@ -30,12 +32,20 @@ module LittleMonster::Core
       raise CancelError if is_cancelled?
     end
 
+    def last_retry?
+      @retry_callback.nil? ? false : !@retry_callback.call
+    end
+
     private
 
-    def set_default_values(data, job_id = nil, job_logger = nil, cancelled_callback = nil)
+    def set_default_values(data:, job_id: nil, job_logger: nil,
+                           cancelled_callback: nil, retries: 0, max_retries: 0, retry_callback: nil)
       @cancelled_callback = cancelled_callback
       @job_id = job_id
       @data = data
+      @job_retries = retries
+      @job_max_retries = max_retries
+      @retry_callback = retry_callback
       logger.parent_logger = job_logger if job_logger
       logger.default_tags.merge!(type: 'task_log')
     end

data/lib/little_monster/rspec/helpers/task_helper.rb

@@ -36,9 +36,17 @@ module LittleMonster::RSpec
                                             outputs: options.fetch(:data, {}))
               end
 
+      default_values = {
+        data: data,
+        cancelled_callback: proc { options.fetch(:cancelled, false) },
+        job_id: options.fetch(:job_id, nil),
+        retries: options.fetch(:job_retries, 0),
+        max_retries: options.fetch(:job_max_retries, 0),
+        retry_callback: proc { !options.fetch(:last_retry, false) }
+      }
+
       task_instance = task_class.new(data)
-      task_instance.send(:set_default_values, data)
-      task_instance.instance_variable_set('@cancelled_callback', (proc { true })) if options[:cancelled]
+      task_instance.send(:set_default_values, default_values)
 
       task_instance
     end

data/lib/little_monster/version.rb

@@ -1,3 +1,3 @@
 module LittleMonster
-  VERSION = '0.1.13'.freeze
+  VERSION = '0.1.14'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: little_monster
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - arq