format_parser 0.2.0 → 0.3.0

data/spec/care_spec.rb

@@ -2,15 +2,15 @@ require 'spec_helper'
 
 describe Care do
   describe Care::Cache do
-    let(:source) { StringIO.new("Hello there, this is our little caching reader") }
+    let(:source) { StringIO.new('Hello there, this is our little caching reader') }
 
     it 'performs correct reads at various offsets' do
       cache = Care::Cache.new(3)
-      expect(cache.byteslice(source, 0, 3)).to eq("Hel")
-      expect(cache.byteslice(source, 0, 7)).to eq("Hello t")
-      expect(cache.byteslice(source, 1, 7)).to eq("ello th")
-      expect(cache.byteslice(source, 11, 8)).to eq(", this i")
-      expect(cache.byteslice(source, 12, 12)).to eq(" this is our")
+      expect(cache.byteslice(source, 0, 3)).to eq('Hel')
+      expect(cache.byteslice(source, 0, 7)).to eq('Hello t')
+      expect(cache.byteslice(source, 1, 7)).to eq('ello th')
+      expect(cache.byteslice(source, 11, 8)).to eq(', this i')
+      expect(cache.byteslice(source, 12, 12)).to eq(' this is our')
       expect(cache.byteslice(source, 120, 12)).to be_nil
     end
 
@@ -23,10 +23,10 @@ describe Care do
 
     it 'can be cleared' do
       cache = Care::Cache.new(3)
-      expect(cache.byteslice(source, 0, 3)).to eq("Hel")
-      expect(cache.instance_variable_get("@pages")).not_to be_empty
+      expect(cache.byteslice(source, 0, 3)).to eq('Hel')
+      expect(cache.instance_variable_get('@pages')).not_to be_empty
       cache.clear
-      expect(cache.instance_variable_get("@pages")).to be_empty
+      expect(cache.instance_variable_get('@pages')).to be_empty
     end
 
     it 'fits all the reads into one if the input fits into one page' do
@@ -67,7 +67,7 @@ describe Care do
           @recorded_calls ||= []
           @recorded_calls << [io, at, n_bytes]
           # Pretend reads always succeed and return the requisite number of bytes
-          "x" * n_bytes
+          'x' * n_bytes
         end
       end
 

data/spec/file_information_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
 
 describe FormatParser::Image do
-
-  context "File data checks" do
+  context 'File data checks' do
     it 'succeeds with relevant attributes' do
       result = described_class.new(format: :jpg, width_px: 42, height_px: 10, image_orientation: 1)
       expect(result.nature).to eq(:image)
@@ -12,5 +11,4 @@ describe FormatParser::Image do
       expect(result.image_orientation).to eq(1)
     end
   end
-
 end

data/spec/format_parser_spec.rb

@@ -3,12 +3,12 @@ require 'spec_helper'
 describe FormatParser do
   it 'returns nil when trying to parse an empty IO' do
     d = StringIO.new('')
-    expect(FormatParser.parse(d)).to be_empty
+    expect(FormatParser.parse(d)).to be_nil
   end
 
   it 'returns nil when parsing an IO no parser can make sense of' do
     d = StringIO.new(Random.new.bytes(1))
-    expect(FormatParser.parse(d)).to be_empty
+    expect(FormatParser.parse(d)).to be_nil
   end
 
   describe 'with fuzzing' do
@@ -26,24 +26,24 @@ describe FormatParser do
     let(:audio) { FormatParser::Audio.new(format: :aiff, num_audio_channels: 1) }
     let(:image) { FormatParser::Image.new(format: :dpx, width_px: 1, height_px: 1) }
 
-    context '#parse called without any option' do
+    context '#parse called hash options' do
       before do
         expect_any_instance_of(FormatParser::AIFFParser).to receive(:call).and_return(audio)
         expect_any_instance_of(FormatParser::DPXParser).to receive(:call).and_return(image)
       end
 
-      subject { FormatParser.parse(blob) }
+      subject { FormatParser.parse(blob, results: :all) }
 
       it { is_expected.to include(image) }
       it { is_expected.to include(audio) }
     end
 
-    context '#parse called with hash options' do
+    context '#parse called without hash options' do
       before do
         expect_any_instance_of(FormatParser::DPXParser).to receive(:call).and_return(image)
       end
 
-      subject { FormatParser.parse(blob, formats: [:dpx], returns: :one) }
+      subject { FormatParser.parse(blob) }
 
       it { is_expected.to eq(image) }
     end

data/spec/io_utils_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe "IOUtils" do
-  let(:io) {File.open(fixtures_dir + '/test.jpg', 'rb')}
-  include FormatParser::IOUtils 
+describe 'IOUtils' do
+  let(:io) { File.open(fixtures_dir + '/test.jpg', 'rb') }
+  include FormatParser::IOUtils
 
   describe '#safe_read' do
     it 'raises if the requested bytes are past the EOF' do
@@ -16,12 +16,12 @@ describe "IOUtils" do
       expect {
         safe_read(io, 1_000_000)
       }.to raise_error(FormatParser::IOUtils::InvalidRead)
-    end  
+    end
   end
 
   describe '#safe_skip' do
     it 'raises on a negative skip byte amount' do
-      fake_io = double()
+      fake_io = double
       expect {
         safe_skip(fake_io, -5)
       }.to raise_error(FormatParser::IOUtils::InvalidRead)
@@ -29,12 +29,12 @@ describe "IOUtils" do
 
     it 'uses #pos if available on the object' do
       fake_io = double(pos: 11)
-      expect(fake_io).to receive(:seek).with(11+5)
+      expect(fake_io).to receive(:seek).with(11 + 5)
       safe_skip(fake_io, 5)
     end
 
     it 'uses #read if no #pos is available on the object' do
-      fake_io = double()
+      fake_io = double
       expect(fake_io).to receive(:read).with(5).and_return('x' * 5)
       safe_skip(fake_io, 5)
     end

data/spec/parsers/exif_parser_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe FormatParser::EXIFParser do
-  
   # ORIENTATIONS = [
   #   :top_left,
   #   :top_right,
@@ -23,7 +22,7 @@ describe FormatParser::EXIFParser do
 
         expect(parser.orientation).to be_kind_of(Symbol)
         # Filenames in this dir correspond with the orientation of the file
-        expect(filename.include?(parser.orientation.to_s)).to be true 
+        expect(filename.include?(parser.orientation.to_s)).to be true
       end
     end
   end
@@ -38,7 +37,7 @@ describe FormatParser::EXIFParser do
 
         expect(parser.orientation).to be_kind_of(Symbol)
         # Filenames in this dir correspond with the orientation of the file
-        expect(filename.include?(parser.orientation.to_s)).to be true 
+        expect(filename.include?(parser.orientation.to_s)).to be true
       end
     end
   end

data/spec/parsers/gif_parser_spec.rb

@@ -23,7 +23,7 @@ describe FormatParser::GIFParser do
 
   describe 'is able to correctly parse our own examples' do
     it 'is able to parse the animated GIF' do
-      gif_path = fixtures_dir + "GIF/anim.gif"
+      gif_path = fixtures_dir + 'GIF/anim.gif'
 
       parsed = subject.call(File.open(gif_path, 'rb'))
       expect(parsed).not_to be_nil

data/spec/parsers/jpeg_parser_spec.rb

@@ -32,5 +32,4 @@ describe FormatParser::JPEGParser do
       end
     end
   end
-
 end

data/spec/parsers/moov_parser_spec.rb

@@ -1,8 +1,7 @@
-# coding: utf-8
+
 require 'spec_helper'
 
 describe FormatParser::MOOVParser do
-
   def deep_print_atoms(atoms, output, swimlanes = [])
     return unless atoms
 
@@ -12,7 +11,7 @@ describe FormatParser::MOOVParser do
     vert = '│'
     cdn = '┬'
     n_atoms = atoms.length
-  
+
     atoms.each_with_index do |atom, i|
       is_last_child = i == (n_atoms - 1)
       has_children = atom.children && atom.children.any?

data/spec/parsers/png_parser_spec.rb

@@ -20,7 +20,7 @@ describe FormatParser::PNGParser do
   end
 
   it 'is able to parse an animated PNG' do
-    gif_path = fixtures_dir + "PNG/anim.png"
+    gif_path = fixtures_dir + 'PNG/anim.png'
 
     parsed = subject.call(File.open(gif_path, 'rb'))
     expect(parsed).not_to be_nil

data/spec/parsers/tiff_parser_spec.rb

@@ -33,5 +33,4 @@ describe FormatParser::TIFFParser do
       end
     end
   end
-
 end

data/spec/parsers/wav_parser_spec.rb

@@ -12,7 +12,7 @@ describe FormatParser::WAVParser do
     end
   end
 
-  it "returns correct info about pcm files" do
+  it 'returns correct info about pcm files' do
     parse_result = subject.call(File.open(__dir__ + '/../fixtures/WAV/c_8kmp316.wav', 'rb'))
 
     expect(parse_result.nature).to eq(:audio)
@@ -23,7 +23,7 @@ describe FormatParser::WAVParser do
     expect(parse_result.media_duration_seconds).to be_within(0.01).of(13.81)
   end
 
-  it "returns correct info about pcm files with more channels" do
+  it 'returns correct info about pcm files with more channels' do
     parse_result = subject.call(File.open(__dir__ + '/../fixtures/WAV/c_39064__alienbomb__atmo-truck.wav', 'rb'))
 
     expect(parse_result.nature).to eq(:audio)
@@ -34,7 +34,7 @@ describe FormatParser::WAVParser do
     expect(parse_result.media_duration_seconds).to be_within(0.01).of(3.69)
   end
 
-  it "returns correct info about non pcm files" do
+  it 'returns correct info about non pcm files' do
     parse_result = subject.call(File.open(__dir__ + '/../fixtures/WAV/c_11k16bitpcm.wav', 'rb'))
 
     expect(parse_result.nature).to eq(:audio)

data/spec/read_limiter_spec.rb

@@ -41,5 +41,4 @@ describe FormatParser::ReadLimiter do
       reader.read(1)
     }.to raise_error(/bytes budget \(512\) exceeded/)
   end
-
 end

data/spec/remote_fetching_spec.rb

@@ -6,52 +6,67 @@ describe 'Fetching data from HTTP remotes' do
     log_file ||= StringIO.new
     log = WEBrick::Log.new(log_file)
     options = {
-      :Port => 9399,
-      :Logger => log,
-      :AccessLog => [
-          [ log, WEBrick::AccessLog::COMMON_LOG_FORMAT ],
-          [ log, WEBrick::AccessLog::REFERER_LOG_FORMAT ]
-       ]
+      Port: 9399,
+      Logger: log,
+      AccessLog: [
+        [log, WEBrick::AccessLog::COMMON_LOG_FORMAT],
+        [log, WEBrick::AccessLog::REFERER_LOG_FORMAT]
+      ]
     }
     @server = WEBrick::HTTPServer.new(options)
     @server.mount '/', WEBrick::HTTPServlet::FileHandler, fixtures_dir
-    trap("INT") { @server.stop }
+    trap('INT') { @server.stop }
     @server_thread = Thread.new { @server.start }
   end
 
+  it '#parse_http is called without any option' do
+    result = FormatParser.parse_http('http://localhost:9399/PNG/anim.png')
+
+    expect(result.format).to eq(:png)
+    expect(result.height_px).to eq(180)
+  end
+
+  it '#parse_http is called with hash options' do
+    expect_any_instance_of(FormatParser::AIFFParser).to receive(:call).and_return(:audio)
+    result = FormatParser.parse_http('http://localhost:9399/PNG/anim.png', results: :all)
+
+    expect(result.include?(:audio)).to be true
+    expect(result.count).to eq(2)
+  end
+
   it 'parses the animated PNG over HTTP' do
     file_information = FormatParser.parse_http('http://localhost:9399/PNG/anim.png')
     expect(file_information).not_to be_nil
-    expect(file_information.first.nature).to eq(:image)
+    expect(file_information.nature).to eq(:image)
   end
 
   it 'parses the JPEGs exif data' do
     file_information = FormatParser.parse_http('http://localhost:9399/exif-orientation-testimages/jpg/top_left.jpg')
     expect(file_information).not_to be_nil
-    expect(file_information.first.nature).to eq(:image)
-    expect(file_information.first.format).to eq(:jpg)
-    expect(file_information.first.orientation).to eq(:top_left)
+    expect(file_information.nature).to eq(:image)
+    expect(file_information.format).to eq(:jpg)
+    expect(file_information.orientation).to eq(:top_left)
   end
 
   it 'parses the TIFFs exif data' do
     file_information = FormatParser.parse_http('http://localhost:9399/TIFF/test.tif')
     expect(file_information).not_to be_nil
-    expect(file_information.first.nature).to eq(:image)
-    expect(file_information.first.format).to eq(:tif)
-    expect(file_information.first.orientation).to eq(:top_left)
+    expect(file_information.nature).to eq(:image)
+    expect(file_information.format).to eq(:tif)
+    expect(file_information.orientation).to eq(:top_left)
   end
 
   describe 'is able to correctly parse orientation for all remote JPEG EXIF examples from FastImage' do
     Dir.glob(fixtures_dir + '/exif-orientation-testimages/jpg/*.jpg').each do |jpeg_path|
       filename = File.basename(jpeg_path)
       it "is able to parse #{filename}" do
-        remote_jpeg_path = jpeg_path.gsub(fixtures_dir, "http://localhost:9399")
+        remote_jpeg_path = jpeg_path.gsub(fixtures_dir, 'http://localhost:9399')
         file_information = FormatParser.parse_http(remote_jpeg_path)
         expect(file_information).not_to be_nil
 
-        expect(file_information.first.orientation).to be_kind_of(Symbol)
+        expect(file_information.orientation).to be_kind_of(Symbol)
         # Filenames in this dir correspond with the orientation of the file
-        expect(filename.include?(file_information.first.orientation.to_s)).to be true 
+        expect(filename.include?(file_information.orientation.to_s)).to be true
       end
     end
   end
@@ -60,15 +75,14 @@ describe 'Fetching data from HTTP remotes' 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")
+        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")
+        cleaned_remote_fixture_path = remote_fixture_path.gsub(' ', '%20')
         FormatParser.parse_http(cleaned_remote_fixture_path)
       end
     end
   end
 
-  
   after(:all) do
     @server.stop
     @server_thread.join(0.5)

data/spec/remote_io_spec.rb

@@ -1,14 +1,13 @@
 require 'spec_helper'
 
 describe FormatParser::RemoteIO do
-
   it_behaves_like 'an IO object compatible with IOConstraint'
 
   it 'returns the partial content when the server supplies a 206 status' do
-    rio = described_class.new("https://images.invalid/img.jpg")
-    
+    rio = described_class.new('https://images.invalid/img.jpg')
+
     fake_resp = double(headers: {'Content-Range' => '10-109/2577'}, status: 206, body: 'This is the response')
-    expect(Faraday).to receive(:get).with("https://images.invalid/img.jpg", nil, range: "bytes=10-109").and_return(fake_resp)
+    expect(Faraday).to receive(:get).with('https://images.invalid/img.jpg', nil, range: 'bytes=10-109').and_return(fake_resp)
 
     rio.seek(10)
     read_result = rio.read(100)
@@ -16,10 +15,10 @@ describe FormatParser::RemoteIO do
   end
 
   it 'returns the entire content when the server supplies the Content-Range response but sends a 200 status' do
-    rio = described_class.new("https://images.invalid/img.jpg")
-    
+    rio = described_class.new('https://images.invalid/img.jpg')
+
     fake_resp = double(headers: {'Content-Range' => '10-109/2577'}, status: 200, body: 'This is the response')
-    expect(Faraday).to receive(:get).with("https://images.invalid/img.jpg", nil, range: "bytes=10-109").and_return(fake_resp)
+    expect(Faraday).to receive(:get).with('https://images.invalid/img.jpg', nil, range: 'bytes=10-109').and_return(fake_resp)
 
     rio.seek(10)
     read_result = rio.read(100)
