assembly-image 1.6.9 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d66d9eec1f29d5bd46dc1d0b56e5dabedc9bdb7
-  data.tar.gz: e1ca05e2d6fc53ab1d636693eff5adc5c904f2e8
+  metadata.gz: 693f1de3f3da7705f8920609b33300286a2bee43
+  data.tar.gz: dd91d143c8cb63df32576df88e8faaf99f75ef6b
 SHA512:
-  metadata.gz: 8cee672d311df902bf6a6f922c6f0d34836970eef4df48cd6535f9533ad5dfe22c198fcac8d6ea6d2549d64d8a33010752bf7e2ddc903dd264a801627ac66c47
-  data.tar.gz: 6ef377f1d9135287313582ffdbbe7daa605a18a3ff4a8e4efe5b1025fbb239db5d0c1545ba72a508d0f242fb9a28d26f37e332210c11fe3cf58694f14d07c621
+  metadata.gz: c7a36d09fa0326861718e9c99495ce0ffc79ee4cb08b5fe1d9ed4d9eebb5fbf4527b3a0905434dadc4683f6c674f828e85f0dd10dde5a5b486a8a58fdac8da0f
+  data.tar.gz: 11e5bcee0606f7696f0d984b09a8c4aad7a558e2db1aabf2f0d2fdbd55c204c06ebaafde06e72673f5f7668975d99803bb8382699faaa07b4778a50ee324ab67

data/.travis.yml

@@ -3,6 +3,7 @@ notifications:
 
 rvm:
   - 2.2.4
+  - 2.4.3
 
 language: ruby
 sudo: false

data/assembly-image.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
   s.executables   = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_dependency 'uuidtools'
   s.add_dependency 'assembly-objectfile', '>= 1.6.4'
   s.add_dependency 'mini_exiftool', '>= 1.6', '< 3'
 

data/lib/assembly-image.rb

@@ -5,5 +5,5 @@ module Assembly
 
 end
 
-# auto-include all files in the lib sub-directory directory
-Dir[File.dirname(__FILE__) + '/assembly-image/*.rb'].each {|file| require file unless file=='version.rb'}
+require 'assembly-image/image'
+require 'assembly-image/images'

data/lib/assembly-image/image.rb

@@ -1,5 +1,5 @@
-require 'uuidtools'
 require 'assembly-objectfile'
+require 'tempfile'
 
 module Assembly
 
@@ -131,86 +131,124 @@ module Assembly
 
       raise SecurityError,'cannot recreate jp2 over itself' if overwrite && mimetype=='image/jp2' && output == @path
 
-      tmp_folder = params[:tmp_folder] || '/tmp'
+      tmp_folder = params[:tmp_folder] || Dir.tmpdir
       raise "tmp_folder #{tmp_folder} does not exists" unless File.exists?(tmp_folder)
 
-      output_profile      = 'sRGBIEC6196621' # params[:output_profile] || 'sRGBIEC6196621'  # 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
       preserve_tmp_source = params[:preserve_tmp_source] || false
-      path_to_profiles    = File.join(Assembly::PATH_TO_IMAGE_GEM,'profiles')
-      output_profile_file = File.join(path_to_profiles,"#{output_profile}.icc")
 
-      raise "output profile #{output_profile} invalid" if !File.exists?(output_profile_file)
+      # make temp tiff filename
+      tmp_tiff_file = Tempfile.new(['assembly-image', '.tif'], tmp_folder)
+      @tmp_path = tmp_tiff_file.path
 
-      samples_per_pixel=exif['samplesperpixel'].to_s || ''
-      bits_per_sample=exif['bitspersample'] || ''
+      options    =  []
+      case samples_per_pixel
+        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
+      end
 
-      path_to_profiles   = File.join(Assembly::PATH_TO_IMAGE_GEM,'profiles')
+      options << profile_conversion_switch(profile, tmp_folder: tmp_folder)
 
-      if !profile.nil? # if the input color profile exists, contract paths to the profile and setup the command
+      tiff_command       = "MAGICK_TEMPORARY_PATH=#{tmp_folder} convert -quiet -compress none #{options.join(' ')} '#{@path}[0]' '#{@tmp_path}'"
+      result=`#{tiff_command} 2>&1`
+      raise "tiff convert command failed: #{tiff_command} with result #{result}" unless $?.success?
 
-        input_profile = profile.gsub(/[^[:alnum:]]/, '')   # remove all non alpha-numeric characters, so we can get to a filename
+      # jp2 creation command
+      kdu_bin = 'kdu_compress'
+      options = []
+      options << '-jp2_space sRGB' if samples_per_pixel == 3
+      options += kdu_compress_default_options
+      options << "Clayers=#{layers.to_s}"
+      jp2_command = "#{kdu_bin} #{options.join(' ')} -i '#{@tmp_path}' -o '#{output}'"
+      result=`#{jp2_command} 2>&1`
+      raise "JP2 creation command failed: #{jp2_command} with result #{result}" unless $?.success?
 
-        # 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.exists?(input_profile_file_gem) ? input_profile_file_gem : input_profile_file_tmp
+      tmp_tiff_file.delete unless preserve_tmp_source
 
-        # 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.exists?(input_profile_file)
-          input_profile_extraction_command = "MAGICK_TEMPORARY_PATH=#{tmp_folder} convert '#{@path}'[0] #{input_profile_file}" # extract profile from input image
-          result=`#{input_profile_extraction_command} 2>&1`
-          raise "input profile extraction command failed: #{input_profile_extraction_command} with result #{result}" unless $?.success?
-          raise 'input profile is not a known profile and could not be extracted from input file' unless File.exists?(input_profile_file) # if extraction failed or we cannot write the file, throw exception
-        end
+      # create output response object, which is an Assembly::Image type object
+      Assembly::Image.new(output)
+    end
 
-        profile_conversion_switch = "-profile #{input_profile_file} -profile #{output_profile_file}"
+    private
+
+    def kdu_compress_default_options
+      [
+        '-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
+        'Clevels=5' # Number of wavelet decomposition levels, or stages
+      ]
+    end
 
+    def samples_per_pixel
+      if exif['samplesperpixel']
+        exif['samplesperpixel'].to_i
       else
+        case mimetype
+        when 'image/tiff'
+          1
+        end
+      end
+    end
 
-        profile_conversion_switch = '' # no conversion needed if input color profile does not exist
-
+    def bits_per_sample
+      if exif['bitspersample']
+        exif['bitspersample'].to_i
+      else
+        case mimetype
+        when 'image/tiff'
+          1
+        end
       end
+    end
 
-      # make temp tiff filename
-      @tmp_path      = "#{tmp_folder}/#{UUIDTools::UUID.random_create.to_s}.tif"
+    # Get the number of JP2 layers to generate
+    def layers
+      pixdem = [width, height].max
+      (( Math.log(pixdem) / Math.log(2) ) - ( Math.log(96) / Math.log(2) )).ceil + 1
+    end
 
-      options    =  ''
-      case samples_per_pixel
-        when '3'
-          options += '-type TrueColor'
-        when '1'
-          if bits_per_sample.to_i == 1
-            options += '-type Bilevel'
-          elsif bits_per_sample.to_i > 1
-            options += '-type Grayscale'
-          end
-      end
-      tiff_command       = "MAGICK_TEMPORARY_PATH=#{tmp_folder} convert -quiet -compress none #{profile_conversion_switch} #{options} '#{@path}[0]' '#{@tmp_path}'"
-      result=`#{tiff_command} 2>&1`
-      raise "tiff convert command failed: #{tiff_command} with result #{result}" unless $?.success?
+    def profile_conversion_switch(profile, tmp_folder:)
+      path_to_profiles   = File.join(Assembly::PATH_TO_IMAGE_GEM,'profiles')
+      output_profile      = 'sRGBIEC6196621' # params[:output_profile] || 'sRGBIEC6196621'  # 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_file = File.join(path_to_profiles,"#{output_profile}.icc")
 
-      pixdem = width > height ? width : height
-      layers = (( Math.log(pixdem) / Math.log(2) ) - ( Math.log(96) / Math.log(2) )).ceil + 1
+      raise "output profile #{output_profile} invalid" unless File.exists?(output_profile_file)
 
-      # jp2 creation command
-      kdu_bin     = 'kdu_compress '
-      options     = ''
-      options    += ' -jp2_space sRGB ' if samples_per_pixel == '3'
-      options    += ' -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 '
-      jp2_command = "#{kdu_bin} #{options} Clayers=#{layers.to_s} -i '#{@tmp_path}' -o '#{output}'"
-      result=`#{jp2_command} 2>&1`
-      raise "JP2 creation command failed: #{jp2_command} with result #{result}" unless $?.success?
+      return '' if profile.nil?
 
-      File.delete(@tmp_path) unless preserve_tmp_source
+      # if the input color profile exists, contract paths to the profile and setup the command
 
-      # create output response object, which is an Assembly::Image type object
-      Assembly::Image.new(output)
+      input_profile = profile.gsub(/[^[:alnum:]]/, '')   # remove all non alpha-numeric characters, so we can get to a filename
 
-    end
+      # 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.exists?(input_profile_file_gem) ? input_profile_file_gem : input_profile_file_tmp
 
-  end
+      # 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.exists?(input_profile_file)
+        input_profile_extraction_command = "MAGICK_TEMPORARY_PATH=#{tmp_folder} convert '#{@path}'[0] #{input_profile_file}" # extract profile from input image
+        result=`#{input_profile_extraction_command} 2>&1`
+        raise "input profile extraction command failed: #{input_profile_extraction_command} with result #{result}" unless $?.success?
+        raise 'input profile is not a known profile and could not be extracted from input file' unless File.exists?(input_profile_file) # if extraction failed or we cannot write the file, throw exception
+      end
 
+      "-profile #{input_profile_file} -profile #{output_profile_file}"
+    end
+  end
 end

data/lib/assembly-image/version.rb

@@ -3,6 +3,6 @@ module Assembly
   # Main Image class
   class Image
     # Project version number
-    VERSION = '1.6.9'
+    VERSION = '1.7.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: assembly-image
 version: !ruby/object:Gem::Version
-  version: 1.6.9
+  version: 1.7.0
 platform: ruby
 authors:
 - Peter Mangiafico
@@ -11,22 +11,8 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-16 00:00:00.000000000 Z
+date: 2018-03-19 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: uuidtools
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: assembly-objectfile
   requirement: !ruby/object:Gem::Requirement
@@ -156,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: assembly-image
-rubygems_version: 2.6.7
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Ruby immplementation of image services needed to prepare objects to be accessioned
@@ -167,4 +153,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/test_data/input/.empty
 - spec/test_data/output/.empty
-has_rdoc: