format_parser 1.6.0 → 2.0.0.pre

data/spec/remote_io_spec.rb

@@ -4,130 +4,186 @@ 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')
+    url = 'https://images.invalid/img.jpg'
+    response = Net::HTTPPartialContent.new('2', '206', 'Partial Content')
+    response['Content-Range'] = '10-109/2577'
+    allow(response).to receive(:body).and_return('Response body')
 
-    fake_resp = double(headers: {'Content-Range' => '10-109/2577'}, status: 206, body: 'This is the response')
-    faraday_conn = instance_double(Faraday::Connection, get: fake_resp)
-    allow(Faraday).to receive(:new).and_return(faraday_conn)
-    expect(faraday_conn).to receive(:get).with('https://images.invalid/img.jpg', nil, range: 'bytes=10-109')
+    allow(Net::HTTP).to receive(:start).and_yield(Net::HTTP).and_return(response)
+    allow(Net::HTTP).to receive(:request_get).and_return(response)
 
+    expect(Net::HTTP).to receive(:request_get).with(
+      an_object_satisfying { |uri| URI::HTTPS === uri && uri.to_s == url },
+      a_hash_including('range' => 'bytes=10-109')
+    )
+
+    rio = described_class.new(url)
     rio.seek(10)
     read_result = rio.read(100)
-    expect(read_result).to eq('This is the response')
+
+    expect(read_result).to eq(response.body)
   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')
+    url = 'https://images.invalid/img.jpg'
+    response = Net::HTTPOK.new('2', '200', 'OK')
+    allow(response).to receive(:body).and_return('Response body')
+
+    allow(Net::HTTP).to receive(:start).and_yield(Net::HTTP).and_return(response)
+    allow(Net::HTTP).to receive(:request_get).and_return(response)
 
-    fake_resp = double(headers: {'Content-Range' => '10-109/2577'}, status: 200, body: 'This is the response')
-    faraday_conn = instance_double(Faraday::Connection, get: fake_resp)
-    allow(Faraday).to receive(:new).and_return(faraday_conn)
-    expect(faraday_conn).to receive(:get).with('https://images.invalid/img.jpg', nil, range: 'bytes=10-109')
+    expect(Net::HTTP).to receive(:request_get).with(
+      an_object_satisfying { |uri| URI::HTTPS === uri && uri.to_s == url },
+      a_hash_including('range' => 'bytes=10-109')
+    )
 
+    rio = described_class.new(url)
     rio.seek(10)
     read_result = rio.read(100)
-    expect(read_result).to eq('This is the response')
+
+    expect(read_result).to eq(response.body)
   end
 
   it 'raises a specific error for all 4xx responses except 416' do
-    rio = described_class.new('https://images.invalid/img.jpg')
+    url = 'https://images.invalid/img.jpg'
+    response = Net::HTTPForbidden.new('2', '403', 'Forbidden')
+
+    allow(Net::HTTP).to receive(:start).and_yield(Net::HTTP).and_return(response)
+    allow(Net::HTTP).to receive(:request_get).and_return(response)
 
-    fake_resp = double(headers: {}, status: 403, body: 'Please log in')
-    faraday_conn = instance_double(Faraday::Connection, get: fake_resp)
-    allow(Faraday).to receive(:new).and_return(faraday_conn)
-    expect(faraday_conn).to receive(:get).with('https://images.invalid/img.jpg', nil, range: 'bytes=100-199')
+    expect(Net::HTTP).to receive(:request_get).with(
+      an_object_satisfying { |uri| uri.to_s == url },
+      a_hash_including('range' => 'bytes=100-199')
+    )
 
+    rio = described_class.new(url)
     rio.seek(100)
+
     expect { rio.read(100) }.to raise_error(/replied with a 403 and refused/)
   end
 
   it 'returns nil on a 416 response' do
-    rio = described_class.new('https://images.invalid/img.jpg')
+    url = 'https://images.invalid/img.jpg'
+    response = Net::HTTPRangeNotSatisfiable.new('2', '416', 'Range Not Satisfiable')
 
-    fake_resp = double(headers: {}, status: 416, body: 'You stepped off the ledge of the range')
-    faraday_conn = instance_double(Faraday::Connection, get: fake_resp)
-    allow(Faraday).to receive(:new).and_return(faraday_conn)
-    expect(faraday_conn).to receive(:get).with('https://images.invalid/img.jpg', nil, range: 'bytes=100-199')
+    allow(Net::HTTP).to receive(:start).and_yield(Net::HTTP).and_return(response)
+    allow(Net::HTTP).to receive(:request_get).and_return(response)
 
