assembly-objectfile 1.7.2 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 833c781110e681cf9555ef036857efd1a4758902c8aea55f55f4e712e78470d1
-  data.tar.gz: 83111a9c4145aac66c8e7ba24a07336c13cbf851407d05ad9a9d45d7bbf138d8
+  metadata.gz: fb34254f64779ebdf334f939519f151b6ffdf661588d194813efd2efa9e7d0fa
+  data.tar.gz: 98c7c49e243a5751002e68726f06665c210e7f360e10b08ef6f791abca3e00d9
 SHA512:
-  metadata.gz: 9346400c4e01abece34de372d086037a60f3f0cf78479630986d0d25a346042e51dc8d6e8a6835f0b9dd5bf9e70fdbd4385a8689cbd9d9ddbd899142b60534ae
-  data.tar.gz: 80cf1fa0011f28e08975d401c8d2ce3156485b4b4b3107b665d628679f1e9e4d4032313fb2434f5c7d24997f7004af6533f36b3f561560f284095264ff262a25
+  metadata.gz: 367d8abe3505708082bf7473a47e808195b6b12010c99a8227acdee0763e801f3018491593ad9071662a1903097c39740ab7ef8dbf94a2e404fc7abeee2b31c4
+  data.tar.gz: 443d63aa3187774914f0f61e71536f8612afea82414ded40293138e63446da452581e0f4e4a11f945ead2f7019a9722dcd8d054fd1669e04d64c0586827796db

data/lib/assembly-objectfile/object_fileable.rb

@@ -108,23 +108,26 @@ module Assembly
       @sha1 ||= Digest::SHA1.file(path).hexdigest
     end
 
-    # Returns mimetype information for the current file based on file extension or exif data (if available)
+    # Returns mimetype information for the current file based on
+    #   (1) exifdata (if available), (2) unix file type or (3) file extension using the mimetypes gem, in this priority order
     # @return [String] mime type
     # @example
     #   source_file = Assembly::ObjectFile.new('/input/path_to_file.txt')
     #   puts source_file.mimetype # 'text/plain'
     def mimetype
       @mimetype ||= begin
-        if exif && exif.mimetype # try exif first
-          exif.mimetype
-        else # otherwise get it from the mime-types gem (using the file extension), else blank
+        if exif_mimetype # first, try the exif data
+          exif_mimetype
+        elsif file_mimetype # next, try exif/unix file system command
+          file_mimetype
+        else  # finally, get it from the mime-types gem (using the file extension) if both of those failed for some reason
           mtype = MIME::Types.type_for(path).first
           mtype ? mtype.content_type : ''
         end
       end
     end
 
-    # Returns mimetype information for the current file based on unix file system command or exif data (if available).
+    # Returns mimetype information for the current file based on unix file system command.
     # @return [String] mime type for supplied file
     # @example
     #   source_file = Assembly::ObjectFile.new('/input/path_to_file.txt')
@@ -132,9 +135,20 @@ module Assembly
     def file_mimetype
       @file_mimetype ||= begin
         check_for_file
-        mtype = `file --mime-type "#{path}"`.delete("\n").split(':')[1].strip # first try and get the mimetype from the unix file command
-        prefer_exif = !Assembly::TRUSTED_MIMETYPES.include?(mtype) && exif && exif.mimetype # if it's not a "trusted" mimetype and there is exif data; get the mimetype from the exif
-        prefer_exif ? exif.mimetype : mtype
+        `file --mime-type "#{path}"`.delete("\n").split(':')[1].strip # first try and get the mimetype from the unix file command
+      end
+    end
+
+    # Returns mimetype information for the current file based on exif data (if available and not a trusted source that we'd rather get from the file system command)
+    # @return [String] mime type for supplied file
+    # @example
+    #   source_file = Assembly::ObjectFile.new('/input/path_to_file.txt')
+    #   puts source_file.exif_mimetype # 'text/plain'
+    def exif_mimetype
+      @exif_mimetype ||= begin
+        check_for_file
+        prefer_exif = !Assembly::TRUSTED_MIMETYPES.include?(file_mimetype) # if it's not a "trusted" mimetype and there is exif data; get the mimetype from the exif
+        exif.mimetype if exif && exif.mimetype && prefer_exif
       end
     end
 

data/lib/assembly-objectfile/version.rb

@@ -2,6 +2,6 @@
 module Assembly
   class ObjectFile
     # Project version number
-    VERSION = '1.7.2'.freeze
+    VERSION = '1.8.0'.freeze
   end
 end

data/spec/object_file_spec.rb

@@ -36,6 +36,41 @@ describe Assembly::ObjectFile do
     expect(@ai.dirname).to eq(File.dirname(TEST_TIF_INPUT_FILE))
   end
 
+  it 'sets the correct mimetype of plain/text for .txt files' do
+    @ai = described_class.new(TEST_RES1_TEXT)
+    expect(@ai.mimetype).to eq('text/plain')
+  end
+
+  it 'sets the correct mimetype of plain/text for .xml files' do
+    @ai = described_class.new(TEST_RES1_TEXT)
+    expect(@ai.mimetype).to eq('text/plain')
+  end
+
+  it 'sets the correct mimetype of plain/text for .obj 3d files' do
+    @ai = described_class.new(TEST_OBJ_FILE)
+    expect(@ai.mimetype).to eq('text/plain')
+  end
+
+  it 'sets the correct mimetype of plain/text for .ply 3d files' do
+    @ai = described_class.new(TEST_PLY_FILE)
+    expect(@ai.mimetype).to eq('text/plain')
+  end
+
+  it 'sets the correct mimetype of image/tiff for .tif files' do
+    @ai = described_class.new(TEST_TIF_INPUT_FILE)
+    expect(@ai.mimetype).to eq('image/tiff')
+  end
+
+  it 'sets the correct mimetype of image/jp2 for .jp2 files' do
+    @ai = described_class.new(TEST_JP2_INPUT_FILE)
+    expect(@ai.mimetype).to eq('image/jp2')
+  end
+
+  it 'sets the correct mimetype of application/pdf for .pdf files' do
+    @ai = described_class.new(TEST_RES1_PDF)
+    expect(@ai.mimetype).to eq('application/pdf')
+  end
+
   it 'gives us the mimetype of a file even if the exif information is damaged' do
     @ai = described_class.new(TEST_FILE_NO_EXIF)
     expect(@ai.filename).to eq('file_with_no_exif.xml')
@@ -141,7 +176,7 @@ describe Assembly::ObjectFile do
     expect(File.exist?(non_image_file)).to be true
     @ai = described_class.new(non_image_file)
     expect(@ai.image?).to eq(false)
-    expect(@ai.object_type).to eq(:other)
+    expect(@ai.object_type).not_to eq(:image)
     expect(@ai.valid_image?).to eq(false)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: assembly-objectfile
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.8.0
 platform: ruby
 authors:
 - Peter Mangiafico
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-14 00:00:00.000000000 Z
+date: 2019-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types