assembly-image 2.1.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '088a4b9c59b50f893f7b50c16898321770006b4ab22dc08a8ddd70cdba9a15da'
-  data.tar.gz: f22bf6d6acbd4d6885e2102526e7c5e0ac76b93af71eff0d2237d32334afd223
+  metadata.gz: 46a8b192fe259bee51df21215e413dc0a570012b441f530cabb73a172dfb6e13
+  data.tar.gz: a87eb5df0582c60e74c182e8711758df11388a4aaaf9084149a0b1b3bcdaf5a7
 SHA512:
-  metadata.gz: 91f0be3622982ad69823a45eca8111d05756e0442cd7d7aa16cb8099e71ee2e95c21f17c7f14b7ccab04c11724233c9a9739e24f8b8302f07f42b16738c6400e
-  data.tar.gz: d1ab206c475413496a6add9376cb246705df18a3142bdc32189b202e31af698b8cfded84464d00e94357fc08396ab142270043b3b862cc0d68cd57834863b649
+  metadata.gz: cdbb16145c19623c462b5a0121dafe614e09d6f37dfd5ca1cde1ea4b38eb3829c0cf33300dbde92f64a3c678e2c313bd5241352a52510499c084061058a2204a
+  data.tar.gz: 56d878d05722d07fbb0fe42e8ae04bdb39772ada0c94d03808ba066ef89719a0af0419ceaa667db53030b7385139226ef77a1c3d97bb8d76640f58e3e848a7c0

data/.circleci/config.yml

@@ -1,6 +1,6 @@
 version: 2.1
 orbs:
-  ruby-rails: sul-dlss/ruby-rails@3.1.2
+  ruby-rails: sul-dlss/ruby-rails@4.1.0
 workflows:
   build:
     jobs:

data/.rubocop.yml

@@ -143,7 +143,7 @@ RSpec/IdenticalEqualityAssertion: # new in 2.4
   Enabled: true
 RSpec/SubjectDeclaration: # new in 2.5
   Enabled: true
-RSpec/FactoryBot/SyntaxMethods: # new in 2.7
+FactoryBot/SyntaxMethods: # new in 2.7
   Enabled: true
 RSpec/Rails/AvoidSetupHook: # new in 2.4
   Enabled: false
@@ -180,7 +180,106 @@ Lint/ConstantOverwrittenInRescue: # new in 1.31
 Lint/NonAtomicFileOperation: # new in 1.31
   Enabled: true
 
-RSpec/Capybara/SpecificMatcher: # new in 2.12
+Capybara/SpecificMatcher: # new in 2.12
   Enabled: true
 RSpec/Rails/HaveHttpStatus: # new in 2.12
   Enabled: false
