assembly-image 1.9.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fee80ede73f89c00b4190c802537d9d92057958cd056b2f076c5e54294daa2a
-  data.tar.gz: af6b7ca6d3600a051d2403bdfb72de29ebfab3ebe2e4296529e2cd10fb98662e
+  metadata.gz: 9379ec53a26a08578c11910512bd73045366fc337fcafb0c7eb1a247370566b1
+  data.tar.gz: 316fbef312cb027f4061bbe74dc2f8dce993a095d6779da100abeeecbf24b9da
 SHA512:
-  metadata.gz: e380fd9bda9288ee8fabb74ab0ad7256c2623499044265b739b8bacc407f92ef97ee4102265ba2bbb414c89c9ead373c65cdc8df7726f055f524673d36322684
-  data.tar.gz: 7e712a8bd31dd1728a0fc3b07a78c98cdd78a98fe0a2d5d38bd2960ceb48317b60dc3f0747011cb897603bd9d72558add2d0ab322eeb7246cc31d66f090a8e31
+  metadata.gz: 97cc720649bdc6e0bb6d7453afdefc7abe3f0931a45976d397f1f77fd2f2dacbcbd4991e64c0e4849a2ae61efa51d72d428ce9a8a15e9a125abdeefcb17b0d5b
+  data.tar.gz: 8e6580aaade8302319e7cbf41d56d8ac0ebe1a05db5607bed8580cebe8a3c87b5795cb90f50e2b9eb4b081d9048a600799b0e373badf811ff9a084e5f9af3fcc

data/.circleci/config.yml

@@ -12,6 +12,9 @@ workflows:
             - run:
                 name: Install exiftool
                 command: curl -L http://cpanmin.us | perl - --sudo Image::ExifTool
+            - run:
+                name: Install libvips
+                command: sudo apt-get update && sudo apt-get install -y libvips
             - setup_remote_docker
             - run:
                 name: Install Kakadu

data/.gitignore

@@ -14,3 +14,5 @@ tmp
 
 coverage
 spec/examples.txt
+spec/test_data/input/*
+spec/test_data/output/*

data/.rubocop.yml

@@ -22,9 +22,6 @@ Naming/FileName:
   Exclude:
    - lib/assembly-image.rb
 
-RSpec/ExampleLength:
-  Max: 12
-
 Style/WordArray:
   Enabled: false
 
@@ -166,3 +163,6 @@ RSpec/ChangeByZero: # new in 2.11.0
   Enabled: true
 RSpec/VerifiedDoubleReference: # new in 2.10.0
   Enabled: true
+
+Gemspec/DeprecatedAttributeAssignment: # new in 1.30
+  Enabled: true

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-02-28 19:49:08 UTC using RuboCop version 1.25.1.
+# on 2022-06-16 22:15:07 UTC using RuboCop version 1.30.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
@@ -13,13 +13,23 @@ Gemspec/RequiredRubyVersion:
   Exclude:
     - 'assembly-image.gemspec'
 
-# Offense count: 3
-# Cop supports --auto-correct.
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
 Lint/RedundantCopDisableDirective:
   Exclude:
     - 'lib/assembly-image/image.rb'
     - 'lib/assembly-image/images.rb'
 
+# Offense count: 2
+# Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
+Metrics/AbcSize:
+  Max: 20
+
+# Offense count: 14
+# Configuration parameters: CountAsOne.
+RSpec/ExampleLength:
+  Max: 15
+
 # Offense count: 2
 # Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
 # Include: **/*_spec*rb*, **/spec/**/*
@@ -30,7 +40,7 @@ RSpec/FilePath:
 
 # Offense count: 21
 RSpec/MultipleExpectations:
-  Max: 10
+  Max: 13
 
 # Offense count: 5
 RSpec/UnspecifiedException:
@@ -44,7 +54,7 @@ Style/CombinableLoops:
     - 'spec/images_spec.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports unsafe autocorrection (--autocorrect-all).
 Style/GlobalStdStream:
   Exclude:
     - 'lib/assembly-image/images.rb'
@@ -56,8 +66,8 @@ Style/OptionalBooleanParameter:
   Exclude:
     - 'lib/assembly-image/image.rb'
 
-# Offense count: 8
-# Cop supports --auto-correct-all.
+# Offense count: 7
+# This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Mode.
 Style/StringConcatenation:
   Exclude:

data/README.md

@@ -7,7 +7,7 @@
 
 ## Overview
 This gem contains classes used by the Stanford University Digital Library to
-perform image operations necessary for accessioning of content.  
+perform image operations necessary for accessioning of content.
 
 Requires image processing software - see PreRequisites section below.
 
@@ -69,33 +69,12 @@ http://kakadusoftware.com/downloads/
 
 NOTE: If you have upgrade to El Capitan on OS X, you will need to donwload and re-install the latest version of Kakadu, due to changes made with SIP.  These changes moved the old executable binaries to an inaccessible location.
 
-### Imagemagick
-
-#### RHEL 6
-
-The version of ImageMagick included with RHEL 6 has all of the dependency libraries included:
-
-```bash
-yum install ImageMagick
-```
-#### RHEL 5
-
-The version of ImageMagick included with RHEL 5 is too old and does not have all the proper binaries included/built:
-
-```bash
-yum install lcms lcms-devel libjpeg libjpeg-devel libpng libpng-devel
-```
-Required libraries from source:
-* libtiff (version 3.9.4 or higher)
-
-Build Imagemagick from source:
-http://www.imagemagick.org/download/ImageMagick.tar.gz
+### Libvips
 
 #### Mac
 
 ```bash
-brew install jasper libtiff
-brew install imagemagick --use-tiff --use-jpeg2000
+brew install libvips
 ```
 
 ### Exiftool

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     = '1.9.0'
+  s.version     = '2.0.0'
   s.authors     = ['Peter Mangiafico', 'Renzo Sanchez-Silva', 'Monty Hindman', 'Tony Calavano']
   s.email       = ['pmangiafico@stanford.edu']
   s.homepage    = ''
@@ -13,14 +13,15 @@ Gem::Specification.new do |s|
   s.metadata['rubygems_mfa_required'] = 'true'
 
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.bindir        = 'exe'
   s.executables   = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
   s.require_paths = ['lib']
 
   s.add_dependency 'assembly-objectfile', '>= 1.6.4'
   s.add_dependency 'mini_exiftool', '>= 1.6', '< 3'
+  s.add_dependency 'ruby-vips', '>= 2.0'
 
+  s.add_development_dependency 'pry-byebug'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'rubocop'

data/lib/assembly-image/image.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'ruby-vips'
 require 'assembly-objectfile'
 require_relative 'jp2_creator'
 
@@ -74,8 +75,7 @@ module Assembly
     def add_exif_profile_description(profile_name, force = false)
       if profile.nil? || force
         input_profile = profile_name.gsub(/[^[:alnum:]]/, '') # remove all non alpha-numeric characters, so we can get to a filename
-        path_to_profiles = File.join(Assembly::PATH_TO_IMAGE_GEM, 'profiles')
-        input_profile_file = File.join(path_to_profiles, "#{input_profile}.icc")
+        input_profile_file = File.join(PATH_TO_PROFILES, "#{input_profile}.icc")
         command = "exiftool '-icc_profile<=#{input_profile_file}' #{path}"
         result = `#{command} 2>&1`
         raise "profile addition command failed: #{command} with result #{result}" unless $CHILD_STATUS.success?
@@ -94,16 +94,6 @@ module Assembly
       File.extname(path).empty? ? "#{path}.jp2" : path.gsub(File.extname(path), '.jp2')
     end
 
-    # Returns the full DPG equivalent jp2 path and filename that would match with the given image
-    #
-    # @return [string] full DPG equivalent jp2 path and filename
-    # Example:
-    #   source_img=Assembly::Image.new('/input/path_to_file.tif')
-    #   puts source_img.jp2_filename # gives /input/path_to_file.jp2
-    def dpg_jp2_filename
-      jp2_filename.gsub('_00_', '_05_')
-    end
-
     # Create a JP2 file for the current image.
     # Important note: this will not work for multipage TIFFs.
     #

data/lib/assembly-image/images.rb

@@ -37,8 +37,6 @@ module Assembly
 
       raise 'Input path does not exist' unless File.directory?(source)
 
-      logger.debug "Source: #{source}"
-
       # iterate over input directory looking for tifs
       pattern = recursive ? "**/*.#{extension}" : "*.#{extension}*"
       Dir.glob(File.join(source, pattern)).each do |file|
@@ -81,9 +79,6 @@ module Assembly
       Dir.mkdir(output) unless File.directory?(output) # attemp to make output directory
       raise 'Output path does not exist or could not be created' unless File.directory?(output)
 
-      logger.debug "Source: #{source}"
-      logger.debug "Destination: #{output}"
-
       pattern = recursive ? "**/*.#{extension}" : "*.#{extension}*"
 
       # iterate over input directory looking for tifs

data/lib/assembly-image/jp2_creator.rb

@@ -7,7 +7,7 @@ require 'English' # see https://github.com/rubocop-hq/rubocop/issues/1747 (not #
 module Assembly
   class Image < Assembly::ObjectFile
     # Creates jp2 derivatives
-    class Jp2Creator # rubocop:disable  Metrics/ClassLength
+    class Jp2Creator
       # Create a JP2 file for the current image.
       # Important note: this will not work for multipage TIFFs.
       #
@@ -68,6 +68,7 @@ module Assembly
 
       def jp2_create_command(source_path:, output:)
         options = []
+        # TODO: Consider using ruby-vips to determine the colorspace instead of relying on exif (which is done below)
         options << '-jp2_space sRGB' if image.samples_per_pixel == 3
         options += KDU_COMPRESS_DEFAULT_OPTIONS
         options << "Clayers=#{layers}"
@@ -82,20 +83,15 @@ module Assembly
 
       KDU_COMPRESS_DEFAULT_OPTIONS = [
         '-num_threads 2', # forces Kakadu to only use 2 threads
-        '-precise', # forces the use of 32-bit representations
-        '-no_weights', # minimization of the MSE over all reconstructed colour components
         '-quiet', # suppress informative messages.
         'Creversible=no', # Disable reversible compression
-        'Cmodes=BYPASS', #
         'Corder=RPCL', # R=resolution P=position C=component L=layer
         'Cblk=\\{64,64\\}', # code-block dimensions; 64x64 happens to also be the default
         'Cprecincts=\\{256,256\\},\\{256,256\\},\\{128,128\\}', # Precinct dimensions; 256x256 for the 2 highest resolution levels, defaults to 128x128 for the rest
-        'ORGgen_plt=yes', # Insert packet length information
-        '-rate 1.5', # Ratio of compressed bits to the image size
+        '-rate -', # Ratio of compressed bits to the image size
         'Clevels=5' # Number of wavelet decomposition levels, or stages
       ].freeze
 
-      # rubocop:disable Metrics/AbcSize
       def create_jp2_checks
         image.send(:check_for_file)
         raise 'input file is not a valid image, or is the wrong mimetype' unless image.jp2able?
@@ -104,46 +100,13 @@ module Assembly
         raise SecurityError, 'cannot recreate jp2 over itself' if overwrite? && image.mimetype == 'image/jp2' && output_path == image.path
       end
 
-      # rubocop:disable Metrics/MethodLength
-      def profile_conversion_switch(profile, tmp_folder:)
-        path_to_profiles = File.join(Assembly::PATH_TO_IMAGE_GEM, 'profiles')
-        # eventually we may allow the user to specify the output_profile...when we do, you can just uncomment this code
-        # and update the tests that check for this
-        output_profile = 'sRGBIEC6196621' # params[:output_profile] || 'sRGBIEC6196621'
-        output_profile_file = File.join(path_to_profiles, "#{output_profile}.icc")
-
-        raise "output profile #{output_profile} invalid" unless File.exist?(output_profile_file)
-
-        return '' if image.profile.nil?
-
-        # if the input color profile exists, contract paths to the profile and setup the command
-
-        input_profile = profile.gsub(/[^[:alnum:]]/, '') # remove all non alpha-numeric characters, so we can get to a filename
-
-        # construct a path to the input profile, which might exist either in the gem itself or in the tmp folder
-        input_profile_file_gem = File.join(path_to_profiles, "#{input_profile}.icc")
-        input_profile_file_tmp = File.join(tmp_folder, "#{input_profile}.icc")
-        input_profile_file = File.exist?(input_profile_file_gem) ? input_profile_file_gem : input_profile_file_tmp
-
-        # if input profile was extracted and does not matches an existing known profile either in the gem or in the tmp folder,
-        # we'll issue an imagicmagick command to extract the profile to the tmp folder
-        unless File.exist?(input_profile_file)
-          input_profile_extract_command = "MAGICK_TEMPORARY_PATH=#{tmp_folder} convert '#{image.path}'[0] #{input_profile_file}" # extract profile from input image
-          result = `#{input_profile_extract_command} 2>&1`
-          raise "input profile extraction command failed: #{input_profile_extract_command} with result #{result}" unless $CHILD_STATUS.success?
-          # if extraction failed or we cannot write the file, throw exception
-          raise 'input profile is not a known profile and could not be extracted from input file' unless File.exist?(input_profile_file)
-        end
-
-        "-profile #{input_profile_file} -profile #{output_profile_file}"
-      end
-
       # Bigtiff needs to be used if size of image exceeds 2^32 bytes.
       def need_bigtiff?
         image.image_data_size >= 2**32
       end
 
       # 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(tmp_folder: nil)
         tmp_folder ||= Dir.tmpdir
         raise "tmp_folder #{tmp_folder} does not exists" unless File.exist?(tmp_folder)
