format_parser 2.0.0.pre.2 → 2.0.0.pre.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01730fd580c14a2c35b87be1f62384b06f9b2683bd07ba01ed21d21a4211b1f5
-  data.tar.gz: c27ba63f09c8251ccaf237040cb6f01c495686f6a025cdb7207aa0bfb2fe0098
+  metadata.gz: 296574f6c5b3d83cc13a222c9169eb1a0a53be4fd2bb28b08b72dab34cc3188f
+  data.tar.gz: 4d53f0a86a9361dc47263373e0f2169c2d6678848dd08d32cd826a8a4f198b50
 SHA512:
-  metadata.gz: 427c1f3652e33592a7bd3a63c0db676a865390b1947732e452905d0fe64f54df82af2b9a339dfdf962d9586c73fe7ac8a2b19da099c502a187efd8215993ddbf
-  data.tar.gz: 3652ca2c1ae42ddb5e29811dcae13e8bbb0fcf964c4f47547638e992d21612235bdf489d908b5c4bdf3aa2859768eb0dc98c6fc58527ce5031396ee341207354
+  metadata.gz: 9a8da6c14b682c38cbf491a013fb8c52a65f27ac8ae3f144e3c3eb88d95903b888fa69607f5e3d32b1b5aa8d0f76d369e0d42eed2841616e42e30a82103940cf
+  data.tar.gz: 49921898b361c4655a61cb7c3ef06fa2bc1eb94e0203088c6965c4dd0bd2b24436d33e59597696b9fa272eeb4f75d29d2b6c545fbb5bdcb950991f3e1b41a6b3

data/lib/format_parser/version.rb

@@ -1,3 +1,3 @@
 module FormatParser
-  VERSION = '2.0.0.pre.2'
+  VERSION = '2.0.0.pre.4'
 end

data/lib/remote_io.rb

@@ -103,12 +103,12 @@ class FormatParser::RemoteIO
   # @param uri[URI] The URI to fetch from
   # @param redirects[Integer] The amount of remaining permitted redirects
   # @return [[Integer, String]] The response body of the ranged request
-  def request_range(range, uri = @uri, redirects = REDIRECT_LIMIT)
+  def request_range(range, uri = @uri, headers = @headers.clone, redirects = REDIRECT_LIMIT)
     # We use a GET and not a HEAD request followed by a GET because
     # S3 does not allow HEAD requests if you only presigned your URL for GETs, so we
     # combine the first GET of a segment and retrieving the size of the resource
     response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == 'https') do |http|
-      http.request_get(uri, @headers.merge({ 'range' => 'bytes=%d-%d' % [range.begin, range.end] }))
+      http.request_get(uri, headers.merge({ 'range' => 'bytes=%d-%d' % [range.begin, range.end] }))
     end
     case response
     when Net::HTTPOK
@@ -146,8 +146,8 @@ class FormatParser::RemoteIO
       if location
         new_uri = redirect_uri(location, uri)
         # Clear the Authorization header if the new URI has a different host.
-        @headers.delete('Authorization') unless [@uri.scheme, @uri.host, @uri.port] == [new_uri.scheme, new_uri.host, new_uri.port]
-        request_range(range, new_uri, redirects - 1)
+        headers.delete('Authorization') unless [uri.scheme, uri.host, uri.port] == [new_uri.scheme, new_uri.host, new_uri.port]
+        request_range(range, new_uri, headers, redirects - 1)
       else
         raise InvalidRequest.new(response.code, "Server at #{uri} replied with a #{response.code}, indicating redirection; however, the location header was empty.")
       end

data/spec/remote_io_spec.rb

@@ -17,9 +17,8 @@ describe FormatParser::RemoteIO do
 
         rio = described_class.new(url)
         rio.seek(10)
-        read_result = rio.read(100)
 
-        expect(read_result).to eq(body)
+        expect(rio.read(100)).to eq(body)
         expect(stub).to have_been_requested
       end
     end
@@ -58,9 +57,8 @@ describe FormatParser::RemoteIO do
 
         rio = described_class.new(url)
         rio.seek(10)
-        read_result = rio.read(100)
 
-        expect(read_result).to eq(body)
+        expect(rio.read(100)).to eq(body)
         expect(stub).to have_been_requested
       end
 
@@ -119,9 +117,37 @@ describe FormatParser::RemoteIO do
 
             rio = described_class.new(redirecting_url, headers: { 'Authorization' => 'token' })
             rio.seek(10)
-            read_result = rio.read(100)
 
-            expect(read_result).to eq(body)
+            expect(rio.read(100)).to eq(body)
+            expect(redirect_stub).to have_been_requested
+            expect(destination_stub).to have_been_requested
+          end
+
+          it 'subsequent reads by the same object keep the Authorization header' do
+            redirecting_url = 'https://my_images.invalid/my_image'
+            destination_url = 'https://images.invalid/img.jpg'
+            body = 'response body'
+            auth_header = { 'Authorization' => 'token' }
+
+            redirect_stub = stub_request(:get, redirecting_url)
+              .with(headers: auth_header)
+              .to_return(headers: { 'location' => destination_url }, status: code)
+            destination_stub = stub_request(:get, destination_url)
+              .with { |request| !request.headers.key?('Authorization') }
+              .to_return(body: body, status: 200)
+
+            rio = described_class.new(redirecting_url, headers: auth_header)
+            rio.seek(10)
+            rio.read(100)
+
+            expect(redirect_stub).to have_been_requested
+            expect(destination_stub).to have_been_requested
+
+            WebMock.reset_executed_requests!
+
+            rio.seek(10)
+
+            expect(rio.read(100)).to eq(body)
             expect(redirect_stub).to have_been_requested
             expect(destination_stub).to have_been_requested
           end
@@ -145,9 +171,8 @@ describe FormatParser::RemoteIO do
 
             rio = described_class.new(redirecting_url, headers: { 'Authorization' => 'token' })
             rio.seek(10)
-            read_result = rio.read(100)
 
-            expect(read_result).to eq(body)
+            expect(rio.read(100)).to eq(body)
             expect(redirect_stub).to have_been_requested
             expect(destination_stub).to have_been_requested
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: format_parser
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.2
+  version: 2.0.0.pre.4
 platform: ruby
 authors:
 - Noah Berman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-31 00:00:00.000000000 Z
+date: 2022-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: exifr