+
+Gemspec/DevelopmentDependencies: # new in 1.44
+  Enabled: false
+Lint/DuplicateMagicComment: # new in 1.37
+  Enabled: true
+Lint/DuplicateMatchPattern: # new in 1.50
+  Enabled: true
+Lint/RequireRangeParentheses: # new in 1.32
+  Enabled: true
+Lint/UselessRescue: # new in 1.43
+  Enabled: true
+Metrics/CollectionLiteralLength: # new in 1.47
+  Enabled: true
+Style/ArrayIntersect: # new in 1.40
+  Enabled: true
+Style/ComparableClamp: # new in 1.44
+  Enabled: true
+Style/ConcatArrayLiterals: # new in 1.41
+  Enabled: true
+Style/DataInheritance: # new in 1.49
+  Enabled: true
+Style/DirEmpty: # new in 1.48
+  Enabled: true
+Style/EmptyHeredoc: # new in 1.32
+  Enabled: true
+Style/ExactRegexpMatch: # new in 1.51
+  Enabled: true
+Style/FileEmpty: # new in 1.48
+  Enabled: true
+Style/MagicCommentFormat: # new in 1.35
+  Enabled: true
+Style/MapToSet: # new in 1.42
+  Enabled: true
+Style/MinMaxComparison: # new in 1.42
+  Enabled: true
+Style/OperatorMethodCall: # new in 1.37
+  Enabled: true
+Style/RedundantArrayConstructor: # new in 1.52
+  Enabled: true
+Style/RedundantConstantBase: # new in 1.40
+  Enabled: true
+Style/RedundantDoubleSplatHashBraces: # new in 1.41
+  Enabled: true
+Style/RedundantEach: # new in 1.38
+  Enabled: true
+Style/RedundantFilterChain: # new in 1.52
+  Enabled: true
+Style/RedundantHeredocDelimiterQuotes: # new in 1.45
+  Enabled: true
+Style/RedundantLineContinuation: # new in 1.49
+  Enabled: true
+Style/RedundantRegexpConstructor: # new in 1.52
+  Enabled: true
+Style/RedundantStringEscape: # new in 1.37
+  Enabled: true
+Capybara/MatchStyle: # new in 2.17
+  Enabled: true
+Capybara/NegationMatcher: # new in 2.14
+  Enabled: true
+Capybara/SpecificActions: # new in 2.14
+  Enabled: true
+Capybara/SpecificFinders: # new in 2.13
+  Enabled: true
+FactoryBot/AssociationStyle: # new in 2.23
+  Enabled: true
+FactoryBot/ConsistentParenthesesStyle: # new in 2.14
+  Enabled: true
+FactoryBot/FactoryAssociationWithStrategy: # new in 2.23
+  Enabled: true
+FactoryBot/FactoryNameStyle: # new in 2.16
+  Enabled: true
+FactoryBot/RedundantFactoryOption: # new in 2.23
+  Enabled: true
+RSpec/BeEmpty: # new in 2.20
+  Enabled: true
+RSpec/ContainExactly: # new in 2.19
+  Enabled: true
+RSpec/DuplicatedMetadata: # new in 2.16
+  Enabled: true
+RSpec/IndexedLet: # new in 2.20
+  Enabled: true
+RSpec/MatchArray: # new in 2.19
+  Enabled: true
+RSpec/NoExpectationExample: # new in 2.13
+  Enabled: true
+RSpec/PendingWithoutReason: # new in 2.16
+  Enabled: true
+RSpec/RedundantAround: # new in 2.19
+  Enabled: true
+RSpec/SkipBlockInsideExample: # new in 2.19
+  Enabled: true
+RSpec/SortMetadata: # new in 2.14
+  Enabled: true
+RSpec/Rails/InferredSpecType: # new in 2.14
+  Enabled: true
+RSpec/Rails/MinitestAssertions: # new in 2.17
+  Enabled: true
+RSpec/Rails/TravelAround: # new in 2.19
+  Enabled: true

data/.rubocop_todo.yml

@@ -1,20 +1,20 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-07-19 17:18:47 UTC using RuboCop version 1.31.2.
+# on 2023-06-20 05:53:05 UTC using RuboCop version 1.52.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
 # Offense count: 1
-# Configuration parameters: Include.
+# Configuration parameters: Severity, Include.
 # Include: **/*.gemspec
 Gemspec/RequiredRubyVersion:
   Exclude:
     - 'assembly-image.gemspec'
 
 # Offense count: 2
-# Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
+# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 20
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    assembly-image (2.1.0)
+    assembly-image (2.1.2)
       activesupport (> 6.1)
       assembly-objectfile (>= 1.6.4)
       ruby-vips (>= 2.0)
@@ -9,87 +9,100 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (7.0.3.1)
+    activesupport (7.0.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    assembly-objectfile (2.1.0)
+    assembly-objectfile (2.2.0)
       activesupport (>= 5.2.0)
       mime-types (> 3)
       mini_exiftool
     ast (2.4.2)
+    base64 (0.1.1)
     byebug (11.1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     diff-lcs (1.5.0)
     docile (1.4.0)
     ffi (1.15.5)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    json (2.6.2)
+    json (2.6.3)
+    language_server-protocol (3.17.0.3)
     method_source (1.0.0)
-    mime-types (3.4.1)
+    mime-types (3.5.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
+    mime-types-data (3.2023.0808)
     mini_exiftool (2.10.2)
-    minitest (5.16.2)
-    parallel (1.22.1)
-    parser (3.1.2.0)
+    minitest (5.20.0)
+    parallel (1.23.0)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
-    pry (0.13.1)
+      racc
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.9.0)
+    pry-byebug (3.10.1)
       byebug (~> 11.0)
-      pry (~> 0.13.0)
+      pry (>= 0.13, < 0.15)
+    racc (1.7.1)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.5.0)
-    rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    regexp_parser (2.8.1)
+    rexml (3.2.6)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    rubocop (1.31.2)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    rubocop (1.56.3)
+      base64 (~> 0.1.1)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.2.2.3)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.18.0, < 2.0)
+      rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.19.1)
-      parser (>= 3.1.1.0)
-    rubocop-rspec (2.12.1)
-      rubocop (~> 1.31)
-    ruby-progressbar (1.11.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.29.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.18.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.24.0)
+      rubocop (~> 1.33)
+    rubocop-rspec (2.24.0)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
+    ruby-progressbar (1.13.0)
     ruby-vips (2.1.4)
       ffi (~> 1.12)
