assembly-objectfile 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 101baff5dcb53ae691341818de800b9836bc5c2db2483b3cdac08afa8fed479e
-  data.tar.gz: 0265e4b3d35ecf91a07b48129e4485e9844e6e1c940a08ae4f32246b209d2260
+  metadata.gz: 76dac08191a4c118cf16e4736b9538c9d2a60811cf9547e0ad395ab468b1b51a
+  data.tar.gz: b9fec1e99d03941f658cd6716e1c00db37ce2f2042816e4ba8f77246b102d1f4
 SHA512:
-  metadata.gz: fa0814a3a51d7d98f7eeb91611193e367accb4161ab18967b1afdb7caeb54476994f078ed58eff684dfba37dd2358a75fba98b181df74f165f82c65537723ebc
-  data.tar.gz: 91272e14724ff23ac668bf65339f29a272606712da691a7e13018d70c7e2a00ac8d242723ae6b4a9e05007543174e43e6ade6abb8f71a922ff9a4f4b230b10bb
+  metadata.gz: '082fc021ca4f4dde1f3eaaac937e66862d8ea36f5198bdece9866a72e5be068021665e10bd40b8ea2835d848c062886982ed41033935120525c8d4e57efadafd'
+  data.tar.gz: cf2e4facd4248532c5f92c741f80b5e8d27e04b8cc23e3b7959b59118cceaf8122d03aa92af8faf99c8000bb4298b74d9ab86001744c6f852cd148ceda21d675

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-07-19 19:06:39 UTC using RuboCop version 1.31.2.
+# on 2022-07-20 17:16:46 UTC using RuboCop version 1.31.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -9,4 +9,4 @@
 # Offense count: 1
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 118
+  Max: 122

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    assembly-objectfile (2.1.0)
+    assembly-objectfile (2.1.1)
       activesupport (>= 5.2.0)
       mime-types (> 3)
       mini_exiftool
@@ -76,7 +76,7 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.2.0)
 

data/lib/assembly/object_file/version.rb

@@ -4,6 +4,6 @@
 module Assembly
   class ObjectFile
     # Gem version
-    VERSION = '2.1.0'
+    VERSION = '2.1.1'
   end
 end

data/lib/assembly/object_file.rb

@@ -104,6 +104,13 @@ module Assembly
       @exif ||= begin
         check_for_file
         MiniExiftool.new(path, replace_invalid_chars: '?')
+      rescue MiniExiftool::Error
+        # MiniExiftool will throw an exception when it tries to initialize for problematic files,
+        # but the exception it throws does not tell you the file that caused the problem.
+        # Instead, we will raise our own exception with more context in logging/reporting upstream.
+        # Note: if the file that causes the problem should NOT use exiftool to determine mimetype, add it to the skipped
+        # mimetypes in Assembly::TRUSTED_MIMETYPES to bypass initialization of MiniExiftool for mimetype generation
+        raise MiniExiftool::Error, "error initializing MiniExiftool for #{path}"
       end
     end
 
@@ -255,7 +262,7 @@ module Assembly
         check_for_file
         # if it's not a "trusted" mimetype and there is exif data; get the mimetype from the exif
         prefer_exif = !Assembly::TRUSTED_MIMETYPES.include?(file_mimetype)
-        exif.mimetype if exif&.mimetype && prefer_exif
+        exif.mimetype if prefer_exif && exif&.mimetype
       end
     end
 

data/lib/assembly-objectfile.rb

@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
 module Assembly
-  # the path to the gem, used to access profiles stored with the gem
-  PATH_TO_GEM = File.expand_path("#{File.dirname(__FILE__)}/..")
-
   # If input image is not one of these mime types, it will not be regarded as a valid image
   # for the purpose of generating a JP2 derivative
   VALID_IMAGE_MIMETYPES = ['image/jpeg', 'image/tiff', 'image/tif', 'image/png'].freeze
@@ -12,7 +9,8 @@ module Assembly
   # one of these is returned by the file command, then a check will be made to see if exif data exists...
   # if so, the mimetype returned by the exif data will be used if no exif data exists, then the
   # mimetype returned by the unix file command will be used
-  TRUSTED_MIMETYPES = ['text/plain', 'plain/text', 'application/pdf', 'text/html', 'application/xml'].freeze
+  TRUSTED_MIMETYPES = ['text/plain', 'plain/text', 'application/pdf', 'text/html', 'application/xml',
+                       'application/octet-stream'].freeze
 
   # This is a manual override mapping of file extension to mimetype; if a file with the given extension
   # is found, the mapped mimetype will be returned and no further methods will be used - this is used

data/spec/assembly/object_file_spec.rb

@@ -113,7 +113,7 @@ describe Assembly::ObjectFile do
 
     context 'with ruby file' do
       it 'false' do
-        non_image_file = File.join(Assembly::PATH_TO_GEM, 'spec/assembly/object_file_spec.rb')
+        non_image_file = File.join(PATH_TO_GEM, 'spec/assembly/object_file_spec.rb')
         object_file = described_class.new(non_image_file)
         expect(object_file.image?).to be(false)
       end
@@ -121,7 +121,7 @@ describe Assembly::ObjectFile do
 
     context 'with xml' do
       it 'false' do
-        non_image_file = File.join(Assembly::PATH_TO_GEM, 'spec/test_data/input/file_with_no_exif.xml')
+        non_image_file = File.join(PATH_TO_GEM, 'spec/test_data/input/file_with_no_exif.xml')
         object_file = described_class.new(non_image_file)
         expect(object_file.image?).to be(false)
       end
@@ -145,7 +145,7 @@ describe Assembly::ObjectFile do
 
     context 'with ruby file' do
       it ':text' do
-        non_image_file = File.join(Assembly::PATH_TO_GEM, 'spec/assembly/object_file_spec.rb')
+        non_image_file = File.join(PATH_TO_GEM, 'spec/assembly/object_file_spec.rb')
         object_file = described_class.new(non_image_file)
         expect(object_file.object_type).to eq(:text)
       end
@@ -153,7 +153,7 @@ describe Assembly::ObjectFile do
 
     context 'with xml' do
       it ':application' do
-        non_image_file = File.join(Assembly::PATH_TO_GEM, 'spec/test_data/input/file_with_no_exif.xml')
+        non_image_file = File.join(PATH_TO_GEM, 'spec/test_data/input/file_with_no_exif.xml')
         object_file = described_class.new(non_image_file)
         expect(object_file.object_type).to eq(:application)
       end
@@ -191,7 +191,7 @@ describe Assembly::ObjectFile do
 
     context 'with ruby file' do
       it 'false' do
-        non_image_file = File.join(Assembly::PATH_TO_GEM, 'spec/assembly/object_file_spec.rb')
+        non_image_file = File.join(PATH_TO_GEM, 'spec/assembly/object_file_spec.rb')
         object_file = described_class.new(non_image_file)
         expect(object_file.valid_image?).to be(false)
       end
@@ -199,7 +199,7 @@ describe Assembly::ObjectFile do
 
     context 'with xml' do
       it 'false' do
-        non_image_file = File.join(Assembly::PATH_TO_GEM, 'spec/test_data/input/file_with_no_exif.xml')
+        non_image_file = File.join(PATH_TO_GEM, 'spec/test_data/input/file_with_no_exif.xml')
         object_file = described_class.new(non_image_file)
         expect(object_file.valid_image?).to be(false)
       end
@@ -359,7 +359,7 @@ describe Assembly::ObjectFile do
 
   describe '#file_exists?' do
     it 'false when a valid directory is specified instead of a file' do
-      path = Assembly::PATH_TO_GEM
+      path = PATH_TO_GEM
       object_file = described_class.new(path)
       expect(File.exist?(path)).to be true
       expect(File.directory?(path)).to be true
@@ -367,7 +367,7 @@ describe Assembly::ObjectFile do
     end
 
     it 'false when a non-existent file is specified' do
-      path = File.join(Assembly::PATH_TO_GEM, 'file_not_there.txt')
+      path = File.join(PATH_TO_GEM, 'file_not_there.txt')
       object_file = described_class.new(path)
       expect(File.exist?(path)).to be false
       expect(File.directory?(path)).to be false
@@ -410,9 +410,10 @@ describe Assembly::ObjectFile do
       expect(object_file.exif.class).to eq MiniExiftool
     end
 
-    it 'raises MiniExiftool::Error if exiftool raises one' do
+    it 'raises MiniExiftool::Error with file path if exiftool raises one' do
       object_file = described_class.new('spec/test_data/empty.txt')
-      expect { object_file.exif }.to raise_error(MiniExiftool::Error)
+      expect { object_file.exif }.to raise_error(MiniExiftool::Error,
+                                                 "error initializing MiniExiftool for #{object_file.path}")
     end
   end
 

data/spec/spec_helper.rb

@@ -10,13 +10,10 @@ RSpec.configure do |config|
   config.order = 'random'
 end
 
-TEST_DATA_DIR = File.join(Assembly::PATH_TO_GEM, 'spec', 'test_data')
-TEST_INPUT_DIR       = File.join(TEST_DATA_DIR, 'input')
-TEST_OUTPUT_DIR      = File.join(TEST_DATA_DIR, 'output')
+PATH_TO_GEM = File.expand_path("#{File.dirname(__FILE__)}/..")
+TEST_INPUT_DIR       = File.join(PATH_TO_GEM, 'spec', 'test_data', 'input')
 TEST_TIF_INPUT_FILE  = File.join(TEST_INPUT_DIR, 'test.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_TIFF_NO_COLOR_FILE = File.join(TEST_INPUT_DIR, 'test_no_color_profile.tif')
 
@@ -30,5 +27,3 @@ TEST_JSON_FILE = File.join(TEST_INPUT_DIR, 'test.json')
 
 TEST_OBJ_FILE = File.join(TEST_INPUT_DIR, 'someobject.obj')
 TEST_PLY_FILE = File.join(TEST_INPUT_DIR, 'someobject.ply')
-
-TEST_DRUID = 'nx288wh8889'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: assembly-objectfile
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Peter Mangiafico
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-19 00:00:00.000000000 Z
+date: 2022-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport