assembly-image 1.7.5 → 1.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dee27ed2f2ed8bf8a3878bac7a41448a8f7a54fbdd8e1800434ce0af812bf1aa
-  data.tar.gz: 8ff1e21029d7b8c4bbc045522a3d2e7fdc06c9940cc09c73287e1bf15e60a11f
+  metadata.gz: e78a7843a4627deebdd77c16dc4da9664eba77fd78f6889b5f92bd95d36d29b5
+  data.tar.gz: 96d0a7a29dc79c80a6a3b87820ee9f7d21a93b78fe5b0fcca56a9a97a4dae505
 SHA512:
-  metadata.gz: edf348cb16c843850f0a496be66ec2db8e21587970caadf72b31b2ecddeb2387ab69e0c6b308e5c30d02a2e66dd4de67e01f260985ed238a546448b4aacf9667
-  data.tar.gz: 27072b70647d8a657885f74ce952210efa0c070c10597ee4c7480029e845b78549c33478a5f503ebabc70e8d9c870e7376620d173e04b27eba31f0342517dca6
+  metadata.gz: 7d992715e82f337b62d3008e54d3d864c4e8731786ced7889800719c0629bb4cd6c329d13581ad7af6ac6048b7a5eb1cf6891a55df71d37cb599750dddf15f9e
+  data.tar.gz: fbd72421b362ec757faec2e68fb92ebbdf71379475a933cf8179cbb0754d19f39a2d74bede1676d5d7217846febb98a2d5e676ded1576e0097f7196d330d6dcf

data/lib/assembly-image/image.rb

@@ -62,9 +62,9 @@ module Assembly
     # Example:
     #   source_img=Assembly::ObjectFile.new('/input/path_to_file.tif')
     #   puts source_img.compressed? # gives true
-    def compressed?
-      exif.compression != 'Uncompressed'
-    end
+    # 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.
@@ -128,37 +128,29 @@ module Assembly
     #   derivative_img=source_img.create_jp2(:overwrite=>true)
     #   puts derivative_img.mimetype # 'image/jp2'
     #   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 create_temp_tiff?
-                      @tmp_path = make_tmp_tiff(tmp_folder: params[:tmp_folder])
-                    else
-                      @path
-                    end
+      @tmp_path = make_tmp_tiff(tmp_folder: params[:tmp_folder])
 
-      jp2_command = jp2_create_command(source_path: source_path, output: output)
+      jp2_command = jp2_create_command(source_path: @tmp_path, output: output)
       result = `#{jp2_command}`
       raise "JP2 creation command failed: #{jp2_command} with result #{result}" unless $CHILD_STATUS.success?
 
-      File.delete(source_path) unless @tmp_path.nil? || params[:preserve_tmp_source]
+      File.delete(@tmp_path) unless @tmp_path.nil? || params[:preserve_tmp_source]
 
       # create output response object, which is an Assembly::Image type object
       Assembly::Image.new(output)
     end
-    # rubocop:enable Metrics/AbcSize
-    # rubocop:enable Metrics/MethodLength
 
     private
 
-    def create_temp_tiff?
-      mimetype != 'image/tiff' || compressed?
-    end
+    # def create_temp_tiff?
+    #   mimetype != 'image/tiff' || compressed?
+    # end
 
     def create_jp2_checks(output:, overwrite:)
       check_for_file
@@ -204,6 +196,8 @@ module Assembly
         case mimetype
         when 'image/tiff'
           1
+        when 'image/jpeg'
+          3
         end
       end
     end
@@ -219,6 +213,16 @@ module Assembly
       end
     end
 
+    # Get size of image data in bytes
+    def image_data_size
+      (samples_per_pixel * height * width * bits_per_sample) / 8
+    end
+
+    # Bigtiff needs to be used if size of image exceeds 2^32 bytes.
+    def need_bigtiff?
+      image_data_size >= 2**32
+    end
+
     # Get the number of JP2 layers to generate
     def layers
       pixdem = [width, height].max
@@ -278,17 +282,18 @@ module Assembly
       when 3
         options << '-type TrueColor'
       when 1
-        if bits_per_sample == 1
-          options << '-type Bilevel'
-          options << '-depth 8' # force the production of a grayscale access derivative
-        elsif bits_per_sample > 1
-          options << '-type Grayscale'
-        end
+        options << '-depth 8' # force the production of a grayscale access derivative
+        options << '-type Grayscale'
       end
 
       options << profile_conversion_switch(profile, tmp_folder: tmp_folder)
 
-      tiff_command = "MAGICK_TEMPORARY_PATH=#{tmp_folder} convert -quiet -compress none #{options.join(' ')} '#{@path}[0]' '#{tmp_path}'"
+      # 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(' ')} '#{@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?
 

data/lib/assembly-image/version.rb

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

data/spec/image_spec.rb

@@ -29,14 +29,31 @@ describe Assembly::Image do
     expect(@ai.dpg_jp2_filename).to eq '/path/to/a/file_with_no_05_extension.jp2'
   end
 
-  it 'creates the jp2 without a temp file when given an uncompressed RGB tif' do
-    generate_test_image(TEST_TIF_INPUT_FILE)
+  # 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
+  #   @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 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 the jp2 with a temp file when given an LZW compressed RGB tif' do
+    generate_test_image(TEST_TIF_INPUT_FILE, compress: 'lzw')
     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 be_nil
+    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
@@ -46,43 +63,47 @@ describe Assembly::Image do
     expect(@jp2.width).to eq 100
   end
 
-  it 'creates the jp2 with a temp file when given a compressed RGB tif' do
-    generate_test_image(TEST_TIF_INPUT_FILE, compress: true)
+  it 'creates the jp2 with a temp file when given an uncompressed compressed RGB tif with more than 4GB of image data' do
+    skip 'This test will create a 4GB test image and a 4GB temporary image, so skipping by default.'
+    generate_test_image(TEST_TIF_INPUT_FILE, compress: 'none', width: '37838', height: '37838')
     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
+    expect(@jp2.height).to eq 37_838
+    expect(@jp2.width).to eq 37_838
+  end
+
+  it 'creates the jp2 with a temp file when given an LZW compressed RGB tif with more than 4GB of image data' do
+    skip 'This test will create a 4GB temporary image, so skipping by default.'
+    generate_test_image(TEST_TIF_INPUT_FILE, compress: 'lzw', width: '37838', height: '37838')
+    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)
+    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 37_838
+    expect(@jp2.width).to eq 37_838
   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
-    # Corder=RPCL Cblk=\{64,64\} Cprecincts=\{256,256\},\{256,256\},\{128,128\} ORGgen_plt=yes -rate 1.5 Clevels=5
-    # Clayers=2 -i '/tmp/408d3740-e25f-4c1b-889f-3f138d088fe4.tif' -o '/home/travis/build/sul-dlss/assembly-image/spec/test_data/output/test.jp2'
-    # with result Kakadu Error:
-    #  The number of colours associated with the colour space identified by the source
-    #  file (possible from an embedded ICC profile) is not consistent with the number
-    #  of supplied image components and/or colour palette.  You can address this
-    #  problem by supplying a `-jp2_space' or `-jpx_space' argument to explicitly
-    #  identify a colour space that has anywhere from 1 to 1 colour components.
-    generate_test_image(TEST_TIF_INPUT_FILE, image_type: 'Bilevel')
+    # Need to force group4 compression to get ImageMagick to create bitonal tiff
+    generate_test_image(TEST_TIF_INPUT_FILE, image_type: 'Bilevel', compress: 'group4')
     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)
-    expect(@ai).to have_color_profile
     result = @ai.create_jp2(output: TEST_JP2_OUTPUT_FILE)
-    # Indicates a temp tiff was not created.
-    expect(@ai.tmp_path).to be_nil
     expect(TEST_JP2_OUTPUT_FILE).to be_a_jp2
     expect(result.exif.colorspace).to eq 'Grayscale'
   end
@@ -94,8 +115,6 @@ describe Assembly::Image do
     @ai = Assembly::Image.new(TEST_TIF_INPUT_FILE)
     expect(@ai).to_not have_color_profile
     result = @ai.create_jp2(output: TEST_JP2_OUTPUT_FILE)
-    # Indicates a temp tiff was not created.
-    expect(@ai.tmp_path).to be_nil
     expect(TEST_JP2_OUTPUT_FILE).to be_a_jp2
     expect(result.exif.colorspace).to eq 'sRGB'
   end
@@ -232,7 +251,6 @@ describe Assembly::Image do
     expect(result.path).to eq TEST_JP2_INPUT_FILE
     expect(TEST_JP2_INPUT_FILE).to be_a_jp2
     expect(result.exif.colorspace).to eq 'sRGB'
-    expect(@ai.tmp_path).to be_nil
   end
 
   it 'recreates jp2 if the output file exists and if you allow overwriting' do

data/spec/spec_helper.rb

@@ -16,22 +16,26 @@ TEST_DRUID           = 'nx288wh8889'
 # 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 100x100\! -type #{color} "
+  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 }`
+  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
+# rubocop:enable Metrics/PerceivedComplexity
 
 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.5
+  version: 1.7.6
 platform: ruby
 authors:
 - Peter Mangiafico
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-26 00:00:00.000000000 Z
+date: 2019-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: assembly-objectfile
@@ -154,14 +154,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: assembly-image
+rubygems_version: 2.7.8
 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/image_spec.rb
-- spec/images_spec.rb
-- spec/spec_helper.rb
-- spec/test_data/input/.empty
-- spec/test_data/output/.empty
+test_files: []