assembly-image 1.7.8 → 2.0.0

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.7.8
+  version: 2.0.0
 platform: ruby
 authors:
 - Peter Mangiafico
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-03 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,20 +180,27 @@ files:
 - Rakefile
 - assembly-image.gemspec
 - bin/console
-- bin/run_all_tests
 - config/boot.rb
 - lib/assembly-image.rb
 - lib/assembly-image/image.rb
 - lib/assembly-image/images.rb
 - lib/assembly-image/jp2_creator.rb
-- lib/assembly-image/version.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: ''
@@ -192,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

data/lib/assembly-image/version.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-# Main Assembly namespace
-module Assembly
-  # Main Image class
-  class Image
-    # Gem version
-    VERSION = '1.7.8'
-  end
-end