Merge pull request #454 from Shopify/mangara-csv-gemfile

Explicitly require csv for for Ruby head
Shopify · Jan 26, 2024 · 922ee56 · 922ee56
2 parents cd18c89 + d561d7e
commit 922ee56
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/Gemfile b/Gemfile
@@ -33,6 +33,7 @@ gem "mocha"
 gem "rubocop-shopify", require: false
 gem "yard"
 gem "rake"
+gem "csv" # required for Ruby 3.4+
 
 # for unit testing optional sorbet support
 gem "sorbet-runtime"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -30,6 +30,7 @@ GEM
     coderay (1.1.3)
     concurrent-ruby (1.2.2)
     connection_pool (2.4.1)
+    csv (3.2.8)
     globalid (1.1.0)
       activesupport (>= 5.0)
     i18n (1.14.1)
@@ -109,6 +110,7 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord
+  csv
   globalid
   i18n
   job-iteration!

diff --git a/lib/job-iteration/csv_enumerator.rb b/lib/job-iteration/csv_enumerator.rb
@@ -20,7 +20,7 @@ class CsvEnumerator
     #   csv = CSV.open('tmp/files', { converters: :integer, headers: true })
     #   JobIteration::CsvEnumerator.new(csv).rows(cursor: cursor)
     def initialize(csv)
-      unless csv.instance_of?(CSV)
+      unless defined?(CSV) && csv.instance_of?(CSV)
         raise ArgumentError, "CsvEnumerator.new takes CSV object"
       end