@@ -27,36 +26,36 @@ describe FormatParser::RemoteIO do
   end
 
   it 'raises a specific error for all 4xx responses except 416' do
-    rio = described_class.new("https://images.invalid/img.jpg")
-    
+    rio = described_class.new('https://images.invalid/img.jpg')
+
     fake_resp = double(headers: {}, status: 403, body: 'Please log in')
-    expect(Faraday).to receive(:get).with("https://images.invalid/img.jpg", nil, range: "bytes=100-199").and_return(fake_resp)
+    expect(Faraday).to receive(:get).with('https://images.invalid/img.jpg', nil, range: 'bytes=100-199').and_return(fake_resp)
 
     rio.seek(100)
     expect { rio.read(100) }.to raise_error(/replied with a 403 and refused/)
   end
 
   it 'returns a nil when the range cannot be satisfied and the response is 416' do
-    rio = described_class.new("https://images.invalid/img.jpg")
-    
+    rio = described_class.new('https://images.invalid/img.jpg')
+
     fake_resp = double(headers: {}, status: 416, body: 'You jumped off the end of the file maam')
-    expect(Faraday).to receive(:get).with("https://images.invalid/img.jpg", nil, range: "bytes=100-199").and_return(fake_resp)
+    expect(Faraday).to receive(:get).with('https://images.invalid/img.jpg', nil, range: 'bytes=100-199').and_return(fake_resp)
 
     rio.seek(100)
     expect(rio.read(100)).to be_nil
   end
 
   it 'does not overwrite size when the range cannot be satisfied and the response is 416' do
-    rio = described_class.new("https://images.invalid/img.jpg")
+    rio = described_class.new('https://images.invalid/img.jpg')
 
     fake_resp = double(headers: {'Content-Range' => 'bytes 0-0/13'}, status: 206, body: 'a')
-    expect(Faraday).to receive(:get).with("https://images.invalid/img.jpg", nil, range: "bytes=0-0").and_return(fake_resp)
+    expect(Faraday).to receive(:get).with('https://images.invalid/img.jpg', nil, range: 'bytes=0-0').and_return(fake_resp)
     rio.read(1)
 
     expect(rio.size).to eq(13)
 
     fake_resp = double(headers: {}, status: 416, body: 'You jumped off the end of the file maam')
-    expect(Faraday).to receive(:get).with("https://images.invalid/img.jpg", nil, range: "bytes=100-199").and_return(fake_resp)
+    expect(Faraday).to receive(:get).with('https://images.invalid/img.jpg', nil, range: 'bytes=100-199').and_return(fake_resp)
 
     rio.seek(100)
     expect(rio.read(100)).to be_nil
@@ -65,22 +64,22 @@ describe FormatParser::RemoteIO do
   end
 
   it 'raises a specific error for all 5xx responses' do
-    rio = described_class.new("https://images.invalid/img.jpg")
-    
+    rio = described_class.new('https://images.invalid/img.jpg')
+
     fake_resp = double(headers: {}, status: 502, body: 'Guru meditation')
-    expect(Faraday).to receive(:get).with("https://images.invalid/img.jpg", nil, range: "bytes=100-199").and_return(fake_resp)
+    expect(Faraday).to receive(:get).with('https://images.invalid/img.jpg', nil, range: 'bytes=100-199').and_return(fake_resp)
 
     rio.seek(100)
     expect { rio.read(100) }.to raise_error(/replied with a 502 and we might want to retry/)
   end
 
   it 'maintains and exposes #pos' do
-    rio = described_class.new("https://images.invalid/img.jpg")
+    rio = described_class.new('https://images.invalid/img.jpg')
 
     expect(rio.pos).to eq(0)
 
     fake_resp = double(headers: {'Content-Range' => 'bytes 0-0/13'}, status: 206, body: 'a')
-    expect(Faraday).to receive(:get).with("https://images.invalid/img.jpg", nil, range: "bytes=0-0").and_return(fake_resp)
+    expect(Faraday).to receive(:get).with('https://images.invalid/img.jpg', nil, range: 'bytes=0-0').and_return(fake_resp)
     rio.read(1)
 
     expect(rio.pos).to eq(1)