format_parser 0.13.2 → 0.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9387f32c6af3a32839c958afe0fb79352e7a19e99edef5d6fc33dc2102c0d403
-  data.tar.gz: c78134703d9c6cf6e243dadeab0962e3c84a6f20d1ad42f5d52dbd66f2e8b610
+  metadata.gz: 6ef925f9f8fdd532ac2020248ca86200a5519243b1d061f9eeded80ef760b15c
+  data.tar.gz: 71a06ee9fb528d1ff89b2291e85383afa9bb480a048395bc08533271d0355a35
 SHA512:
-  metadata.gz: 5e710c21e98deb50e6e88a8ba6f46254cb2224a9cfff618637b9380071e1f3a77029e3a024e46a6d4d45f1c6987a2638cb78b7f3aacc3dbcd55fc3308fe5a8f9
-  data.tar.gz: '0858b0406ae6461ee63e961e3017eab71616779f29774e887eed7646e7f67db40711a1a3dd72d22665dd17dbd4131e9b7e8cbce0a5943a64d708a5b4bc25e468'
+  metadata.gz: f1cd0d8851cafd96762449310334b8c2a35e154aba4fbfbab7acae8f58a837f02fc55dea0f877a29a237651a373467226a78ceee2b8fb9f16bbbea97c2870141
+  data.tar.gz: 3b5ceb254bc8256abe0f53f6ff0f15e357f3c4e381bc82b411cb3fcfd57df368bcf18c3ad914506d7d43a5827a4654d54ceff569a8d39366184d2557bafdfcdf

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.13.3
+* Add a fixture to make sure all parsers can cope with an empty file when using `parse_http`
+* Terminate the ZIP parser early with empty input
+* Terminate the MP3 parser early with empty or too small input
+
 ## 0.13.2
 * Handle BMP files with pixel array offsets larger than 54
 

data/README.md

@@ -115,6 +115,7 @@ Unless specified otherwise in this section the fixture files are MIT licensed an
 - `divergent_pixel_dimensions_exif.jpg` is used with permission from LiveKom GmbH
 - `extended_reads.jpg` has kindly been made available by Raphaelle Pellerin for use exclusively with format_parser
 - `too_many_APP1_markers_surrogate.jpg` was created by the project maintainers
+* `orient_6.jpg` is used with permission from [Renaud Chaput](https://github.com/renchap)
 
 ### AIFF
 - fixture.aiff was created by one of the project maintainers and is MIT licensed

data/lib/format_parser/version.rb

@@ -1,3 +1,3 @@
 module FormatParser
-  VERSION = '0.13.2'
+  VERSION = '0.13.3'
 end

data/lib/parsers/mp3_parser.rb

@@ -2,6 +2,8 @@ require 'ks'
 require 'id3tag'
 
 class FormatParser::MP3Parser
+  include FormatParser::IOUtils
+
   require_relative 'mp3_parser/id3_extraction'
 
   class MPEGFrame < Ks.strict(:offset_in_file, :mpeg_id, :channels, :sample_rate, :frame_length, :frame_bitrate)
@@ -59,11 +61,13 @@ class FormatParser::MP3Parser
 
     # Special case: some ZIPs (Office documents) did detect as MP3s.
     # To avoid having that happen, we check for the PKZIP signature -
-    # local entry header signature - at the very start of the file
-    return if io.read(6) == ZIP_LOCAL_ENTRY_SIGNATURE
-    io.seek(0)
+    # local entry header signature - at the very start of the file.
+    # If the file is too small safe_read will fail too and the parser
+    # will terminate here.
+    return if safe_read(io, 6) == ZIP_LOCAL_ENTRY_SIGNATURE
 
     # Read all the ID3 tags (or at least attempt to)
+    io.seek(0)
     id3v1 = ID3Extraction.attempt_id3_v1_extraction(io)
     tags = [id3v1, ID3Extraction.attempt_id3_v2_extraction(io)].compact
 

data/lib/parsers/zip_parser.rb

@@ -3,9 +3,11 @@ class FormatParser::ZIPParser
   require_relative 'zip_parser/office_formats'
 
   include OfficeFormats
+  include FormatParser::IOUtils
 
   def call(io)
     io = FormatParser::IOConstraint.new(io)
+    safe_read(io, 1) # Ensure the file is not empty
 
     reader = FileReader.new
     entries = reader.read_zip_structure(io: io)

data/spec/parsers/jpeg_parser_spec.rb

@@ -104,4 +104,20 @@ describe FormatParser::JPEGParser do
     result = subject.call(File.open(kitten_path, 'rb'))
     expect(result).not_to be_nil
   end
+
+  it 'assigns correct orientation to the picture that has mutliple APP1 markers with EXIF tags' do
+    # https://github.com/sdsykes/fastimage/issues/102
+    # This case is peculiar in that (from what I could find)
+    # it is not really _defined_ which EXIF comment in the file should be considered
+    # the only one to be used, or whether they have to be "union'd" together, or tags
+    # coming later in the file should overwrite tags that occur earlier. From what I
+    # can observe the dimensions we are recovering here are correct and the rotation
+    # is correctly detected, but I am not entirely sure how FastImage needs to play
+    # it in this case.
+    pic_path = fixtures_dir + '/JPEG/orient_6.jpg'
+    result = subject.call(File.open(pic_path, 'rb'))
+    expect(result).not_to be_nil
+    expect(result.width_px).to eq(2500)
+    expect(result.display_width_px).to eq(1250) # The image is actually rotated
+  end
 end

data/spec/parsers/mp3_parser_spec.rb

@@ -80,4 +80,10 @@ describe FormatParser::MP3Parser do
 
     expect(parsed).to be_nil
   end
+
+  it 'terminates early with an IOUtils error when the file is too small' do
+    expect {
+      subject.call(StringIO.new(''))
+    }.to raise_error(FormatParser::IOUtils::InvalidRead)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: format_parser
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.13.3
 platform: ruby
 authors:
 - Noah Berman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-14 00:00:00.000000000 Z
+date: 2018-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ks