+    expect(Net::HTTP).to receive(:request_get).with(
+      an_object_satisfying { |uri| uri.to_s == url },
+      a_hash_including('range' => 'bytes=100-199')
+    )
+
+    rio = described_class.new(url)
     rio.seek(100)
+
     expect(rio.read(100)).to be_nil
   end
 
   it 'sets the status_code of the exception on a 4xx response from upstream' do
-    rio = described_class.new('https://images.invalid/img.jpg')
+    url = 'https://images.invalid/img.jpg'
+    response = Net::HTTPForbidden.new('2', '403', 'Forbidden')
+
+    allow(Net::HTTP).to receive(:start).and_yield(Net::HTTP).and_return(response)
+    allow(Net::HTTP).to receive(:request_get).and_return(response)
 
-    fake_resp = double(headers: {}, status: 403, body: 'Please log in')
-    faraday_conn = instance_double(Faraday::Connection, get: fake_resp)
-    allow(Faraday).to receive(:new).and_return(faraday_conn)
-    expect(faraday_conn).to receive(:get).with('https://images.invalid/img.jpg', nil, range: 'bytes=100-199')
+    expect(Net::HTTP).to receive(:request_get).with(
+      an_object_satisfying { |uri| uri.to_s == url },
+      a_hash_including('range' => 'bytes=100-199')
+    )
 
+    rio = described_class.new(url)
     rio.seek(100)
-    # rubocop: disable Lint/AmbiguousBlockAssociation
-    expect { rio.read(100) }.to raise_error { |e| expect(e.status_code).to eq(403) }
+    expect { rio.read(100) }.to(raise_error { |e| expect(e.status_code).to eq(403) })
   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')
+    url = 'https://images.invalid/img.jpg'
+    response = Net::HTTPRangeNotSatisfiable.new('2', '416', 'Range Not Satisfiable')
 
-    fake_resp = double(headers: {}, status: 416, body: 'You jumped off the end of the file maam')
-    faraday_conn = instance_double(Faraday::Connection, get: fake_resp)
-    allow(Faraday).to receive(:new).and_return(faraday_conn)
-    expect(faraday_conn).to receive(:get).with('https://images.invalid/img.jpg', nil, range: 'bytes=100-199')
+    allow(Net::HTTP).to receive(:start).and_yield(Net::HTTP).and_return(response)
+    allow(Net::HTTP).to receive(:request_get).and_return(response)
 
+    expect(Net::HTTP).to receive(:request_get).with(
+      an_object_satisfying { |uri| uri.to_s == url },
+      a_hash_including('range' => 'bytes=100-199')
+    )
+
+    rio = described_class.new(url)
     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')
-
-    fake_resp1 = double(headers: {'Content-Range' => 'bytes 0-0/13'}, status: 206, body: 'a')
-    fake_resp2 = double(headers: {}, status: 416, body: 'You jumped off the end of the file maam')
-
-    faraday_conn = instance_double(Faraday::Connection)
-    allow(Faraday).to receive(:new).and_return(faraday_conn)
-    expect(faraday_conn).to receive(:get)
-      .with('https://images.invalid/img.jpg', nil, range: 'bytes=0-0')
+    url = 'https://images.invalid/img.jpg'
+    response_1 = Net::HTTPPartialContent.new('2', '206', 'Partial Content')
+    response_1['Content-Range'] = 'bytes 0-0/13'
+    allow(response_1).to receive(:body).and_return('Response body')
+    response_2 = Net::HTTPRangeNotSatisfiable.new('2', '416', 'Range Not Satisfiable')
+
+    allow(Net::HTTP).to receive(:start).and_yield(Net::HTTP).and_return(response_1, response_2)
+    allow(Net::HTTP).to receive(:request_get).and_return(response_1, response_2)
+
+    expect(Net::HTTP).to receive(:request_get)
+      .with(
+        an_object_satisfying { |uri| uri.to_s == url },
+        a_hash_including('range' => 'bytes=0-0')
+      )
       .ordered
-      .and_return(fake_resp1)
-    expect(faraday_conn).to receive(:get)
-      .with('https://images.invalid/img.jpg', nil, range: 'bytes=100-199')
+    expect(Net::HTTP).to receive(:request_get)
+      .with(
+        an_object_satisfying { |uri| uri.to_s == url },
+        a_hash_including('range' => 'bytes=100-199')
+      )
       .ordered
-      .and_return(fake_resp2)
 
+    rio = described_class.new(url)
     rio.read(1)
 
     expect(rio.size).to eq(13)
 
     rio.seek(100)
-    expect(rio.read(100)).to be_nil
 
+    expect(rio.read(100)).to be_nil
     expect(rio.size).to eq(13)
   end
 
   it 'raises a specific error for all 5xx responses' do
-    rio = described_class.new('https://images.invalid/img.jpg')
+    url = 'https://images.invalid/img.jpg'
+    response = Net::HTTPBadGateway.new('2', '502', 'Bad Gateway')
+
+    allow(Net::HTTP).to receive(:start).and_yield(Net::HTTP).and_return(response)
+    allow(Net::HTTP).to receive(:request_get).and_return(response)
 
-    fake_resp = double(headers: {}, status: 502, body: 'Guru meditation')
-    faraday_conn = instance_double(Faraday::Connection, get: fake_resp)
-    allow(Faraday).to receive(:new).and_return(faraday_conn)
-    expect(faraday_conn).to receive(:get).with('https://images.invalid/img.jpg', nil, range: 'bytes=100-199')
+    expect(Net::HTTP).to receive(:request_get).with(
+      an_object_satisfying { |uri| uri.to_s == url },
+      a_hash_including('range' => 'bytes=100-199')
+    )
 
+    rio = described_class.new(url)
     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')
+    url = 'https://images.invalid/img.jpg'
+    response = Net::HTTPPartialContent.new('2', '206', 'Partial Content')
+    response['Content-Range'] = 'bytes 0-0/13'
+    allow(response).to receive(:body).and_return('a')
 
-    expect(rio.pos).to eq(0)
+    allow(Net::HTTP).to receive(:start).and_yield(Net::HTTP).and_return(response)
+    allow(Net::HTTP).to receive(:request_get).and_return(response)
 
-    fake_resp = double(headers: {'Content-Range' => 'bytes 0-0/13'}, status: 206, body: 'a')
-    faraday_conn = instance_double(Faraday::Connection, get: fake_resp)
-    allow(Faraday).to receive(:new).and_return(faraday_conn)
-    expect(faraday_conn).to receive(:get).with('https://images.invalid/img.jpg', nil, range: 'bytes=0-0')
-    rio.read(1)
+    expect(Net::HTTP).to receive(:request_get).with(
+      an_object_satisfying { |uri| uri.to_s == url },
+      a_hash_including('range' => 'bytes=0-0')
+    )
 
+    rio = described_class.new(url)
+    expect(rio.pos).to eq(0)
+    rio.read(1)
     expect(rio.pos).to eq(1)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: format_parser
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 2.0.0.pre
 platform: ruby
 authors:
 - Noah Berman
@@ -9,29 +9,12 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-21 00:00:00.000000000 Z
+date: 2022-10-13 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: ks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: exifr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.8
@@ -39,9 +22,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.8
@@ -49,9 +29,6 @@ dependencies:
   name: id3tag
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.14'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.2
@@ -59,126 +36,109 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.14'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.2
 - !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.13'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.13'
-- !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: ks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: measurometer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: parallel_tests
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: wetransfer_style
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: parallel_tests
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -232,6 +192,7 @@ files:
 - lib/parsers/aac_parser.rb
 - lib/parsers/aac_parser/adts_header_info.rb
 - lib/parsers/aiff_parser.rb
+- lib/parsers/arw_parser.rb
 - lib/parsers/bmp_parser.rb
 - lib/parsers/cr2_parser.rb
 - lib/parsers/dpx_parser.rb
@@ -262,6 +223,7 @@ files:
 - lib/read_limiter.rb
 - lib/read_limits_config.rb
 - lib/remote_io.rb
+- lib/string.rb
 - lib/text.rb
 - lib/video.rb
 - spec/active_storage/blob_io_spec.rb
@@ -278,6 +240,7 @@ files:
 - spec/parsers/aac_parser_spec.rb
 - spec/parsers/adts_header_info_spec.rb
 - spec/parsers/aiff_parser_spec.rb
+- spec/parsers/arw_parser_spec.rb
 - spec/parsers/bmp_parser_spec.rb
 - spec/parsers/cr2_parser_spec.rb
 - spec/parsers/dpx_parser_spec.rb
@@ -321,9 +284,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.6
 signing_key: