assembly-objectfile 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0931aac97a88ba77ac0cfa8ff018d19fddcfe909c81cd82e9dfc13dca12ed4f4'
-  data.tar.gz: 4eb596c2799586b3298cd1019be16606b4a371a175c4630b1ac826296dacb5bb
+  metadata.gz: 6743d03c8c75529ad425586ed16bece4858c1fd2394342918ab29c568199d4f7
+  data.tar.gz: 16a79c4115124aae1402f1651076a85eb58912b4309f5a7503536246cd55076f
 SHA512:
-  metadata.gz: a252cfc25b6e2a11f50a6eb2976997fdcbf387ba3855fbca03d188a2f7e9572ca1a3ed605da191700551e34a685deb9dec810e63dfbff59bf9bfd09f6a6a9504
-  data.tar.gz: db0fdbf6583455bce118aa14bc29692d90fbb35c1e9746f3748548094ff53e0f33fe79c08cf5baace3869a08e4f9e3080d1906b810ce38d64022efa573e8c500
+  metadata.gz: f08d614455304c1d7c935bc5e69ca85400493b8ba4bb045d048dc519c5a78f401d2d7e1a62292a8048cc0e9b83bdd0bc3f9fa540e8021356f9929ba3ec72ef37
+  data.tar.gz: 2340e0deff59c7e913272c6c18ce6f27513d2b1777e7d7da9120a4b3377f00c80ae2c59e31c3c29769ae763dc2cc4888b3bbdc76ce75f6962b81b2de713d4551

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    assembly-objectfile (2.1.2)
+    assembly-objectfile (2.1.3)
       activesupport (>= 5.2.0)
       mime-types (> 3)
       mini_exiftool
@@ -32,12 +32,12 @@ GEM
     parallel (1.22.1)
     parser (3.1.2.1)
       ast (~> 2.4.1)
-    pry (0.13.1)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.9.0)
+    pry-byebug (3.10.1)
       byebug (~> 11.0)
-      pry (~> 0.13.0)
+      pry (>= 0.13, < 0.15)
     rainbow (3.1.1)
     rake (13.0.6)
     regexp_parser (2.5.0)
@@ -55,7 +55,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    rubocop (1.35.0)
+    rubocop (1.35.1)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)

data/lib/assembly/object_file/version.rb

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

data/lib/assembly/object_file.rb

@@ -121,12 +121,17 @@ module Assembly
       lookup.nil? ? :other : lookup.media_type.to_sym
     end
 
-    # @return [Boolean] true if the mime-types gem recognizes it as an image (from file extension lookup)
+    # @return [Boolean] true if the mime-types gem recognizes it as an image
     def image?
-      object_type == :image
+      return false if object_type != :image
+
+      # We exclude TARGA images here because we've seen where the file is a disk image and
+      # when we look for a mime type it is `image/x-tga', however it is not
+      # recognizable by exiftool.  See https://github.com/sul-dlss/assembly-objectfile/issues/98
+      mimetype != 'image/x-tga'
     end
 
-    # @return [Boolean] true if the mime-types gem recognizes it as an image (from file extension lookup)
+    # @return [Boolean] true if the mime-types gem recognizes it as an image
     #   AND it is a jp2 or jp2able?
     def valid_image?
       return false unless image?

data/spec/assembly/object_file_spec.rb

@@ -97,34 +97,41 @@ describe Assembly::ObjectFile do
   end
 
   describe '#image?' do
+    subject { object_file.image? }
+
     context 'with tiff' do
-      it 'true' do
-        object_file = described_class.new(TEST_TIF_INPUT_FILE)
-        expect(object_file.image?).to be(true)
-      end
+      let(:object_file) { described_class.new(TEST_TIF_INPUT_FILE) }
+
+      it { is_expected.to be true }
     end
 
     context 'with jp2' do
-      it 'true' do
-        object_file = described_class.new(TEST_JP2_INPUT_FILE)
-        expect(object_file.image?).to be(true)
+      let(:object_file) { described_class.new(TEST_JP2_INPUT_FILE) }
+
+      it { is_expected.to be true }
+    end
+
+    context 'with targa file' do
+      before do
+        allow(object_file).to receive(:exif_mimetype).and_return(nil)
+        allow(object_file).to receive(:file_mimetype).and_return('image/x-tga')
       end
+
+      let(:object_file) { described_class.new(TEST_JP2_INPUT_FILE) }
+
+      it { is_expected.to be false }
     end
 
     context 'with ruby file' do
-      it 'false' do
-        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
+      let(:object_file) { described_class.new(File.join(PATH_TO_GEM, 'spec/assembly/object_file_spec.rb')) }
+
+      it { is_expected.to be false }
     end
 
     context 'with xml' do
-      it 'false' do
-        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
+      let(:object_file) { described_class.new(File.join(PATH_TO_GEM, 'spec/test_data/input/file_with_no_exif.xml')) }
+
+      it { is_expected.to be false }
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: assembly-objectfile
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Peter Mangiafico
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-18 00:00:00.000000000 Z
+date: 2022-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -199,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Ruby implementation of file services needed to prepare objects to be accessioned