job-iteration 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bea2b43448343cc53903fdd896e7affd5d168f6c758ddf4b53a9d86de2207b8
-  data.tar.gz: f74eabf96862da75494f80f6964c4e9a1611c6f46f66af23a6c8682ec595bcb1
+  metadata.gz: 1aa0774feb655e564e01134b940375a88b52eed719e9ff07bfbadb16c4515b7e
+  data.tar.gz: 54a0dd49a916affafc03122db00a2adbc0069268854fae00b751a35db92ebad4
 SHA512:
-  metadata.gz: 0f32960627142f5fb14c8021e58347b491db9c75338eb323a6a7e3535569669f3f1a6f3482fd388ad471ece1293f5dee74d898384ce0f3d181c73c9adf480cb1
-  data.tar.gz: 31a7cebea521cc632716d6f612ff1979f3f5efe4742305d2823a364c06930b9a4ece7043315a2cbb88c37db41c6d90a18dba1713458ea450acae3dd41ea18b79
+  metadata.gz: 0d1c6b08ef33f876c8fa692ce655f74502758eb6c0e3a98253d9cbb8a29c67906af2a3cbc317dc103a948c514b9eccad9e5938abc2e803f7f3aa25e4a49e9807
+  data.tar.gz: 3693719f3764bf8e158c568a7b63ed8c1b28174016b3d69fc5743711de99f4ad7bb3e80e29f9851e504e50b52ec1783aade73a7a7ee48b03718a9463aa11e98f

data/CHANGELOG.md

@@ -4,6 +4,11 @@
 
 #### Bug fix
 
+## v1.1.6 (May 22, 2020)
+
+- [49](https://github.com/Shopify/job-iteration/pull/49) -  Log when enumerator has nothing to iterate
+- [52](https://github.com/Shopify/job-iteration/pull/52) -  Fix CSVEnumerator cursor to properly remove already processed rows
+
 ## v1.1.5 (February 27, 2020)
 
 - [47](https://github.com/Shopify/job-iteration/pull/47) -  Optional `sorbet-runtime` support for `JobIteration::Iteration` interface validation

data/guides/custom-enumerator.md

@@ -8,7 +8,7 @@ class ListJob < ActiveJob::Base
 
   def build_enumerator(*)
     @redis = Redis.new
-    Enumerator.new |yielder|
+    Enumerator.new do |yielder|
       yielder.yield @redis.lpop(key), nil
     end
   end

data/job-iteration.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = %w(lib)
 
   spec.metadata["changelog_uri"] = "https://github.com/Shopify/job-iteration/blob/master/CHANGELOG.md"
+  spec.metadata["allowed_push_host"] = "https://rubygems.org"
 
   spec.add_development_dependency("activerecord")
   spec.add_dependency("activejob", ">= 5.2")

data/lib/job-iteration/csv_enumerator.rb

@@ -32,8 +32,8 @@ module JobIteration
     def rows(cursor:)
       @csv.lazy
         .each_with_index
-        .drop(cursor.to_i)
-        .to_enum { count_rows_in_file }
+        .drop(count_of_processed_rows(cursor))
+        .to_enum { count_of_rows_in_file }
     end
 
     # Constructs a enumerator on batches of CSV rows
@@ -42,13 +42,13 @@ module JobIteration
       @csv.lazy
         .each_slice(batch_size)
         .each_with_index
-        .drop(cursor.to_i)
-        .to_enum { (count_rows_in_file.to_f / batch_size).ceil }
+        .drop(count_of_processed_rows(cursor))
+        .to_enum { (count_of_rows_in_file.to_f / batch_size).ceil }
     end
 
     private
 
-    def count_rows_in_file
+    def count_of_rows_in_file
       # TODO: Remove rescue for NoMethodError when Ruby 2.6 is no longer supported.
       begin
         filepath = @csv.path
@@ -63,5 +63,9 @@ module JobIteration
       count -= 1 if @csv.headers
       count
     end
+
+    def count_of_processed_rows(cursor)
+      cursor.nil? ? 0 : cursor + 1
+    end
   end
 end

data/lib/job-iteration/iteration.rb

@@ -116,8 +116,10 @@ module JobIteration
 
     def iterate_with_enumerator(enumerator, arguments)
       arguments = arguments.dup.freeze
+      found_record = false
       enumerator.each do |object_from_enumerator, index|
         record_unit_of_work do
+          found_record = true
           each_iteration(object_from_enumerator, *arguments)
           self.cursor_position = index
         end
@@ -128,6 +130,11 @@ module JobIteration
         return false
       end
 
+      logger.info(
+        "[JobIteration::Iteration] Enumerator found nothing to iterate! " \
+        "times_interrupted=#{times_interrupted} cursor_position=#{cursor_position}"
+      ) unless found_record
+
       true
     end
 

data/lib/job-iteration/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JobIteration
-  VERSION = "1.1.5"
+  VERSION = "1.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: job-iteration
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-28 00:00:00.000000000 Z
+date: 2020-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -81,6 +81,7 @@ licenses:
 - MIT
 metadata:
   changelog_uri: https://github.com/Shopify/job-iteration/blob/master/CHANGELOG.md
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths: