assembly-image 1.7.4 → 1.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ea288afa9ba1d87bb8c586821464bcde01fabf1994e4916d46599a2efead8f5
-  data.tar.gz: cb2cad9ca0d9e1398dd0b094af228c988fb8cb8e21c5b6533aee6096162129bf
+  metadata.gz: dee27ed2f2ed8bf8a3878bac7a41448a8f7a54fbdd8e1800434ce0af812bf1aa
+  data.tar.gz: 8ff1e21029d7b8c4bbc045522a3d2e7fdc06c9940cc09c73287e1bf15e60a11f
 SHA512:
-  metadata.gz: 1e749a5ff2fe27cf78b5b22d481871e50de538c15ead670b4e99a99de3350675c5b57159952b586f757d9f03bc59b7870fec610a0506fa874e88f188f0ddd8cb
-  data.tar.gz: 4534e0fdb7e25a10d8a6b53cdced0055399e404e14652215f5a4137fd1fcb6b24be63678911db9b4e4921dc043c36e07a30baa8969bb394dbe9dd06880d5b09a
+  metadata.gz: edf348cb16c843850f0a496be66ec2db8e21587970caadf72b31b2ecddeb2387ab69e0c6b308e5c30d02a2e66dd4de67e01f260985ed238a546448b4aacf9667
+  data.tar.gz: 27072b70647d8a657885f74ce952210efa0c070c10597ee4c7480029e845b78549c33478a5f503ebabc70e8d9c870e7376620d173e04b27eba31f0342517dca6

data/lib/assembly-image/image.rb

@@ -181,6 +181,7 @@ module Assembly
     # rubocop:disable Metrics/MethodLength
     def 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.
@@ -269,6 +270,10 @@ module Assembly
       tmp_path = tmp_tiff_file.path
 
       options = []
+
+      # Limit the amount of memory ImageMagick is able to use.
+      options << '-limit memory 1GiB -limit map 1GiB'
+
       case samples_per_pixel
       when 3
         options << '-type TrueColor'

data/lib/assembly-image/version.rb

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

data/spec/image_spec.rb

@@ -75,7 +75,7 @@ describe Assembly::Image do
     #  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, color: 'white', image_type: 'Bilevel')
+    generate_test_image(TEST_TIF_INPUT_FILE, image_type: 'Bilevel')
     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)
@@ -88,7 +88,7 @@ describe Assembly::Image do
   end
 
   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: '')
+    generate_test_image(TEST_TIF_INPUT_FILE, color: 'Bilevel', image_type: 'TrueColor', profile: '')
     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)
@@ -101,7 +101,7 @@ describe Assembly::Image do
   end
 
   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: '')
+    generate_test_image(TEST_TIF_INPUT_FILE, color: 'Bilevel', image_type: 'Grayscale', profile: '')
     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)
@@ -114,7 +114,7 @@ describe Assembly::Image do
   end
 
   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: '')
+    generate_test_image(TEST_TIF_INPUT_FILE, color: 'Grayscale', image_type: 'TrueColor', profile: '')
     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)
@@ -157,8 +157,17 @@ describe Assembly::Image do
   end
 
   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
+    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
+    @ai = Assembly::Image.new(TEST_TIF_INPUT_FILE)
+    # Indicates a temp tiff was not created.
+    expect(@ai.tmp_path).to be_nil
+    expect(@ai).to_not have_color_profile
+    expect(@ai).to be_a_valid_image
+    expect(@ai).to be_jp2able
+    @ai.create_jp2(output: TEST_JP2_OUTPUT_FILE)
+    expect(TEST_JP2_OUTPUT_FILE).to be_a_jp2
     @ai = Assembly::Image.new(TEST_JP2_OUTPUT_FILE)
     expect(@ai).to be_valid_image
     expect(@ai).to_not be_jp2able

data/spec/spec_helper.rb

@@ -17,10 +17,10 @@ TEST_DRUID           = 'nx288wh8889'
 # rubocop:disable Metrics/CyclomaticComplexity
 # rubocop:disable Metrics/MethodLength
 def generate_test_image(file, params = {})
-  color = params[:color] || 'red'
+  color = params[:color] || 'TrueColor'
   profile = params[:profile] || 'sRGBIEC6196621'
   image_type = params[:image_type]
-  create_command = "convert -size 100x100 xc:#{color} "
+  create_command = "convert rose: -scale 100x100\! -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]

metadata

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