format_parser 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2bd20132739f75daaae94963ac56837e4852af4bd891d0b74abfef85e110eae
-  data.tar.gz: 442e4d4a2cdbe5c5fa1fd46b12e218f33c1e52d4706d94d751800a12913aa6ae
+  metadata.gz: b3c1744492b66a28cf9ff258a894c28f74552eb560794e74bb2ab9c06801f0be
+  data.tar.gz: 7f92fb35cd4b18992879b6a37799c479452f83f67e5535bc92711a26af0bcc02
 SHA512:
-  metadata.gz: b51a7884bb770ec2bc4d49c7583d9215acf162258368ab557d2da2475083d9ba85e7c00c34506f8cc01c812051189b3cc3e30aaea8c919bc0b7166f255947b96
-  data.tar.gz: ba4a3377d265d6f9d1a5887bd6de7cdc83a92c39dbfcb04c97182be265514ffc3b2d36bad1938dc0385d264602fbd197c5e8c7321cc7ad097ddb2303a612d022
+  metadata.gz: b45536df47aaf92fd28c4d32bc5ce67bf66cda6d1079f1212e4a7f21fa90b998938adb0e619251a30a65637e04f6de372a6bb545cc856bd7f3fcf36a82a87caa
+  data.tar.gz: f7604ed45d27c6316d2dcf78df2dae6ec6bebe405cc20639e0b5364f1c0018c4b3f9e621ebeb93d198f8472f293f436a40958312e1d2d1c9b0cdb8530a05b159

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.13.1
+* Avoid ZIP checks in the JPEG parser which are no longer necessary
+
 ## 0.13.0
 * Replace the homegrown ID3 parser with [id3tag](https://github.com/krists/id3tag) - this introduces id3tag
   as a dependency in addition to `exifr`, but the gains are substantial.

data/lib/format_parser/version.rb

@@ -1,3 +1,3 @@
 module FormatParser
-  VERSION = '0.13.0'
+  VERSION = '0.13.1'
 end

data/lib/parsers/jpeg_parser.rb

@@ -42,12 +42,6 @@ class FormatParser::JPEGParser
 
     markers_start_at = @buf.pos
 
-    # Keynote files start with a series of _perfectly_ valid
-    # JPEG markers, probably for icon previews or QuickLook.
-    # We have to detect those and reject them earlier. We can
-    # make use of our magic ZIP reader to get there.
-    return if probably_keynote_zip?
-
     @buf.seek(markers_start_at)
 
     while marker = read_next_marker
@@ -165,10 +159,5 @@ class FormatParser::JPEGParser
     safe_skip(@buf, length)
   end
 
-  def probably_keynote_zip?
-    reader = FormatParser::ZIPParser::FileReader.new
-    reader.zip?(@buf)
-  end
-
   FormatParser.register_parser self, natures: :image, formats: :jpg
 end

data/lib/parsers/zip_parser/file_reader.rb

@@ -195,25 +195,6 @@ class FormatParser::ZIPParser::FileReader
     entries
   end
 
-  # Tells whether the given IO is likely to be a ZIP file without
-  # performing too many detailed reads
-  #
-  # @param io[#tell, #seek, #read, #size] an IO-ish object
-  # @return [Boolean]
-  def zip?(io)
-    zip_file_size = io.size
-    eocd_offset = get_eocd_offset(io, zip_file_size)
-    zip64_end_of_cdir_location = get_zip64_eocd_location(io, eocd_offset)
-    if zip64_end_of_cdir_location
-      num_files_and_central_directory_offset_zip64(io, zip64_end_of_cdir_location)
-    else
-      num_files_and_central_directory_offset(io, eocd_offset)
-    end
-    true
-  rescue Error
-    false
-  end
-
   private
 
   def skip_ahead_2(io)

data/spec/parsers/zip_parser_spec.rb

@@ -98,18 +98,4 @@ describe FormatParser::ZIPParser do
     expect(first_entry.filename).to eq('Li��nia Extreme//')
     expect(first_entry.type).to eq(:directory)
   end
-
-  describe 'FileReader#zip?' do
-    it 'correctly detects all the ZIP files as such' do
-      reader = described_class::FileReader.new
-      Dir.glob(fixtures_dir + '/ZIP/*.zip').each do |path|
-        expect(reader).to be_zip(File.open(path, 'rb'))
-      end
-
-      4.times do
-        blob = Random.new.bytes(1024)
-        expect(reader).not_to be_zip(StringIO.new(blob))
-      end
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: format_parser
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Noah Berman