-    simplecov (0.21.2)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.2.0)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
   x86_64-darwin-19
   x86_64-darwin-21
+  x86_64-darwin-22
   x86_64-linux
 
 DEPENDENCIES
@@ -102,4 +115,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   2.3.17
+   2.4.13

data/assembly-image.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.push File.expand_path('lib', __dir__)
 
 Gem::Specification.new do |s|
   s.name        = 'assembly-image'
-  s.version     = '2.1.0'
+  s.version     = '2.1.2'
   s.authors     = ['Peter Mangiafico', 'Renzo Sanchez-Silva', 'Monty Hindman', 'Tony Calavano']
   s.email       = ['pmangiafico@stanford.edu']
   s.homepage    = ''

data/lib/assembly/image/jp2_creator.rb

@@ -35,7 +35,7 @@ module Assembly
         @overwrite = overwrite
       end
 
-      attr_reader :image, :output_path, :tmp_folder, :tmp_tiff_path
+      attr_reader :image, :output_path, :tmp_folder
 
       delegate :vips_image, to: :image
 
@@ -43,19 +43,14 @@ module Assembly
       def create
         create_jp2_checks
 
-        # KDUcompress doesn’t support arbitrary image types,  so we make a temporary tiff
-        @tmp_tiff_path = make_tmp_tiff
+        Dir.mktmpdir('assembly-image', tmp_folder) do |tmp_tiff_dir|
+          tmp_tiff_path = File.join(tmp_tiff_dir, 'temp.tif')
 
-        jp2_command = jp2_create_command(source_path: tmp_tiff_path, output: output_path)
-        result = `#{jp2_command}`
-        unless $CHILD_STATUS.success?
-          # Clean up any partial result
-          FileUtils.rm_rf(output_path)
-          raise "JP2 creation command failed: #{jp2_command} with result #{result}"
+          # KDUcompress doesn’t support arbitrary image types, so we make a temporary tiff
+          make_tmp_tiff(tmp_tiff_path)
+          make_jp2(tmp_tiff_path)
         end
 
-        File.delete(tmp_tiff_path) unless tmp_tiff_path.nil?
-
         # create output response object, which is an Assembly::Image type object
         Image.new(output_path)
       end
@@ -94,22 +89,22 @@ module Assembly
         'Clevels=5' # Number of wavelet decomposition levels, or stages
       ].freeze
 
+      # rubocop:disable Metrics/AbcSize
+      # rubocop:disable Metrics/CyclomaticComplexity
       def create_jp2_checks
+        raise "tmp_folder #{tmp_folder} does not exist" unless File.exist?(tmp_folder)
+
         image.send(:check_for_file)
         raise 'input file is not a valid image, or is the wrong mimetype' unless image.jp2able?
 
         raise SecurityError, "output #{output_path} exists, cannot overwrite" if !overwrite? && File.exist?(output_path)
         raise SecurityError, 'cannot recreate jp2 over itself' if overwrite? && image.mimetype == 'image/jp2' && output_path == image.path
       end
+      # rubocop:enable Metrics/AbcSize
+      # rubocop:enable Metrics/CyclomaticComplexity
 
       # We do this because we need to reliably compress the tiff and KDUcompress doesn’t support arbitrary image types
