format_parser 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33fd6ee96653abe4059457cf1ba86113fc2c2a88
-  data.tar.gz: 7f042ecb080e9d04a78d7d22102dc3905f40b0d3
+  metadata.gz: 70fd9b84e2b397e862c2f6554eb6f3830f77b3c8
+  data.tar.gz: 36c2a28a96f0bea5644f550bb616983d8320961d
 SHA512:
-  metadata.gz: 9326f30de6b5344b9a17bd0832381ef5775094f1578173d5f5735b21aaff9f7358e7397ccf83b0c67ab7f4f71a7093ecf98d32007200f690026f953562211180
-  data.tar.gz: 393643805c0a9d995a07d8f7fdbd7afae28b2d617ccd0f05d456799b547a0f76fc8e160ec8e8127f20f39cd8b45ca4cd25dd516d64c8e3852a009f4e7c4ccda6
+  metadata.gz: d2603890e62f99e5a4e63dd28f1860aeee86f1f47d0a690fa559f01a27aa106104fb71195427814ac346208435a3fd720db4458cdbd8cb9cf1291c517334ca8f
+  data.tar.gz: 35f16d20d4a3e015d58b82297f66f2bd3df1e2ef78a0ced278c474bcec64e8d47241fc4e99368b1fa8d203bda182e509c0c58d65037539f9e7b6d5f7b98bfe0e

data/lib/care.rb

@@ -25,6 +25,7 @@ class Care
     end
 
     def read(n_bytes)
+      return '' if n_bytes == 0 # As hardcoded for all Ruby IO objects
       read = @cache.byteslice(@io, @pos, n_bytes)
       return nil unless read && !read.empty?
       @pos += read.bytesize
@@ -62,7 +63,7 @@ class Care
     # or fetch pages where necessary
     def byteslice(io, at, n_bytes)
       if n_bytes < 1
-        raise ArgumentError, "The number of bytes to fetch must be a positive Integer"
+        raise ArgumentError, "The number of bytes to fetch must be a positive Integer, but was #{n_bytes}"
       end
       if at < 0
         raise ArgumentError, "Negative offsets are not supported (got #{at})"

data/lib/format_parser/version.rb

@@ -1,3 +1,3 @@
 module FormatParser
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

data/lib/io_constraint.rb

@@ -1,3 +1,4 @@
+
 # We deliberately want to document and restrict the
 # number of methods an IO-ish object has to implement
 # to be usable with all our parsers. This subset is fairly

data/lib/parsers/exif_parser.rb

@@ -49,6 +49,8 @@ class FormatParser::EXIFParser
     # Without the magic bytes EXIFR throws an error
     @file_io.seek(0)
     raw_exif_data = EXIFR::JPEG.new(@file_io) if @filetype == :jpeg
+    # Return if it's a CR2, which we don't parse yet
+    return if cr2_check(@file_io)
     raw_exif_data = EXIFR::TIFF.new(@file_io) if @filetype == :tiff
     # For things that we don't yet have a parser for
     # we make the raw exif result available
@@ -69,4 +71,10 @@ class FormatParser::EXIFParser
     (1..ORIENTATIONS.length).include?(value)
   end
 
+  def cr2_check(file_io)
+    @file_io.seek(8)
+    cr2_check_bytes = @file_io.read(2)
+    cr2_check_bytes == "CR" ? true : false
+  end
+
 end

data/spec/care_spec.rb

@@ -55,6 +55,11 @@ describe Care do
   describe Care::IOWrapper do
     it_behaves_like 'an IO object compatible with IOConstraint'
 
+    it 'always returns an empty string for a read() of 0' do
+      c = described_class.new(StringIO.new)
+      expect(c.read(0)).to eq('')
+    end
+
     it 'forwards calls to read() to the Care and adjusts internal offsets' do
       fake_cache_class = Class.new do
         attr_reader :recorded_calls

data/spec/format_parser_spec.rb

@@ -20,4 +20,14 @@ describe FormatParser do
       end
     end
   end
+
+  describe 'when parsing fixtures' do
+    Dir.glob(fixtures_dir + '/**/*.*').sort.each do |fixture_path|
+      it "parses #{fixture_path} without raising any errors" do
+        File.open(fixture_path, 'rb') do |file|
+          FormatParser.parse(file)
+        end
+      end
+    end
+  end
 end

data/spec/remote_fetching_spec.rb

@@ -55,6 +55,19 @@ describe 'Fetching data from HTTP remotes' do
       end
     end
   end
+
+  describe 'when parsing remote fixtures' do
+    Dir.glob(fixtures_dir + '/**/*.*').sort.each do |fixture_path|
+      filename = File.basename(fixture_path)
+      it "parses #{filename} without raising any errors" do
+        remote_fixture_path = fixture_path.gsub(fixtures_dir, "http://localhost:9399")
+        # Some of the fixtures are in dirs with spaces
+        cleaned_remote_fixture_path = remote_fixture_path.gsub(" ", "%20")
+        FormatParser.parse_http(cleaned_remote_fixture_path)
+      end
+    end
+  end
+
   
   after(:all) do
     @server.stop

metadata

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