assembly-image 1.7.2 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0b63b27dda9ccf5d4c74eb214ac9dfff972bb673093635c9c632ddd25ffab79
-  data.tar.gz: dee6b84e12ec865880d25a1fc1a6c9e75c18fea2ff1350c480590194bf8e55a1
+  metadata.gz: de2f277539baa6ffa387830338c620b57a8af08b43a47663641d5371fe0b2d63
+  data.tar.gz: c136a6686eafa49d3d7bf306027c5c47084e7a5bdcba5280616577b71630e9a0
 SHA512:
-  metadata.gz: 238d3b962f51abce27d957a067d8b5bbcb8976d01238b379ff4e09fd6c2ece55c9c5b5eb01150c156772438b1df150da0c7f7034260429793034fc006e3ee64c
-  data.tar.gz: 6c85b10c1951aca3fb67af588eecb19577171596c9e86f353f7f16fa15a8750ad162bc498c598be2fe5902389f7d88059b20436a3ae69a4edd6ba62911b7b651
+  metadata.gz: 30e6572883cc77167e8f1ee1592e87e3d96e3ae72af80d778e85fcb6a97a36307881ea9116e0ec2cd1a1356248449132e55dbfdc65c83fc749daa5b514fdbe20
+  data.tar.gz: 61cd917ee3658cc6d329d8e5046f0cdd9434bcfec3d607d553e754120d7094256c2e36fab611f348e5faaa00703cb1a44f354c9656ec68cda8da11a9414310e9

data/README.md

@@ -50,7 +50,8 @@ perform image operations necessary for accessioning of content.
 * 1.6.5 fix problem with lack of extension in incoming tif causing a problem when creating jp2
 * 1.6.7 release to github/rubygems
 * 1.6.9 update mini_exiftool
-* 1.7.1 for jp2, only transcode to tiff if not a tiff 
+* 1.7.1 for jp2, only transcode to tiff if not a tiff
+* 1.7.3 for jp2, only transcode to tiff if not an uncompressed tiff 
 
 ## Notes
 

data/lib/assembly-image/image.rb

@@ -54,6 +54,17 @@ module Assembly
       exif.imagewidth
     end
 
+    # Examines the input image to determine if it is compressed.
+    #
+    # @return [boolean] true if image is compressed, false if not.
+    #
+    # Example:
+    #   source_img=Assembly::ObjectFile.new('/input/path_to_file.tif')
+    #   puts source_img.compressed? # gives true
+    def compressed?
+      exif.compression != 'Uncompressed'
+    end
+
     # Add an exif color profile descriptions to the image.
     # This is useful if your source TIFFs do not have color profile descriptions in the EXIF data, but you know what it should be.
     # This will allow the images to pass the validaty check and have JP2s created successfully.
@@ -118,12 +129,13 @@ module Assembly
     #   puts derivative_image.path # '/input/path_to_file.jp2'
     # rubocop:disable Metrics/AbcSize
     # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Metrics/CyclomaticComplexity:
     def create_jp2(params = {})
       output = params[:output] || jp2_filename
       create_jp2_checks(output: output, overwrite: params[:overwrite])
 
       # Using instance variable so that can check in tests.
-      source_path = if mimetype != 'image/tiff'
+      source_path = if create_temp_tiff?
                       @tmp_path = make_tmp_tiff(tmp_folder: params[:tmp_folder])
                     else
                       @path
@@ -143,7 +155,10 @@ module Assembly
 
     private
 
-    # rubocop:disable Metrics/CyclomaticComplexity
+    def create_temp_tiff?
+      mimetype != 'image/tiff' || compressed?
+    end
+
     def create_jp2_checks(output:, overwrite:)
       check_for_file
       raise 'input file is not a valid image, or is the wrong mimetype' unless jp2able?

data/lib/assembly-image/version.rb

@@ -5,6 +5,6 @@ module Assembly
   # Main Image class
   class Image
     # Project version number
-    VERSION = '1.7.2'
+    VERSION = '1.7.3'
   end
 end

data/spec/image_spec.rb

@@ -4,32 +4,32 @@ require 'spec_helper'
 
 # rubocop:disable Metrics/BlockLength
 describe Assembly::Image do
-  it 'should not run if no input file is passed in' do
+  it 'does not run if no input file is passed in' do
     @ai = Assembly::Image.new('')
     expect{ @ai.create_jp2 }.to raise_error
   end
 
-  it 'should indicate the default jp2 filename' do
+  it 'indicates the default jp2 filename' do
     @ai = Assembly::Image.new(TEST_TIF_INPUT_FILE)
     expect(@ai.jp2_filename).to eq TEST_TIF_INPUT_FILE.gsub('.tif', '.jp2')
   end
 
-  it 'should indicate the default jp2 filename' do
+  it 'indicates the default jp2 filename' do
     @ai = Assembly::Image.new('/path/to/a/file_with_no_extension')
     expect(@ai.jp2_filename).to eq '/path/to/a/file_with_no_extension.jp2'
   end
 
-  it 'should indicate the default DPG jp2 filename' do
+  it 'indicates the default DPG jp2 filename' do
     @ai = Assembly::Image.new(TEST_DPG_TIF_INPUT_FILE)
     expect(@ai.dpg_jp2_filename).to eq TEST_DPG_TIF_INPUT_FILE.gsub('.tif', '.jp2').gsub('_00_', '_05_')
   end
 
-  it 'should indicate the default jp2 filename' do
+  it 'indicates the default jp2 filename' do
     @ai = Assembly::Image.new('/path/to/a/file_with_no_00_extension')
     expect(@ai.dpg_jp2_filename).to eq '/path/to/a/file_with_no_05_extension.jp2'
   end
 
-  it 'should create jp2 when given an RGB tif' do
+  it 'creates the jp2 without a temp file when given an uncompressed RGB tif' do
     generate_test_image(TEST_TIF_INPUT_FILE)
     expect(File).to exist TEST_TIF_INPUT_FILE
     expect(File).to_not exist TEST_JP2_OUTPUT_FILE
@@ -46,7 +46,24 @@ describe Assembly::Image do
     expect(@jp2.width).to eq 100
   end
 
-  it 'should create grayscale jp2 when given a bitonal tif' do
+  it 'creates the jp2 with a temp file when given a compressed RGB tif' do
+    generate_test_image(TEST_TIF_INPUT_FILE, compress: true)
+    expect(File).to exist TEST_TIF_INPUT_FILE
+    expect(File).to_not exist TEST_JP2_OUTPUT_FILE
+    @ai = Assembly::Image.new(TEST_TIF_INPUT_FILE)
+    result = @ai.create_jp2(output: TEST_JP2_OUTPUT_FILE)
+    # Indicates a temp tiff was not created.
+    expect(@ai.tmp_path).to_not be_nil
+    expect(result).to be_a_kind_of Assembly::Image
+    expect(result.path).to eq TEST_JP2_OUTPUT_FILE
+    expect(TEST_JP2_OUTPUT_FILE).to be_a_jp2
+    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
+  end
+
+  it 'creates grayscale jp2 when given a bitonal tif' do
     skip 'The latest version of Kakadu may require some changes for this work correctly'
     # error message is
     #  JP2 creation command failed: kdu_compress   -precise -no_weights -quiet Creversible=no Cmodes=BYPASS
@@ -70,7 +87,7 @@ describe Assembly::Image do
     expect(result.exif.colorspace).to eq 'Grayscale'
   end
 
-  it 'should create color jp2 when given a color tif but bitonal image data (1 channels and 1 bits per pixel)' do
+  it 'creates color jp2 when given a color tif but bitonal image data (1 channels and 1 bits per pixel)' do
     generate_test_image(TEST_TIF_INPUT_FILE, color: 'white', image_type: 'TrueColor', profile: '')
     expect(File).to exist TEST_TIF_INPUT_FILE
     expect(File).to_not exist TEST_JP2_OUTPUT_FILE
@@ -83,7 +100,7 @@ describe Assembly::Image do
     expect(result.exif.colorspace).to eq 'sRGB'
   end
 
-  it 'should create grayscale jp2 when given a graycale tif but with bitonal image data (1 channel and 1 bits per pixel)' do
+  it 'creates grayscale jp2 when given a graycale tif but with bitonal image data (1 channel and 1 bits per pixel)' do
     generate_test_image(TEST_TIF_INPUT_FILE, color: 'white', image_type: 'Grayscale', profile: '')
     expect(File).to exist TEST_TIF_INPUT_FILE
     expect(File).to_not exist TEST_JP2_OUTPUT_FILE
@@ -96,7 +113,7 @@ describe Assembly::Image do
     expect(result.exif.colorspace).to eq 'Grayscale'
   end
 
-  it 'should create color jp2 when given a color tif but with greyscale image data (1 channel and 8 bits per pixel)' do
+  it 'creates color jp2 when given a color tif but with greyscale image data (1 channel and 8 bits per pixel)' do
     generate_test_image(TEST_TIF_INPUT_FILE, color: 'gray', image_type: 'TrueColor', profile: '')
     expect(File).to exist TEST_TIF_INPUT_FILE
     expect(File).to_not exist TEST_JP2_OUTPUT_FILE
@@ -109,7 +126,7 @@ describe Assembly::Image do
     expect(result.exif.colorspace).to eq 'sRGB'
   end
 
-  it 'should create a jp2 when the source image has no profile' do
+  it 'creates a jp2 when the source image has no profile' do
     generate_test_image(TEST_TIF_INPUT_FILE, profile: '') # generate a test input with no profile
     expect(File).to exist TEST_TIF_INPUT_FILE
     expect(File).to_not exist TEST_JP2_OUTPUT_FILE
@@ -123,7 +140,7 @@ describe Assembly::Image do
     expect(TEST_JP2_OUTPUT_FILE).to be_a_jp2
   end
 
-  it "should not run if the output file exists and you don't allow overwriting" do
+  it "does not run if the output file exists and you don't allow overwriting" do
     generate_test_image(TEST_TIF_INPUT_FILE)
     generate_test_image(TEST_JP2_OUTPUT_FILE)
     expect(File).to exist TEST_TIF_INPUT_FILE
@@ -132,14 +149,14 @@ describe Assembly::Image do
     expect{ @ai.create_jp2(output: TEST_JP2_OUTPUT_FILE) }.to raise_error(SecurityError)
   end
 
-  it 'should get the correct image height and width' do
+  it 'gets the correct image height and width' do
     generate_test_image(TEST_TIF_INPUT_FILE)
     @ai = Assembly::Image.new(TEST_TIF_INPUT_FILE)
     expect(@ai.height).to eq 100
     expect(@ai.width).to eq 100
   end
 
-  it 'should not run if the input file is a jp2' do
+  it 'does not run if the input file is a jp2' do
     generate_test_image(TEST_JP2_OUTPUT_FILE)
     expect(File).to exist TEST_JP2_OUTPUT_FILE
     @ai = Assembly::Image.new(TEST_JP2_OUTPUT_FILE)
@@ -148,7 +165,7 @@ describe Assembly::Image do
     expect { @ai.create_jp2 }.to raise_error
   end
 
-  it 'should run if you specify a bogus output profile, because this is not currently an option' do
+  it 'runs if you specify a bogus output profile, because this is not currently an option' do
     generate_test_image(TEST_TIF_INPUT_FILE)
     expect(File).to exist TEST_TIF_INPUT_FILE
     @ai = Assembly::Image.new(TEST_TIF_INPUT_FILE)
@@ -159,7 +176,7 @@ describe Assembly::Image do
     expect(result.exif.colorspace).to eq 'sRGB'
   end
 
-  it 'should create jp2 when given a JPEG' do
+  it 'creates jp2 when given a JPEG' do
     generate_test_image(TEST_JPEG_INPUT_FILE)
     expect(File).to exist TEST_JPEG_INPUT_FILE
     expect(File).to_not exist TEST_JP2_OUTPUT_FILE
@@ -173,7 +190,7 @@ describe Assembly::Image do
     expect(TEST_JP2_OUTPUT_FILE).to be_a_jp2
   end
 
-  it 'should not run if you specify a bogus tmp folder' do
+  it 'does not run if you specify a bogus tmp folder' do
     generate_test_image(TEST_JPEG_INPUT_FILE)
     bogus_folder = '/crapsticks'
     expect(File).to exist TEST_JPEG_INPUT_FILE
@@ -182,7 +199,7 @@ describe Assembly::Image do
     expect { @ai.create_jp2(tmp_folder: bogus_folder) }.to raise_error
   end
 
-  it 'should create a jp2 and preserve the temporary file if specified' do
+  it 'creates a jp2 and preserve the temporary file if specified' do
     generate_test_image(TEST_JPEG_INPUT_FILE)
     expect(File).to exist TEST_JPEG_INPUT_FILE
     @ai = Assembly::Image.new(TEST_JPEG_INPUT_FILE)
@@ -196,7 +213,7 @@ describe Assembly::Image do
     expect(File.exist?(@ai.tmp_path)).to be true
   end
 
-  it 'should create jp2 of the same filename and in the same location as the input if no output file is specified, and should cleanup tmp file' do
+  it 'creates a jp2 of the same filename and in the same location as the input if no output file is specified, and should cleanup tmp file' do
     generate_test_image(TEST_TIF_INPUT_FILE)
     expect(File).to exist TEST_TIF_INPUT_FILE
     expect(File.exist?(TEST_JP2_INPUT_FILE)).to be false
@@ -209,7 +226,7 @@ describe Assembly::Image do
     expect(@ai.tmp_path).to be_nil
   end
 
-  it 'should recreate jp2 if the output file exists and if you allow overwriting' do
+  it 'recreates jp2 if the output file exists and if you allow overwriting' do
     generate_test_image(TEST_TIF_INPUT_FILE)
     generate_test_image(TEST_JP2_OUTPUT_FILE)
     expect(File).to exist TEST_TIF_INPUT_FILE

data/spec/spec_helper.rb

@@ -15,6 +15,8 @@ TEST_DRUID           = 'nx288wh8889'
 
 # generate a sample image file with a specified profile
 # rubocop:disable Metrics/AbcSize
+# rubocop:disable Metrics/CyclomaticComplexity
+# rubocop:disable Metrics/MethodLength
 def generate_test_image(file, params = {})
   color = params[:color] || 'red'
   profile = params[:profile] || 'sRGBIEC6196621'
@@ -22,12 +24,15 @@ def generate_test_image(file, params = {})
   create_command = "convert -size 100x100 xc:#{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?
 end
 # rubocop:enable Metrics/AbcSize
+# rubocop:enable Metrics/CyclomaticComplexity
+# rubocop:enable Metrics/MethodLength
 
 def remove_files(dir)
   Dir.foreach(dir) do |f|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: assembly-image
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.3
 platform: ruby
 authors:
 - Peter Mangiafico
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-15 00:00:00.000000000 Z
+date: 2019-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: assembly-objectfile
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: assembly-image
-rubygems_version: 2.7.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ruby immplementation of image services needed to prepare objects to be accessioned