-      # rubocop:disable Metrics/MethodLength
-      def make_tmp_tiff
-        raise "tmp_folder #{tmp_folder} does not exist" unless File.exist?(tmp_folder)
-
-        # make temp tiff filename
-        tmp_tiff_file = Tempfile.new(['assembly-image', '.tif'], tmp_folder)
-        result_path = tmp_tiff_file.path
+      def make_tmp_tiff(tmp_tiff_path)
         tmp_tiff_image = if vips_image.interpretation.eql?(:cmyk)
                            vips_image.icc_transform(SRGB_ICC, input_profile: CMYK_ICC)
                          elsif image.has_profile?
@@ -118,10 +113,21 @@ module Assembly
                            vips_image
                          end
 
-        tmp_tiff_image.tiffsave(result_path, bigtiff: true) # Use bigtiff so we can support images > 4GB
-        result_path
+        tmp_tiff_image.tiffsave(tmp_tiff_path, bigtiff: true) # Use bigtiff so we can support images > 4GB
+
+        # For troublshooting JP2 creation problems. See https://github.com/sul-dlss/common-accessioning/issues/1079
+        raise "Temp tiff files #{tmp_tiff_path} does not exist" unless File.exist?(tmp_tiff_path)
+      end
+
+      def make_jp2(tmp_tiff_path)
+        jp2_command = jp2_create_command(source_path: tmp_tiff_path, output: output_path)
+        result = `#{jp2_command}`
+        return if $CHILD_STATUS.success?
+
+        # Clean up any partial result
+        FileUtils.rm_rf(output_path)
+        raise "JP2 creation command failed: #{jp2_command} with result #{result}"
       end
-      # rubocop:enable Metrics/MethodLength
     end
   end
 end

data/lib/assembly/image.rb

@@ -42,6 +42,8 @@ module Assembly
     end
 
     def vips_image
+      # Disable cache. Otherwise, Vips gets confused by files with the same filename.
+      Vips.cache_set_max_files(0)
       # autorot will only affect images that need rotation: https://www.libvips.org/API/current/libvips-conversion.html#vips-autorot
       @vips_image ||= Vips::Image.new_from_file(path).autorot
     end

data/spec/assembly/image/jp2_creator_spec.rb

@@ -2,6 +2,7 @@
 
 require 'spec_helper'
 
+# rubocop:disable RSpec/ExampleLength
 RSpec.describe Assembly::Image::Jp2Creator do
   let(:jp2creator) { described_class.new(assembly_image, output: jp2_output_file) }
   let(:assembly_image) { Assembly::Image.new(input_path) }
@@ -52,9 +53,13 @@ RSpec.describe Assembly::Image::Jp2Creator do
         expect(result.path).to eq jp2_output_file
         expect(result.mimetype).to eq 'image/jp2'
         # check srgb on temporary tiff (due to CI libvips not speaking jp2)
-        tmp_tiff_image = Assembly::Image.new(jp2creator.send(:make_tmp_tiff))
-        expect(tmp_tiff_image.srgb?).to be true
-        expect(tmp_tiff_image.has_profile?).to be false
+        Dir.mktmpdir('assembly-image-test') do |tmp_tiff_dir|
+          tmp_tiff_path = File.join(tmp_tiff_dir, 'temp.tif')
+          jp2creator.send(:make_tmp_tiff, tmp_tiff_path)
+          tmp_tiff_image = Assembly::Image.new(tmp_tiff_path)
+          expect(tmp_tiff_image.srgb?).to be true
+          expect(tmp_tiff_image.has_profile?).to be false
+        end
       end
     end
 
@@ -87,9 +92,13 @@ RSpec.describe Assembly::Image::Jp2Creator do
         expect(result.path).to eq jp2_output_file
         expect(result.mimetype).to eq 'image/jp2'
         # check srgb on temporary tiff (due to CI libvips not speaking jp2)
-        tmp_tiff_image = Assembly::Image.new(jp2creator.send(:make_tmp_tiff))
-        expect(tmp_tiff_image.srgb?).to be true
-        expect(tmp_tiff_image.has_profile?).to be false
+        Dir.mktmpdir('assembly-image-test') do |tmp_tiff_dir|
+          tmp_tiff_path = File.join(tmp_tiff_dir, 'temp.tif')
+          jp2creator.send(:make_tmp_tiff, tmp_tiff_path)
+          tmp_tiff_image = Assembly::Image.new(tmp_tiff_path)
+          expect(tmp_tiff_image.srgb?).to be true
+          expect(tmp_tiff_image.has_profile?).to be false
+        end
       end
     end
 
@@ -113,7 +122,7 @@ RSpec.describe Assembly::Image::Jp2Creator do
         generate_test_image(input_path)
       end
 
-      it 'gets the correct image, creates and cleans up the temporary tiff' do
+      it 'gets the correct image, creates the temporary tiff' do
         expect(File).to exist input_path # test image was generated
         expect(File).not_to exist jp2_output_file
 
@@ -121,12 +130,13 @@ RSpec.describe Assembly::Image::Jp2Creator do
         expect(result.path).to eq jp2_output_file
         expect(result.mimetype).to eq 'image/jp2'
         # check height and width on temporary tiff (due to CI libvips not speaking jp2)
-        tmp_tiff_image = Assembly::Image.new(jp2creator.send(:make_tmp_tiff))
-        expect(tmp_tiff_image.height).to eq 36
-        expect(tmp_tiff_image.width).to eq 43
-
-        expect(jp2creator.tmp_tiff_path).not_to be_nil # temporary tiff was created
-        expect(File).not_to exist jp2creator.tmp_tiff_path # the temporary tiff path is cleaned up
+        Dir.mktmpdir('assembly-image-test') do |tmp_tiff_dir|
+          tmp_tiff_path = File.join(tmp_tiff_dir, 'temp.tif')
+          jp2creator.send(:make_tmp_tiff, tmp_tiff_path)
+          tmp_tiff_image = Assembly::Image.new(tmp_tiff_path)
+          expect(tmp_tiff_image.height).to eq 36
+          expect(tmp_tiff_image.width).to eq 43
+        end
       end
     end
 
@@ -144,9 +154,13 @@ RSpec.describe Assembly::Image::Jp2Creator do
         expect(result.path).to eq jp2_output_file
         expect(result.mimetype).to eq 'image/jp2'
         # check height and width on temporary tiff (due to CI libvips not speaking jp2)
-        tmp_tiff_image = Assembly::Image.new(jp2creator.send(:make_tmp_tiff))
-        expect(tmp_tiff_image.height).to eq 36
-        expect(tmp_tiff_image.width).to eq 43
+        Dir.mktmpdir('assembly-image-test') do |tmp_tiff_dir|
+          tmp_tiff_path = File.join(tmp_tiff_dir, 'temp.tif')
+          jp2creator.send(:make_tmp_tiff, tmp_tiff_path)
+          tmp_tiff_image = Assembly::Image.new(tmp_tiff_path)
+          expect(tmp_tiff_image.height).to eq 36
+          expect(tmp_tiff_image.width).to eq 43
+        end
       end
     end
 
@@ -169,9 +183,13 @@ RSpec.describe Assembly::Image::Jp2Creator do
 
         # NOTE: we verify the CMYK has been converted to an SRGB JP2 correctly by using ruby-vips;
         #   we have to verify this on the *temporary tiff because lipvips pkg available for circleci does not speak JP2
-        tmp_tiff_image = Assembly::Image.new(jp2creator.send(:make_tmp_tiff))
-        expect(tmp_tiff_image.srgb?).to be true
-        expect(tmp_tiff_image.has_profile?).to be true
+        Dir.mktmpdir('assembly-image-test') do |tmp_tiff_dir|
+          tmp_tiff_path = File.join(tmp_tiff_dir, 'temp.tif')
+          jp2creator.send(:make_tmp_tiff, tmp_tiff_path)
+          tmp_tiff_image = Assembly::Image.new(tmp_tiff_path)
+          expect(tmp_tiff_image.srgb?).to be true
+          expect(tmp_tiff_image.has_profile?).to be true
+        end
       end
     end
 
@@ -189,9 +207,13 @@ RSpec.describe Assembly::Image::Jp2Creator do
         expect(result.path).to eq jp2_output_file
         expect(result.mimetype).to eq 'image/jp2'
         # check height and width on temporary tiff (due to CI libvips not speaking jp2)
-        tmp_tiff_image = Assembly::Image.new(jp2creator.send(:make_tmp_tiff))
-        expect(tmp_tiff_image.height).to eq 36
-        expect(tmp_tiff_image.width).to eq 43
+        Dir.mktmpdir('assembly-image-test') do |tmp_tiff_dir|
+          tmp_tiff_path = File.join(tmp_tiff_dir, 'temp.tif')
+          jp2creator.send(:make_tmp_tiff, tmp_tiff_path)
+          tmp_tiff_image = Assembly::Image.new(tmp_tiff_path)
+          expect(tmp_tiff_image.height).to eq 36
+          expect(tmp_tiff_image.width).to eq 43
+        end
       end
     end
 
@@ -212,9 +234,13 @@ RSpec.describe Assembly::Image::Jp2Creator do
         expect(result.mimetype).to eq 'image/jp2'
 
         # check srgb on temporary tiff (due to CI libvips not speaking jp2)
-        tmp_tiff_image = Assembly::Image.new(jp2creator.send(:make_tmp_tiff))
-        expect(tmp_tiff_image.srgb?).to be true
-        expect(tmp_tiff_image.has_profile?).to be false
+        Dir.mktmpdir('assembly-image-test') do |tmp_tiff_dir|
+          tmp_tiff_path = File.join(tmp_tiff_dir, 'temp.tif')
+          jp2creator.send(:make_tmp_tiff, tmp_tiff_path)
+          tmp_tiff_image = Assembly::Image.new(tmp_tiff_path)
+          expect(tmp_tiff_image.srgb?).to be true
+          expect(tmp_tiff_image.has_profile?).to be false
+        end
       end
     end
 
@@ -237,12 +263,16 @@ RSpec.describe Assembly::Image::Jp2Creator do
         expect(result.mimetype).to eq 'image/jp2'
 
         # check srgb on temporary tiff (due to CI libvips not speaking jp2)
-        tmp_tiff_image = Assembly::Image.new(jp2creator.send(:make_tmp_tiff))
-        expect(tmp_tiff_image.srgb?).to be false
-        expect(tmp_tiff_image.has_profile?).to be false
-        vips_for_tmp_tiff = tmp_tiff_image.vips_image
-        expect(vips_for_tmp_tiff.bands).to eq 1
-        expect(vips_for_tmp_tiff.interpretation).to eq :'b-w'
+        Dir.mktmpdir('assembly-image-test') do |tmp_tiff_dir|
+          tmp_tiff_path = File.join(tmp_tiff_dir, 'temp.tif')
+          jp2creator.send(:make_tmp_tiff, tmp_tiff_path)
+          tmp_tiff_image = Assembly::Image.new(tmp_tiff_path)
+          expect(tmp_tiff_image.srgb?).to be false
+          expect(tmp_tiff_image.has_profile?).to be false
+          vips_for_tmp_tiff = tmp_tiff_image.vips_image
+          expect(vips_for_tmp_tiff.bands).to eq 1
+          expect(vips_for_tmp_tiff.interpretation).to eq :'b-w'
+        end
       end
     end
 
@@ -267,10 +297,14 @@ RSpec.describe Assembly::Image::Jp2Creator do
         expect(result.mimetype).to eq 'image/jp2'
 
         # check srgb on temporary tiff (due to CI libvips not speaking jp2)
-        tmp_tiff_image = Assembly::Image.new(jp2creator.send(:make_tmp_tiff))
-        expect(tmp_tiff_image.srgb?).to be true
-        expect(tmp_tiff_image.has_profile?).to be false
-        expect(tmp_tiff_image.vips_image.bands).to eq 3
+        Dir.mktmpdir('assembly-image-test') do |tmp_tiff_dir|
+          tmp_tiff_path = File.join(tmp_tiff_dir, 'temp.tif')
+          jp2creator.send(:make_tmp_tiff, tmp_tiff_path)
+          tmp_tiff_image = Assembly::Image.new(tmp_tiff_path)
+          expect(tmp_tiff_image.srgb?).to be true
+          expect(tmp_tiff_image.has_profile?).to be false
+          expect(tmp_tiff_image.vips_image.bands).to eq 3
+        end
       end
     end
 
@@ -294,12 +328,16 @@ RSpec.describe Assembly::Image::Jp2Creator do
         expect(result.mimetype).to eq 'image/jp2'
 
         # check srgb on temporary tiff (due to CI libvips not speaking jp2)