@@ -151,35 +114,20 @@ module Assembly
         # make temp tiff filename
         tmp_tiff_file = Tempfile.new(['assembly-image', '.tif'], tmp_folder)
         tmp_path = tmp_tiff_file.path
+        vips_image = Vips::Image.new_from_file image.path
 
-        options = []
-
-        # Limit the amount of memory ImageMagick is able to use.
-        options << '-limit memory 1GiB -limit map 1GiB'
-
-        case image.samples_per_pixel
-        when 3
-          options << '-type TrueColor'
-        when 1
-          options << '-depth 8' # force the production of a grayscale access derivative
-          options << '-type Grayscale'
-        end
-
-        options << profile_conversion_switch(image.profile, tmp_folder: tmp_folder)
-
-        # The output in the covnert command needs to be prefixed by the image type. By default ImageMagick
-        # will assume TIFF: when the file extension is .tif/.tiff. TIFF64: Needs to be forced when image will
-        # exceed 2^32 bytes in size
-        tiff_type = need_bigtiff? ? 'TIFF64:' : ''
-
-        tiff_command = "MAGICK_TEMPORARY_PATH=#{tmp_folder} convert -quiet -compress none #{options.join(' ')} '#{image.path}[0]' #{tiff_type}'#{tmp_path}'"
-        result = `#{tiff_command} 2>&1`
-        raise "tiff convert command failed: #{tiff_command} with result #{result}" unless $CHILD_STATUS.success?
+        vips_image = if vips_image.interpretation.eql?(:cmyk)
+                       vips_image.icc_transform(SRGB_ICC, input_profile: CMYK_ICC)
+                     elsif !image.profile.nil?
+                       vips_image.icc_transform(SRGB_ICC, embedded: true)
+                     else
+                       vips_image
+                     end
 
+        vips_image.tiffsave(tmp_path, bigtiff: need_bigtiff?)
         tmp_path
       end
       # rubocop:enable Metrics/MethodLength
-      # rubocop:enable Metrics/AbcSize
     end
   end
 end

data/lib/assembly-image.rb

@@ -3,6 +3,9 @@
 module Assembly
   # the path to the gem, used to access profiles stored with the gem
   PATH_TO_IMAGE_GEM = File.expand_path(File.dirname(__FILE__) + '/..')
+  PATH_TO_PROFILES = File.join(Assembly::PATH_TO_IMAGE_GEM, 'profiles')
+  SRGB_ICC = File.join(PATH_TO_PROFILES, 'sRGBIEC6196621.icc')
+  CMYK_ICC = File.join(PATH_TO_PROFILES, 'cmyk.icc')
 end
 
 require 'assembly-image/image'

data/spec/assembly/image/jp2_creator_spec.rb

@@ -9,11 +9,7 @@ RSpec.describe Assembly::Image::Jp2Creator do
   let(:input_path) { TEST_TIF_INPUT_FILE }
   let(:creator) { described_class.new(ai, output: TEST_JP2_OUTPUT_FILE) }
 
-  after do
-    # after each test, empty out the input and output test directories
-    remove_files(TEST_INPUT_DIR)
-    remove_files(TEST_OUTPUT_DIR)
-  end
+  before { cleanup }
 
   context 'when given an LZW compressed RGB tif' do
     before do
@@ -31,8 +27,8 @@ RSpec.describe Assembly::Image::Jp2Creator do
       expect(creator.tmp_path).not_to be_nil
       expect(result.exif.colorspace).to eq 'sRGB'
       jp2 = Assembly::Image.new(TEST_JP2_OUTPUT_FILE)
-      expect(jp2.height).to eq 100
-      expect(jp2.width).to eq 100
+      expect(jp2.height).to eq 36
+      expect(jp2.width).to eq 43
     end
   end
 

data/spec/image_spec.rb

@@ -1,20 +1,18 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
+require 'fileutils'
 
 RSpec.describe Assembly::Image do
   let(:assembly_image) { described_class.new(input_path) }
   let(:input_path) { TEST_TIF_INPUT_FILE }
+  let(:jp2_output_file) { File.join(TEST_OUTPUT_DIR, File.basename(input_path).gsub('.tif', '.jp2')) }
 
-  after do
-    # after each test, empty out the input and output test directories
-    remove_files(TEST_INPUT_DIR)
-    remove_files(TEST_OUTPUT_DIR)
-  end
+  before { cleanup }
 
   describe '#jp2_filename' do
     it 'indicates the default jp2 filename' do
-      expect(assembly_image.jp2_filename).to eq TEST_TIF_INPUT_FILE.gsub('.tif', '.jp2')
+      expect(assembly_image.jp2_filename).to eq input_path.gsub('.tif', '.jp2')
     end
 
     context 'with a file with no extension' do
@@ -26,200 +24,247 @@ RSpec.describe Assembly::Image do
     end
   end
 
-  describe '#dpg_jp2_filename' do
-    context 'with a dpg tiff file' do
-      let(:input_path) { TEST_DPG_TIF_INPUT_FILE }
-
-      it 'indicates the default DPG jp2 filename' do
-        expect(assembly_image.dpg_jp2_filename).to eq TEST_DPG_TIF_INPUT_FILE.gsub('.tif', '.jp2').gsub('_00_', '_05_')
-      end
-    end
-
-    context 'with a file with no extension' do
-      let(:input_path) { '/path/to/a/file_with_no_00_extension' }
-
-      it 'indicates the default jp2 filename' do
-        expect(assembly_image.dpg_jp2_filename).to eq '/path/to/a/file_with_no_05_extension.jp2'
-      end
-    end
-  end
-
   describe '#create_jp2' do
     context 'when input path is blank' do
       let(:input_path) { '' }
 
       it 'does not run if no input file is passed in' do
-        expect { assembly_image.create_jp2 }.to raise_error
+        expect { assembly_image.create_jp2 }.to raise_error(RuntimeError)
       end
     end
 
     context 'when given an uncompressed compressed RGB tif with more than 4GB of image data', skip: 'This test will create a 4GB test image and a 4GB temporary image, so skipping by default.' do
+      let(:input_path) { File.join(TEST_INPUT_DIR, 'rgb.tif') }
+
       before do
-        generate_test_image(TEST_TIF_INPUT_FILE, compress: 'none', width: '37838', height: '37838')
+        generate_test_image(input_path, compress: 'none', width: '37838', height: '37838')
       end
 
       it 'creates the jp2 with a temp file' do
-        expect(File).to exist TEST_TIF_INPUT_FILE
-        expect(File).not_to exist TEST_JP2_OUTPUT_FILE
-        result = assembly_image.create_jp2(output: TEST_JP2_OUTPUT_FILE)
+        expect(File).to exist input_path
+        expect(File).not_to exist jp2_output_file
+        result = assembly_image.create_jp2(output: jp2_output_file)
         expect(assembly_image.tmp_path).not_to be_nil
         expect(result).to be_a_kind_of described_class
-        expect(result.path).to eq TEST_JP2_OUTPUT_FILE
-        expect(TEST_JP2_OUTPUT_FILE).to be_a_jp2
+        expect(result.path).to eq jp2_output_file
+        expect(jp2_output_file).to be_a_jp2
         expect(result.exif.colorspace).to eq 'sRGB'
-        jp2 = described_class.new(TEST_JP2_OUTPUT_FILE)
-        expect(jp2.height).to eq 37_838
-        expect(jp2.width).to eq 37_838
+        expect(result.height).to eq 37_838
+        expect(result.width).to eq 37_838
       end
     end
 
     context 'when given an LZW compressed RGB tif with more than 4GB of image data', skip: 'This test will create a 4GB temporary image, so skipping by default.' do
+      let(:input_path) { File.join(TEST_INPUT_DIR, 'lzw.tif') }
+
       before do
-        generate_test_image(TEST_TIF_INPUT_FILE, compress: 'lzw', width: '37838', height: '37838')
+        generate_test_image(input_path, compress: 'lzw', width: '37838', height: '37838')
       end
 
       it 'creates the jp2 with a temp file' do
-        expect(File).to exist TEST_TIF_INPUT_FILE
-        expect(File).not_to exist TEST_JP2_OUTPUT_FILE
-        result = assembly_image.create_jp2(output: TEST_JP2_OUTPUT_FILE)
+        expect(File).to exist input_path
+        expect(File).not_to exist jp2_output_file
+        expect(assembly_image.exif.samplesperpixel).to be 3
+        expect(assembly_image.exif.bitspersample).to eql '8 8 8'
+        expect(assembly_image).to be_a_valid_image
+        expect(assembly_image).to be_jp2abl
+        result = assembly_image.create_jp2(output: jp2_output_file)
         expect(assembly_image.tmp_path).not_to be_nil
         expect(result).to be_a_kind_of described_class
-        expect(result.path).to eq TEST_JP2_OUTPUT_FILE
-        expect(TEST_JP2_OUTPUT_FILE).to be_a_jp2
+        expect(result.path).to eq jp2_output_file
+        expect(jp2_output_file).to be_a_jp2
         expect(result.exif.colorspace).to eq 'sRGB'
-        jp2 = described_class.new(TEST_JP2_OUTPUT_FILE)
-        expect(jp2.height).to eq 37_838
-        expect(jp2.width).to eq 37_838
+        expect(result.height).to eq 37_838
+        expect(result.width).to eq 37_838
       end
     end
 
     context 'when given a bitonal tif' do
+      let(:input_path) { File.join(TEST_INPUT_DIR, 'bitonal.tif') }
+
       before do
-        # Need to force group4 compression to get ImageMagick to create bitonal tiff
-        generate_test_image(TEST_TIF_INPUT_FILE, image_type: 'Bilevel', compress: 'group4')
+        generate_test_image(input_path, color: 'bin', bands: 1, depth: 1)
       end
 
-      it 'creates grayscale jp2' do
-        expect(File).to exist TEST_TIF_INPUT_FILE
-        expect(File).not_to exist TEST_JP2_OUTPUT_FILE
-        result = assembly_image.create_jp2(output: TEST_JP2_OUTPUT_FILE)
-        expect(TEST_JP2_OUTPUT_FILE).to be_a_jp2
+      it 'creates valid jp2' do
+        expect(File).to exist input_path
+        expect(File).not_to exist jp2_output_file
+        expect(assembly_image.exif.samplesperpixel).to be 1
+        expect(assembly_image.exif.bitspersample).to be 1
+        expect(assembly_image).not_to have_color_profile
+        result = assembly_image.create_jp2(output: jp2_output_file)
+        expect(result).to be_a_kind_of described_class
+        expect(result.path).to eq jp2_output_file
+        expect(jp2_output_file).to be_a_jp2
         expect(result.exif.colorspace).to eq 'Grayscale'
       end
     end
 
     context 'when given a color tif but bitonal image data (1 channels and 1 bits per pixel)' do
+      let(:input_path) { File.join(TEST_INPUT_DIR, 'color.tif') }
+
       before do
-        generate_test_image(TEST_TIF_INPUT_FILE, color: 'Bilevel', image_type: 'TrueColor', profile: '')
+        generate_test_image(input_path, color: 'bin', bands: 3)
       end
 
       it 'creates color jp2' do
-        expect(File).to exist TEST_TIF_INPUT_FILE
-        expect(File).not_to exist TEST_JP2_OUTPUT_FILE
+        expect(File).to exist input_path
+        expect(File).not_to exist jp2_output_file
         expect(assembly_image).not_to have_color_profile
-        result = assembly_image.create_jp2(output: TEST_JP2_OUTPUT_FILE)
-        expect(TEST_JP2_OUTPUT_FILE).to be_a_jp2
+        expect(assembly_image.exif.samplesperpixel).to be 3
+        expect(assembly_image.exif.bitspersample).to eql '8 8 8'
+        expect(assembly_image).to be_a_valid_image
+        expect(assembly_image).to be_jp2able
+        result = assembly_image.create_jp2(output: jp2_output_file)
+        expect(result).to be_a_kind_of described_class
+        expect(result.path).to eq jp2_output_file
+        expect(jp2_output_file).to be_a_jp2
         expect(result.exif.colorspace).to eq 'sRGB'
       end
     end
 
     context 'when given a graycale tif but with bitonal image data (1 channel and 1 bits per pixel)' do
+      let(:input_path) { File.join(TEST_INPUT_DIR, 'gray.tif') }
+
       before do
-        generate_test_image(TEST_TIF_INPUT_FILE, color: 'Bilevel', image_type: 'Grayscale', profile: '')
+        generate_test_image(input_path, color: 'grey', bands: 1)
       end
 
       it 'creates grayscale jp2' do
-        expect(File).to exist TEST_TIF_INPUT_FILE
-        expect(File).not_to exist TEST_JP2_OUTPUT_FILE
+        expect(File).to exist input_path
+        expect(File).not_to exist jp2_output_file
         expect(assembly_image).not_to have_color_profile
-        result = assembly_image.create_jp2(output: TEST_JP2_OUTPUT_FILE)
-        expect(TEST_JP2_OUTPUT_FILE).to be_a_jp2
+        expect(assembly_image.exif.samplesperpixel).to be 1
+        expect(assembly_image.exif.bitspersample).to be 8
+        expect(assembly_image).to be_a_valid_image
+        expect(assembly_image).to be_jp2able
+        result = assembly_image.create_jp2(output: jp2_output_file)
+        expect(jp2_output_file).to be_a_jp2
+        expect(result).to be_a_kind_of described_class
+        expect(result.path).to eq jp2_output_file
         expect(result.exif.colorspace).to eq 'Grayscale'
       end
     end
 
     context 'when given a color tif but with greyscale image data (1 channel and 8 bits per pixel)' do
+      let(:input_path) { File.join(TEST_INPUT_DIR, 'color_gray.tif') }
+
       before do
-        generate_test_image(TEST_TIF_INPUT_FILE, color: 'Grayscale', image_type: 'TrueColor', profile: '')
+        generate_test_image(input_path, color: 'grey')
       end
 
       it 'creates color jp2' do
-        expect(File).to exist TEST_TIF_INPUT_FILE
-        expect(File).not_to exist TEST_JP2_OUTPUT_FILE
+        expect(File).to exist input_path
+        expect(File).not_to exist jp2_output_file
+        expect(assembly_image.exif.samplesperpixel).to be 3
+        expect(assembly_image.exif.bitspersample).to eql '8 8 8'
+        expect(assembly_image).to be_a_valid_image
+        expect(assembly_image).to be_jp2able
         expect(assembly_image).not_to have_color_profile
-        result = assembly_image.create_jp2(output: TEST_JP2_OUTPUT_FILE)
-        expect(TEST_JP2_OUTPUT_FILE).to be_a_jp2
+        result = assembly_image.create_jp2(output: jp2_output_file)
+        expect(result).to be_a_kind_of described_class
+        expect(result.path).to eq jp2_output_file
+        expect(jp2_output_file).to be_a_jp2
         expect(result.exif.colorspace).to eq 'sRGB'
       end
     end
 
+    context 'when given a cmyk tif' do
+      let(:input_path) { File.join(TEST_INPUT_DIR, 'cmky.tif') }
+
+      before do
+        generate_test_image(input_path, color: 'cmyk', cg_type: 'cmyk', profile: 'cmyk', bands: 4)
+      end
+
+      it 'creates an srgb jp2', skip: 'Need to verify the color space is correct in jp2' do
+        expect(File).to exist input_path
+        expect(File).not_to exist jp2_output_file
+        expect(assembly_image.exif.samplesperpixel).to be 4
+        expect(assembly_image.exif.bitspersample).to eql '8 8 8 8'
+        expect(assembly_image).to be_a_valid_image
+        expect(assembly_image).to be_jp2able
+        expect(assembly_image).to have_color_profile
+        result = assembly_image.create_jp2(output: jp2_output_file)
+        expect(result).to be_a_kind_of described_class
+        expect(result.path).to eq jp2_output_file
+        expect(jp2_output_file).to be_a_jp2
+        # note, we verify the CMYK has been converted to an SRGB JP2 correctly by using ruby-vips instead of exif, since exif does not correctly
+        #  identify the color space...note: this line current does not work in circleci, potentially due to libvips version differences
+        expect(Vips::Image.new_from_file(jp2_output_file).get_value('interpretation')).to eq :srgb
+      end
+    end
+
     context 'when the source image has no profile' do
+      let(:input_path) { File.join(TEST_INPUT_DIR, 'no_profile.tif') }
+
       before do
-        generate_test_image(TEST_TIF_INPUT_FILE, profile: '') # generate a test input with no profile
+        generate_test_image(input_path)
       end
 
       it 'creates a jp2' do
-        expect(File).to exist TEST_TIF_INPUT_FILE
-        expect(File).not_to exist TEST_JP2_OUTPUT_FILE
+        expect(File).to exist input_path
+        expect(File).not_to exist jp2_output_file
+        expect(assembly_image.exif.samplesperpixel).to be 3
+        expect(assembly_image.exif.bitspersample).to eql '8 8 8'
         expect(assembly_image).not_to have_color_profile
         expect(assembly_image).to be_a_valid_image
         expect(assembly_image).to be_jp2able
-        assembly_image.create_jp2(output: TEST_JP2_OUTPUT_FILE)
-        expect(TEST_JP2_OUTPUT_FILE).to be_a_jp2
+        assembly_image.create_jp2(output: jp2_output_file)
+        expect(jp2_output_file).to be_a_jp2
       end
     end
 
     context "when the output file exists and you don't allow overwriting" do
       before do
-        generate_test_image(TEST_TIF_INPUT_FILE)
-        generate_test_image(TEST_JP2_OUTPUT_FILE)
+        generate_test_image(input_path)
+        FileUtils.touch(jp2_output_file) # just need a file with this name, don't care what
       end
 
       it 'does not run' do
-        expect(File).to exist TEST_TIF_INPUT_FILE
-        expect(File).to exist TEST_JP2_OUTPUT_FILE
-        expect { assembly_image.create_jp2(output: TEST_JP2_OUTPUT_FILE) }.to raise_error(SecurityError)
+        expect(File).to exist input_path
+        expect(File).to exist jp2_output_file
+        expect { assembly_image.create_jp2(output: jp2_output_file) }.to raise_error(SecurityError)
       end
     end
 
     context 'when given a test tiff' do
       before do
-        generate_test_image(TEST_TIF_INPUT_FILE)
+        generate_test_image(input_path)
       end
 
       it 'gets the correct image height and width' do
-        expect(assembly_image.height).to eq 100
-        expect(assembly_image.width).to eq 100
+        expect(assembly_image.height).to eq 36
+        expect(assembly_image.width).to eq 43
       end
     end
 
     context 'when the input file is a jp2' do
       before do
-        generate_test_image(TEST_TIF_INPUT_FILE, profile: '') # generate a test input with no profile
+        generate_test_image(input_path)
       end
 
       it 'does not run' do
-        expect(File).to exist TEST_TIF_INPUT_FILE
-        expect(File).not_to exist TEST_JP2_OUTPUT_FILE
+        expect(File).to exist input_path
+        expect(File).not_to exist jp2_output_file
         expect(assembly_image).not_to have_color_profile
         expect(assembly_image).to be_a_valid_image
         expect(assembly_image).to be_jp2able
-        assembly_image.create_jp2(output: TEST_JP2_OUTPUT_FILE)
-        expect(TEST_JP2_OUTPUT_FILE).to be_a_jp2
-        jp2_file = described_class.new(TEST_JP2_OUTPUT_FILE)
+        assembly_image.create_jp2(output: jp2_output_file)
+        expect(jp2_output_file).to be_a_jp2
+        jp2_file = described_class.new(jp2_output_file)
         expect(jp2_file).to be_valid_image
         expect(jp2_file).not_to be_jp2able
-        expect { jp2_file.create_jp2 }.to raise_error
+        expect { jp2_file.create_jp2 }.to raise_error(RuntimeError)
       end
     end
 
     context 'when you specify a bogus output profile' do
       before do
-        generate_test_image(TEST_TIF_INPUT_FILE)
+        generate_test_image(input_path)
       end
 
       it 'runs, because this is not currently an option' do
-        expect(File).to exist TEST_TIF_INPUT_FILE
+        expect(File).to exist input_path
         result = assembly_image.create_jp2(output_profile: 'bogusness')
         expect(result).to be_a_kind_of described_class
         expect(result.path).to eq TEST_JP2_INPUT_FILE
@@ -239,17 +284,17 @@ RSpec.describe Assembly::Image do
         bogus_folder = '/crapsticks'
         expect(File).to exist TEST_JPEG_INPUT_FILE
         expect(File).not_to exist bogus_folder
-        expect { assembly_image.create_jp2(tmp_folder: bogus_folder) }.to raise_error
+        expect { assembly_image.create_jp2(tmp_folder: bogus_folder) }.to raise_error(RuntimeError)
       end
     end
 
     context 'when no output file is specified' do
       before do
-        generate_test_image(TEST_TIF_INPUT_FILE)
+        generate_test_image(input_path)
       end
 
       it 'creates a jp2 of the same filename and in the same location as the input and cleans up the tmp file' do
-        expect(File).to exist TEST_TIF_INPUT_FILE
+        expect(File).to exist input_path
         expect(File.exist?(TEST_JP2_INPUT_FILE)).to be false
         result = assembly_image.create_jp2
         expect(result).to be_a_kind_of described_class
@@ -261,17 +306,17 @@ RSpec.describe Assembly::Image do
 
     context 'when the output file exists and you allow overwriting' do
       before do
-        generate_test_image(TEST_TIF_INPUT_FILE)
-        generate_test_image(TEST_JP2_OUTPUT_FILE)
+        generate_test_image(input_path)
+        FileUtils.touch(jp2_output_file) # just need a file with this name, don't care what
       end
 
       it 'recreates jp2' do
-        expect(File).to exist TEST_TIF_INPUT_FILE
-        expect(File).to exist TEST_JP2_OUTPUT_FILE
-        result = assembly_image.create_jp2(output: TEST_JP2_OUTPUT_FILE, overwrite: true)
+        expect(File).to exist input_path
+        expect(File).to exist jp2_output_file
+        result = assembly_image.create_jp2(output: jp2_output_file, overwrite: true)
         expect(result).to be_a_kind_of described_class
-        expect(result.path).to eq TEST_JP2_OUTPUT_FILE
-        expect(TEST_JP2_OUTPUT_FILE).to be_a_jp2
+        expect(result.path).to eq jp2_output_file
+        expect(jp2_output_file).to be_a_jp2
         expect(result.exif.colorspace).to eq 'sRGB'
       end
     end

data/spec/images_spec.rb

@@ -3,45 +3,45 @@
 require 'spec_helper'
 
 RSpec.describe Assembly::Images do
-  after do
-    # after each test, empty out the input and output test directories
-    remove_files(TEST_INPUT_DIR)
-    remove_files(TEST_OUTPUT_DIR)
+  before { cleanup }
+
+  describe '#batch_generate_jp2' do
+    it 'does not run if no input folder is passed in' do
+      expect{ described_class.batch_generate_jp2('') }.to raise_error(RuntimeError)
+    end
+
+    it 'does not run if a non-existent input folder is passed in' do
+      expect{ described_class.batch_generate_jp2('/junk/path') }.to raise_error(RuntimeError)
+    end
+
+    it 'runs and batch produces jp2s from input tiffs' do
+      ['test1', 'test2', 'test3'].each { |image| generate_test_image(File.join(TEST_INPUT_DIR, "#{image}.tif"), profile: 'AdobeRGB1998') }
+      described_class.batch_generate_jp2(TEST_INPUT_DIR, output: TEST_OUTPUT_DIR)
+      expect(File.directory?(TEST_OUTPUT_DIR)).to be true
+      ['test1', 'test2', 'test3'].each { |image| expect(File.join(TEST_OUTPUT_DIR, "#{image}.jp2")).to be_a_jp2 }
+    end
   end
 
-  it 'does not run if no input folder is passed in' do
-    expect{ described_class.batch_generate_jp2('') }.to raise_error
-  end
-
-  it 'does not run if a non-existent input folder is passed in' do
-    expect{ described_class.batch_generate_jp2('/junk/path') }.to raise_error
-  end
-
-  it 'runs and batch produces jp2s from input tiffs' do
-    ['test1', 'test2', 'test3'].each { |image| generate_test_image(File.join(TEST_INPUT_DIR, "#{image}.tif")) }
-    described_class.batch_generate_jp2(TEST_INPUT_DIR, output: TEST_OUTPUT_DIR)
-    expect(File.directory?(TEST_OUTPUT_DIR)).to be true
-    ['test1', 'test2', 'test3'].each { |image| expect(File.join(TEST_OUTPUT_DIR, "#{image}.jp2")).to be_a_jp2 }
-  end
-
-  it 'runs and batch add color profile descriptions input tiffs with no color profile descriptions' do
-    ['test1', 'test2', 'test3'].each { |image| generate_test_image(File.join(TEST_INPUT_DIR, "#{image}.tif"), profile: '') }
-    ['test1', 'test2', 'test3'].each { |image| expect(Assembly::Image.new(File.join(TEST_INPUT_DIR, "#{image}.tif")).exif.profiledescription).to be_nil }
-    described_class.batch_add_exif_profile_descr(TEST_INPUT_DIR, 'Adobe RGB 1998')
-    ['test1', 'test2', 'test3'].each { |image| expect(Assembly::Image.new(File.join(TEST_INPUT_DIR, "#{image}.tif")).exif.profiledescription).to eq 'Adobe RGB (1998)' }
-  end
-
-  it 'runs and batch add color profile descriptions input tiffs, forcing over existing color profile descriptions' do
-    ['test1', 'test2', 'test3'].each { |image| generate_test_image(File.join(TEST_INPUT_DIR, "#{image}.tif")) }
-    ['test1', 'test2', 'test3'].each { |image| expect(Assembly::Image.new(File.join(TEST_INPUT_DIR, "#{image}.tif")).exif.profiledescription).to eq 'sRGB IEC61966-2.1' }
-    described_class.batch_add_exif_profile_descr(TEST_INPUT_DIR, 'Adobe RGB 1998', force: true) # force overwrite
-    ['test1', 'test2', 'test3'].each { |image| expect(Assembly::Image.new(File.join(TEST_INPUT_DIR, "#{image}.tif")).exif.profiledescription).to eq 'Adobe RGB (1998)' }
-  end
-
-  it 'runs and batch add color profile descriptions input tiffs, not overwriting existing color profile descriptions' do
-    ['test1', 'test2', 'test3'].each { |image| generate_test_image(File.join(TEST_INPUT_DIR, "#{image}.tif")) }
-    ['test1', 'test2', 'test3'].each { |image| expect(Assembly::Image.new(File.join(TEST_INPUT_DIR, "#{image}.tif")).exif.profiledescription).to eq 'sRGB IEC61966-2.1' }
-    described_class.batch_add_exif_profile_descr(TEST_INPUT_DIR, 'Adobe RGB 1998') # do not force overwrite
-    ['test1', 'test2', 'test3'].each { |image| expect(Assembly::Image.new(File.join(TEST_INPUT_DIR, "#{image}.tif")).exif.profiledescription).to eq 'sRGB IEC61966-2.1' }
+  describe '#batch_add_exif_profile_descr' do
+    it 'runs and batch adds color profile descriptions to input tiffs that had no color profile descriptions' do
+      ['test1', 'test2', 'test3'].each { |image| generate_test_image(File.join(TEST_INPUT_DIR, "#{image}.tif")) }
+      ['test1', 'test2', 'test3'].each { |image| expect(Assembly::Image.new(File.join(TEST_INPUT_DIR, "#{image}.tif")).exif.profiledescription).to be_nil }
+      described_class.batch_add_exif_profile_descr(TEST_INPUT_DIR, 'Adobe RGB 1998')
+      ['test1', 'test2', 'test3'].each { |image| expect(Assembly::Image.new(File.join(TEST_INPUT_DIR, "#{image}.tif")).exif.profiledescription).to eq 'Adobe RGB (1998)' }
+    end
+
+    it 'runs and batch adds color profile descriptions to input tiffs, forcing over existing color profile descriptions' do
+      ['test1', 'test2', 'test3'].each { |image| generate_test_image(File.join(TEST_INPUT_DIR, "#{image}.tif"), profile: 'sRGBIEC6196621') }
+      ['test1', 'test2', 'test3'].each { |image| expect(Assembly::Image.new(File.join(TEST_INPUT_DIR, "#{image}.tif")).exif.profiledescription).to eq 'sRGB IEC61966-2.1' }
+      described_class.batch_add_exif_profile_descr(TEST_INPUT_DIR, 'Adobe RGB 1998', force: true) # force overwrite
+      ['test1', 'test2', 'test3'].each { |image| expect(Assembly::Image.new(File.join(TEST_INPUT_DIR, "#{image}.tif")).exif.profiledescription).to eq 'Adobe RGB (1998)' }
+    end
+
+    it 'runs and batch adds color profile descriptions to input tiffs, not overwriting existing color profile descriptions' do
+      ['test1', 'test2', 'test3'].each { |image| generate_test_image(File.join(TEST_INPUT_DIR, "#{image}.tif"), profile: 'sRGBIEC6196621') }
+      ['test1', 'test2', 'test3'].each { |image| expect(Assembly::Image.new(File.join(TEST_INPUT_DIR, "#{image}.tif")).exif.profiledescription).to eq 'sRGB IEC61966-2.1' }
+      described_class.batch_add_exif_profile_descr(TEST_INPUT_DIR, 'Adobe RGB 1998') # do not force overwrite
+      ['test1', 'test2', 'test3'].each { |image| expect(Assembly::Image.new(File.join(TEST_INPUT_DIR, "#{image}.tif")).exif.profiledescription).to eq 'sRGB IEC61966-2.1' }
+    end
   end
 end

data/spec/spec_helper.rb

@@ -7,14 +7,17 @@ end
 
 bootfile = File.expand_path(File.dirname(__FILE__) + '/../config/boot')
 require bootfile
+require 'ruby-vips'
+require 'pry-byebug'
 
 TEST_INPUT_DIR       = File.join(Assembly::PATH_TO_IMAGE_GEM, 'spec', 'test_data', 'input')
 TEST_OUTPUT_DIR      = File.join(Assembly::PATH_TO_IMAGE_GEM, 'spec', 'test_data', 'output')
 TEST_TIF_INPUT_FILE  = File.join(TEST_INPUT_DIR, 'test.tif')
-TEST_DPG_TIF_INPUT_FILE = File.join(TEST_INPUT_DIR, 'oo000oo0001_00_01.tif')
 TEST_JPEG_INPUT_FILE = File.join(TEST_INPUT_DIR, 'test.jpg')
 TEST_JP2_INPUT_FILE  = File.join(TEST_INPUT_DIR, 'test.jp2')
 TEST_JP2_OUTPUT_FILE = File.join(TEST_OUTPUT_DIR, 'test.jp2')
+TEST_PROFILE_DIR     = File.join(Assembly::PATH_TO_IMAGE_GEM, 'profiles')
+TEST_DATA_DIR        = File.join(Assembly::PATH_TO_IMAGE_GEM, 'spec', 'test_data')
 TEST_DRUID           = 'nx288wh8889'
 
 RSpec.configure do |config|
@@ -101,31 +104,131 @@ RSpec.configure do |config|
   Kernel.srand config.seed
 end
 
+# rubocop:disable Metrics/MethodLength
+# Color values for 30-patch ColorGauge color target.
+def color_gauge_values(type = 'adobeRGB')
+  # rubocop:disable Layout/SpaceInsideArrayLiteralBrackets
+  # rubocop:disable Layout/ExtraSpacing
+  adobe_rgb = [
+    [109,  83,  71],  [187, 146, 129], [101, 120, 151], [ 97, 108,  68], [130, 128, 172],
+    [130, 187, 171],  [ 64, 134, 165], [241, 242, 237], [231, 232, 229], [216, 217, 215],
+    [203, 204, 203],  [202, 125,  55], [172,  87, 147], [174, 176, 175], [148, 150, 149],
+    [116, 119, 118],  [ 91,  91,  92], [ 78,  92, 165], [227, 198,  55], [ 68,  70,  69],
+    [ 48,  48,  48],  [ 32,  32,  32], [ 23,  23,  23], [175,  85,  97], [157,  60,  61],
+    [100, 148,  80],  [ 53,  67, 141], [213, 160,  56], [167, 187,  77], [ 86,  61, 100]
+  ]
+
+  srgb = [
+    [118,  82,  69], [202, 147, 129], [ 92, 121, 154], [ 92, 109,  64], [132, 129, 175],
+    [ 96, 188, 172], [  0, 135, 168], [241, 242, 237], [231, 232, 229], [217, 218, 216],
+    [204, 205, 204], [225, 126,  46], [196,  86, 150], [175, 178, 177], [148, 151, 150],
+    [116, 120, 119], [ 91,  91,  92], [ 70,  92, 169], [238, 199,  27], [ 65,  68,  67],
+    [ 44,  44,  44], [ 26,  26,  26], [ 16,  16,  16], [200,  84,  97], [181,  57,  58],
+    [ 68, 149,  74], [ 42,  65, 145], [231, 161,  41], [160, 188,  65], [ 94,  58, 101]
+  ]
+
+  cmyk = [
+    [120, 154, 169,  84], [ 69, 110, 120,   5], [169, 125,  64,   8], [154, 105, 207,  64],
+    [138, 125,  31,   0], [128,  26,  95,   0], [195,  95,  61,   3], [ 10,   5, 13,    0],
+    [ 20,  13,  18,   0], [ 36,  26,  31,   0], [ 51,  38,  41,   0], [ 46, 143, 236,   8],
+    [ 90, 202,  31,   0], [ 84,  64,  69,   0], [115,  90,  95,   0], [143, 115, 120,  28],
+    [161, 141, 136,  69], [205, 182,   8,   0], [ 33,  46, 238,   0], [172, 151, 151, 110],
+    [179, 164, 161, 156], [184, 169, 166, 189], [187, 172, 166, 205], [ 69, 197, 131,  20],
+    [ 69, 220, 189,  51], [161,  59, 223,  15], [241, 223,  28,   5], [ 44,  95, 238,   3],
+    [100,  31, 228,   0], [184, 210,  90,  56]
+  ]
+  # rubocop:enable Layout/SpaceInsideArrayLiteralBrackets
+  # rubocop:enable Layout/ExtraSpacing
+  case type
+  when 'adobe_rgb'
+    adobe_rgb
+  when 'srgb'
+    srgb
+  when 'cmyk'
+    cmyk
+  else
+    raise 'Unknown color_gauge_values type.'
+  end
+end
+# rubocop:enable Metrics/MethodLength
+
 # generate a sample image file with a specified profile
 # rubocop:disable Metrics/AbcSize
 # rubocop:disable Metrics/CyclomaticComplexity
 # rubocop:disable Metrics/MethodLength
 # rubocop:disable Metrics/PerceivedComplexity
 def generate_test_image(file, params = {})
-  width = params[:width] || '100'
-  height = params[:height] || '100'
-  color = params[:color] || 'TrueColor'
-  profile = params[:profile] || 'sRGBIEC6196621'
-  image_type = params[:image_type]
-  create_command = "convert rose: -scale #{width}x#{height}\! -type #{color} "
-  create_command += ' -profile ' + File.join(Assembly::PATH_TO_IMAGE_GEM, 'profiles', profile + '.icc') + ' ' unless profile == ''
-  create_command += " -type #{image_type} " if image_type
-  create_command += ' -compress lzw ' if params[:compress]
-  create_command += file
-  create_command += ' 2>&1'
-  output = `#{create_command}`
-  raise "Failed to create test image #{file} (#{params}): \n#{output}" unless $CHILD_STATUS.success?
+  # Set default size for sample test image.
+  line_size = 1
+  box_size = 6
+  width = (box_size * 6) + (line_size * 7)
+  height = (box_size * 5) + (line_size * 6)
+
+  # Set parameters for image creation options.
+  image_type  = params[:image_type] || File.extname(file)
+  bands       = params[:bands] || 3
+  color       = params[:color] || 'rgb'
+  depth       = params[:depth] || 8
+  cg_type     = params[:cg_type] || 'adobe_rgb'
+  compression = params[:compression]
+  profile     = params[:profile]
+
+  temp_array = color_gauge_values(cg_type)
+  temp_image = Vips::Image.black(width, height, bands: temp_array.first.size)
+  (0..4).each do |i|
+    b = (box_size * i) + (line_size * (i + 1))
+    # d = b + box_size - line_size
+    (0...6).each do |j|
+      a = (box_size * j) + (line_size * (j + 1))
+      # c = a + box_size - line_size
+      colors = temp_array.shift
+      temp_image = temp_image.draw_rect(colors, a, b, box_size, box_size, fill: true)
+    end
+  end
+
+  temp_image = color.eql?('cmyk') ? temp_image.copy(interpretation: :cmyk) : temp_image.copy(interpretation: :srgb)
+
+  temp_image = if color.eql?('grey') && bands == 3
+                 mean = temp_image.bandmean
+                 Vips::Image.bandjoin([mean, mean, mean])
+               elsif color.eql?('grey') && bands == 1
+                 temp_image.bandmean
+               elsif color.eql?('bin') && bands == 3
+                 mean = temp_image.bandmean < 128
+                 Vips::Image.bandjoin([mean, mean, mean])
+               elsif color.eql?('bin') && bands == 1
+                 temp_image.bandmean < 128
+               else
+                 temp_image
+               end
+
+  options = {}
+  unless profile.nil?
+    profile_file = File.join(TEST_PROFILE_DIR, profile + '.icc')
+    options.merge!(profile: profile_file)
+  end
+
+  case image_type
+  when '.tiff', '.tif'
+    options.merge!(compression: compression) unless compression.nil?
+    options.merge!(squash: true) if depth.eql?(1)
+    temp_image.tiffsave(file, **options)
+  when '.jpeg', '.jpg'
+    temp_image.jpegsave(file, **options)
+  else
+    raise "unknown type: #{image_type}"
+  end
 end
 # rubocop:enable Metrics/AbcSize
 # rubocop:enable Metrics/CyclomaticComplexity
 # rubocop:enable Metrics/MethodLength
 # rubocop:enable Metrics/PerceivedComplexity
 
+def cleanup
+  remove_files(TEST_INPUT_DIR)
+  remove_files(TEST_OUTPUT_DIR)
+end
+
 def remove_files(dir)
   Dir.foreach(dir) do |f|
     fn = File.join(dir, f)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: assembly-image
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Peter Mangiafico
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-15 00:00:00.000000000 Z
+date: 2022-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: assembly-objectfile
@@ -47,6 +47,34 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: ruby-vips
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -152,7 +180,6 @@ files:
 - Rakefile
 - assembly-image.gemspec
 - bin/console
-- bin/run_all_tests
 - config/boot.rb
 - lib/assembly-image.rb
 - lib/assembly-image/image.rb
@@ -160,11 +187,20 @@ files:
 - lib/assembly-image/jp2_creator.rb
 - profiles/AdobeRGB1998.icc
 - profiles/DotGain20.icc
+- profiles/cmyk.icc
 - profiles/sRGBIEC6196621.icc
 - spec/assembly/image/jp2_creator_spec.rb
 - spec/image_spec.rb
 - spec/images_spec.rb
 - spec/spec_helper.rb
+- spec/test_data/color_cmyk_tagged.tif
+- spec/test_data/color_cmyk_untagged.tif
+- spec/test_data/color_rgb_adobergb1998_lzw.tif
+- spec/test_data/color_rgb_srgb.jpg
+- spec/test_data/color_rgb_srgb.tif
+- spec/test_data/color_rgb_srgb_rot90cw.tif
+- spec/test_data/color_rgb_untagged.tif
+- spec/test_data/gray_gray_untagged.tif
 - spec/test_data/input/.empty
 - spec/test_data/output/.empty
 homepage: ''
@@ -191,10 +227,4 @@ signing_key:
 specification_version: 4
 summary: Ruby immplementation of image services needed to prepare objects to be accessioned
   in SULAIR digital library
-test_files:
-- spec/assembly/image/jp2_creator_spec.rb
-- spec/image_spec.rb
-- spec/images_spec.rb
-- spec/spec_helper.rb
-- spec/test_data/input/.empty
-- spec/test_data/output/.empty
+test_files: []

data/bin/run_all_tests

@@ -1,3 +0,0 @@
-#! /bin/bash
-
-bundle exec rspec spec