Merge pull request #309 from scientist-softserv/fix-rm_f-call

🐛 Favor `FileUtils.rm_f`
notch8 · Dec 7, 2023 · e476998 · e476998
2 parents 9f4b130 + 61350ae
commit e476998
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -471,7 +471,7 @@ GEM
     jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
     json (2.6.3)
-    json-canonicalization (0.3.2)
+    json-canonicalization (0.3.1)
     json-ld (3.1.10)
       htmlentities (~> 4.3)
       json-canonicalization (~> 0.2)
@@ -997,6 +997,7 @@ DEPENDENCIES
   iiif_print!
   jbuilder (~> 2.5)
   jquery-rails
+  json-canonicalization (= 0.3.1)
   newspaper_works_fixtures (~> 0.3, >= 0.3.1)
   puma (~> 3.11)
   rails (~> 5.2.8, >= 5.2.8.1)

diff --git a/iiif_print.gemspec b/iiif_print.gemspec
@@ -36,6 +36,7 @@ SUMMARY
   # TODO: We want to remove dependency on this
   spec.add_development_dependency 'newspaper_works_fixtures', '~> 0.3', '>=0.3.1'
   spec.add_development_dependency 'rails-controller-testing', '~> 1'
+  spec.add_development_dependency 'json-canonicalization', '0.3.1'
   spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'rspec-activemodel-mocks'
   spec.add_development_dependency 'shoulda-matchers', '~> 3.1'

diff --git a/lib/iiif_print/jobs/child_works_from_pdf_job.rb b/lib/iiif_print/jobs/child_works_from_pdf_job.rb
@@ -118,7 +118,7 @@ def prepare_import_data(original_pdf_path, image_files, user)
 
           begin
             # Clean up the temporary image path.
-            File.rm_f(image_path) if File.exist?(image_path)
+            FileUtils.rm_f(image_path) if File.exist?(image_path)
           rescue
             # If we can't delete, let's move on.  Maybe it was already cleaned-up.
           end