job-iteration 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55bbe81f1fe209219d6dbb5aa469f027834d6b09dbdd6485b305fb4e3aa9bcb1
-  data.tar.gz: cf611985f1b8b6dc2cb1d00026fb53d6716ff353d0e59a96235f0e8538e1878b
+  metadata.gz: 0c3d42266a1de05ed85c35d99e76b55a131144054db3e3b83026aa3e180488c6
+  data.tar.gz: c272d3a7e0316cbb0a9b34326f8b1cdff5cb43c2ff58828dea1767a7f47eecb9
 SHA512:
-  metadata.gz: e8857b87a8a999ec88b584896ff7c384310badbf7c2e7c553b9b64fed108cb7756fdc365a0008766d9179c40279ed221c96eca0b363fd5283f6c7d3d676ab82f
-  data.tar.gz: 89e9e6d584fef095c6c04b96a369abbf710283dffe9856091eef3fc7492222bd7591f22a8ebaaa7ea76f5d3281cd2c8163ba57d37ead43b095fb08fb377aea3a
+  metadata.gz: 500cefbc1ab8e7f02a4679b13f8c1401662e63021d20b2b4b5209d979f70c208d5b2a91ed5765d5dc5739666772fbe86e6f1a3e658bd9b1dad03f4b42d97b270
+  data.tar.gz: 37e100ba000a3ab67a07e78937ac12c58822a13e8f5641e6a3312a49a51733da3a1d4d3c8bf1a1f1928fc45c3aa026caf003fb97565a412e4c371b389513c7bb

data/.github/workflows/ci.yml

@@ -15,29 +15,37 @@ jobs:
     strategy:
       matrix:
         ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3"]
-        rails: ["5.2", "6.0", "6.1", "7.0", "7.1", "edge"]
+        rails: ["5.2", "6.0", "6.1", "7.0", "7.1", "7.2", "edge"]
         gemfile: [rails_gems]
         exclude:
           - ruby: "2.6"
             rails: "7.0"
           - ruby: "2.6"
             rails: "7.1"
+          - ruby: "2.6"
+            rails: "7.2"
           - ruby: "2.6"
             rails: "edge"
           - ruby: "2.7"
             rails: "7.1"
+          - ruby: "2.7"
+            rails: "7.2"
           - ruby: "2.7"
             rails: "edge"
           - ruby: "3.0"
             rails: "5.2"
           - ruby: "3.0"
             rails: "7.1"
+          - ruby: "3.0"
+            rails: "7.2"
           - ruby: "3.0"
             rails: "edge"
           - ruby: "3.1"
             rails: "5.2"
           - ruby: "3.1"
             rails: "6.0"
+          - ruby: "3.1"
+            rails: "edge"
           - ruby: "3.2"
             rails: "5.2"
           - ruby: "3.2"

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 Nil
 
+## v1.7.0 (Oct 11, 2024)
+
+### Features
+
+- [509](https://github.com/Shopify/job-iteration/pull/509) - Added CSV batching functionality to `EnumeratorBuilder` with `build_csv_enumerator_on_batches` method and `csv_on_batches` alias.
+- [512](https://github.com/Shopify/job-iteration/pull/512) - Added support for custom timezones on `ActiveRecordEnumerator` and `ActiveRecordBatchEnumerator`. This allows for using cursors with datetime columns where `ActiveRecord.default_timezone` is set to `:local` and Active Record is not using the same timezone as the database.
+
 ## v1.6.0 (Sep 24, 2024)
 
 ### Features
@@ -10,9 +17,13 @@ Nil
 - [505](https://github.com/Shopify/job-iteration/pull/505) - Add interruption adapter for [Solid Queue](https://github.com/rails/solid_queue).
 
 ## v1.5.1 (May 29,2024)
+
+### Bug fixes
+
 - [483](https://github.com/Shopify/job-iteration/pull/483) - Reverts [#456 Use Arel instead of String for AR Enumerator conditionals](https://github.com/Shopify/job-iteration/pull/456)
 
 ## v1.5.0 (May 29, 2024)
+
 ### Changes
 
 - [437](https://github.com/Shopify/job-iteration/pull/437) - Use minimum between per-class `job_iteration_max_job_runtime` and `JobIteration.max_job_runtime`, instead of enforcing only setting decreasing values.
@@ -29,7 +40,7 @@ when generating position for cursor based on `:id` column (Rails 7.1 and above,
 primary models are now supported). This ensures we grab the value of the id column, rather than a
 potentially composite primary key value.
 - [456](https://github.com/Shopify/job-iteration/pull/431) - Use Arel to generate SQL that's type compatible for the
-  cursor pagination conditionals in ActiveRecord cursor. Previously, the cursor would coerce numeric ids to a string value 
+  cursor pagination conditionals in ActiveRecord cursor. Previously, the cursor would coerce numeric ids to a string value
   (e.g.: `... AND id > '1'`)
 
 ## v1.4.1 (Sep 5, 2023)

data/Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    job-iteration (1.6.0)
+    job-iteration (1.7.0)
       activejob (>= 5.2)
 
 GEM

data/lib/job-iteration/active_record_batch_enumerator.rb

@@ -8,8 +8,9 @@ module JobIteration
 
     SQL_DATETIME_WITH_NSEC = "%Y-%m-%d %H:%M:%S.%N"
 
-    def initialize(relation, columns: nil, batch_size: 100, cursor: nil)
+    def initialize(relation, columns: nil, batch_size: 100, timezone: nil, cursor: nil)
       @batch_size = batch_size
+      @timezone = timezone
       @primary_key = "#{relation.table_name}.#{relation.primary_key}"
       @columns = Array(columns&.map(&:to_s) || @primary_key)
       @primary_key_index = @columns.index(@primary_key) || @columns.index(relation.primary_key)
@@ -114,7 +115,10 @@ module JobIteration
     end
 
     def column_value(value)
-      value.is_a?(Time) ? value.strftime(SQL_DATETIME_WITH_NSEC) : value
+      return value unless value.is_a?(Time)
+
+      value = value.in_time_zone(@timezone) unless @timezone.nil?
+      value.strftime(SQL_DATETIME_WITH_NSEC)
     end
   end
 end

data/lib/job-iteration/active_record_enumerator.rb

@@ -7,9 +7,10 @@ module JobIteration
   class ActiveRecordEnumerator
     SQL_DATETIME_WITH_NSEC = "%Y-%m-%d %H:%M:%S.%N"
 
-    def initialize(relation, columns: nil, batch_size: 100, cursor: nil)
+    def initialize(relation, columns: nil, batch_size: 100, timezone: nil, cursor: nil)
       @relation = relation
       @batch_size = batch_size
+      @timezone = timezone
       @columns = if columns
         Array(columns)
       else
@@ -61,6 +62,7 @@ module JobIteration
       value = record.read_attribute(attribute.to_sym)
       case record.class.columns_hash.fetch(attribute).type
       when :datetime
+        value = value.in_time_zone(@timezone) unless @timezone.nil?
         value.strftime(SQL_DATETIME_WITH_NSEC)
       else
         value

data/lib/job-iteration/enumerator_builder.rb

@@ -144,6 +144,10 @@ module JobIteration
       CsvEnumerator.new(enumerable).rows(cursor: cursor)
     end
 
+    def build_csv_enumerator_on_batches(enumerable, cursor:, batch_size: 100)
+      CsvEnumerator.new(enumerable).batches(cursor: cursor, batch_size: batch_size)
+    end
+
     # Builds Enumerator for nested iteration.
     #
     # @param enums [Array<Proc>] an Array of Procs, each should return an Enumerator.
@@ -186,6 +190,7 @@ module JobIteration
     alias_method :active_record_on_batch_relations, :build_active_record_enumerator_on_batch_relations
     alias_method :throttle, :build_throttle_enumerator
     alias_method :csv, :build_csv_enumerator
+    alias_method :csv_on_batches, :build_csv_enumerator_on_batches
     alias_method :nested, :build_nested_enumerator
 
     private

data/lib/job-iteration/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: job-iteration
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Shopify
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-25 00:00:00.000000000 Z
+date: 2024-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.18
+rubygems_version: 3.5.21
 signing_key:
 specification_version: 4
 summary: Makes your background jobs interruptible and resumable.