-        tmp_tiff_image = Assembly::Image.new(jp2creator.send(:make_tmp_tiff))
-        expect(tmp_tiff_image.srgb?).to be false
-        expect(tmp_tiff_image.has_profile?).to be false
-        vips_for_tmp_tiff = tmp_tiff_image.vips_image
-        expect(vips_for_tmp_tiff.bands).to eq 1
-        expect(vips_for_tmp_tiff.interpretation).to eq :'b-w'
+        Dir.mktmpdir('assembly-image-test') do |tmp_tiff_dir|
+          tmp_tiff_path = File.join(tmp_tiff_dir, 'temp.tif')
+          jp2creator.send(:make_tmp_tiff, tmp_tiff_path)
+          tmp_tiff_image = Assembly::Image.new(tmp_tiff_path)
+          expect(tmp_tiff_image.srgb?).to be false
+          expect(tmp_tiff_image.has_profile?).to be false
+          vips_for_tmp_tiff = tmp_tiff_image.vips_image
+          expect(vips_for_tmp_tiff.bands).to eq 1
+          expect(vips_for_tmp_tiff.interpretation).to eq :'b-w'
+        end
       end
     end
 
@@ -321,27 +359,33 @@ RSpec.describe Assembly::Image::Jp2Creator do
         expect(result.mimetype).to eq 'image/jp2'
 
         # check srgb on temporary tiff (due to CI libvips not speaking jp2)
-        tmp_tiff_image = Assembly::Image.new(jp2creator.send(:make_tmp_tiff))
-        expect(tmp_tiff_image.srgb?).to be true
-        expect(tmp_tiff_image.has_profile?).to be false
-        vips_for_tmp_tiff = tmp_tiff_image.vips_image
-        expect(vips_for_tmp_tiff.bands).to eq 3
+        Dir.mktmpdir('assembly-image-test') do |tmp_tiff_dir|
+          tmp_tiff_path = File.join(tmp_tiff_dir, 'temp.tif')
+          jp2creator.send(:make_tmp_tiff, tmp_tiff_path)
+          tmp_tiff_image = Assembly::Image.new(tmp_tiff_path)
+          expect(tmp_tiff_image.srgb?).to be true
+          expect(tmp_tiff_image.has_profile?).to be false
+          vips_for_tmp_tiff = tmp_tiff_image.vips_image
+          expect(vips_for_tmp_tiff.bands).to eq 3
+        end
       end
     end
   end
 
   describe '#make_tmp_tiff' do
-    subject(:tiff_file) { jp2creator.send(:make_tmp_tiff) }
-
     let(:input_path) { 'spec/test_data/color_rgb_srgb_rot90cw.tif' }
-    let(:vips_output) { Vips::Image.new_from_file(tiff_file) }
     let(:plum) { [94.0, 58.0, 101.0] }
 
     context 'when given a tiff with a rotation hint' do
       it 'rotates it' do
         expect(Vips::Image.new_from_file(input_path).getpoint(3, 3)).not_to eq plum
-        expect(vips_output.getpoint(3, 3)).to eq plum
+        Dir.mktmpdir('assembly-image-test') do |tmp_tiff_dir|
+          tmp_tiff_path = File.join(tmp_tiff_dir, 'temp.tif')
+          jp2creator.send(:make_tmp_tiff, tmp_tiff_path)
+          expect(Vips::Image.new_from_file(tmp_tiff_path).getpoint(3, 3)).to eq plum
+        end
       end
     end
   end
 end
+# rubocop:enable RSpec/ExampleLength

data/spec/spec_helper.rb

@@ -169,10 +169,10 @@ def generate_test_image(file, params = {})
 
   temp_array = color_gauge_values(cg_type)
   temp_image = Vips::Image.black(width, height, bands: temp_array.first.size)
-  (0..4).each do |i|
+  5.times do |i|
     b = (box_size * i) + (line_size * (i + 1))
     # d = b + box_size - line_size
-    (0...6).each do |j|
+    6.times do |j|
       a = (box_size * j) + (line_size * (j + 1))
       # c = a + box_size - line_size
       colors = temp_array.shift

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: assembly-image
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.2
 platform: ruby
 authors:
 - Peter Mangiafico
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-19 00:00:00.000000000 Z
+date: 2023-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Ruby immplementation of image services needed to prepare objects to be accessioned