format_parser 2.0.0.pre.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 898819bf7d61150f2e0ac11f880c4b36478e8ddd66d05631f844cd70515d168b
-  data.tar.gz: 9a0566ad6de66342ce88c3252ed2783eae2eda23180cd752bbef793fd9797499
+  metadata.gz: 8b7ea3319eba27d70e1945f6e8584e978a0e7b61b225fb651ad9d0e6daa649e0
+  data.tar.gz: 58c7ad6d34d8271cadad852cffcbdc252ba4b1ee2c0d0ac0d55d739845b7f2a9
 SHA512:
-  metadata.gz: 11a3e410f40f932d913bff00abd57f8f359e59ae44f648347dd565258589a3dabf263a0e076496cf2b47ee3902cf352e927d4eb3c8a7913fd699b86c379a9fc9
-  data.tar.gz: 24dde163c2074129e7896de322d53bf52dbb57a0b4d3db0db270e55b2c0bea5661f862a9f44e1c24953746f9629de78e3eeef7b9fe03db36690d9697a55ae0a7
+  metadata.gz: f7a5d3416c8f9aa1a58243ca183a3c0014979a6bfba4852fdbf7e46cc2b2bd5486160437b4db66ad39d64525324fb120bdca25928bbfcfef59ec57959ab22727
+  data.tar.gz: 829b4fb1d543691d1a7ca284eb21ab9238d101bc750399402034eaab39f87505eeee3d57a92eb15eede37d6176094b94d70fe21f2066f7b1ed2ecf22f57ccac8

data/CHANGELOG.md

@@ -1,5 +1,5 @@
-## 2.0.0.pre.2 (Prerelease)
-* Drop support for Ruby `<2.7`.
+## 2.0.0
+* Drop explicit support for Ruby `<2.7`.
 * Drop faraday dependencies.
 * Loosen version constraints on other dependencies.
 * Update measurometer metrics for consistency and clarity.

data/lib/format_parser/version.rb

@@ -1,3 +1,3 @@
 module FormatParser
-  VERSION = '2.0.0.pre.3'
+  VERSION = '2.0.0'
 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,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: format_parser
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Noah Berman
 - Julik Tarkhanov
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-31 00:00:00.000000000 Z
+date: 2022-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: exifr
@@ -287,7 +287,7 @@ licenses:
 - MIT (Hippocratic)
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -298,12 +298,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: A library for efficient parsing of file metadata
 test_files: []