faraday-gzip 3.0.4-java → 3.2.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 572d4a3b5767f7d0f89a5031e7ed65060976e9f111875cf81c4db1a5f69e6a6c
-  data.tar.gz: 6d9a9e55c5870ff654fb22b44836a1f4122a75999c47d1f5e363b819bae93cf9
+  metadata.gz: 0d8f9a4bc695fe1e8491bae8587de4dd8c3ed06a91d1b10ec4ee81c9693f0014
+  data.tar.gz: bddebba78c0e055ba7fcbbb9aeab112799bbf0f97a56a30794f46de60b9bc4e9
 SHA512:
-  metadata.gz: 2656df1729e76798a57727dcdd7001ea3f387605d856ae0c04f99620f772cb2e49cd802f78c448c82f16ba59bae931765cdfd425845d9238889424064a7ba0cc
-  data.tar.gz: d99753de3bddb67ff002a27c51cc34ea21210255521fb9cd9f3c81e2e4dcfd56c8dc90cd28ba1d7d5edbf647ff8f893639457d35a5524a7cf6921eaf460e7fda
+  metadata.gz: d209f1785d541b3b54a89734c90629f35ee277bda57cd3602b41bf1e4594f6d6b7ccf31ec3fce0416515d1b7e998cad45c28a0522f2b19982b67e1dc47d0b152
+  data.tar.gz: 81ada8e6f8681f07c1e4b39fa13d62399a176ce22c5a8bf05ea3c420a796f5dc15d4afbd55f2689422f2ba8cd48dde68b9e933ad3135056037d38ff85b2d631f

data/CHANGELOG.md

@@ -1,8 +1,26 @@
 # Changelog
 
+## 3.2.0 (12-Oct-2026)
+
+- Moved development dependencies to `Gemfile` and improved SimpleCov compatibility across Ruby versions.
+- Simplified response decompression logic.
+- Prevented partial decompression when unsupported content encodings are present.
+- Preserved response headers for empty, non-string, and partial (`206`) responses.
+- Added support for concatenated gzip streams.
+- Added regression tests for encoding chains, partial responses, and concatenated gzip streams.
+- Fixed test helpers to properly initialize HTTP response environments.
+
+## 3.1.0 (05-Jan-2026)
+
+* Improve handling of edge cases and malformed `Content-Encoding` headers
+* Support multiple encodings and respect `identity` responses
+* Avoid modifying streaming and non-string response bodies
+* Normalize response headers after decompression
+* Update and expand test coverage, test with Ruby 4.0
+
 ## 3.0.4 (06-Apr-2025)
 
-* Require StringIO that might not always be readily available
+* Require `StringIO` that might not always be readily available
 
 ## 3.0.3 (25-Feb-2025)
 

data/README.md

@@ -3,12 +3,14 @@
 ![CI](https://github.com/bodrovis/faraday-gzip/actions/workflows/ci.yaml/badge.svg)
 [![Gem](https://img.shields.io/gem/v/faraday-gzip.svg?style=flat-square)](https://rubygems.org/gems/faraday-gzip)
 ![Gem Total Downloads](https://img.shields.io/gem/dt/faraday-gzip)
+[![Maintainability](https://qlty.sh/gh/bodrovis/projects/faraday-gzip/maintainability.svg)](https://qlty.sh/gh/bodrovis/projects/faraday-gzip)
+[![Code Coverage](https://qlty.sh/gh/bodrovis/projects/faraday-gzip/coverage.svg)](https://qlty.sh/gh/bodrovis/projects/faraday-gzip)
 
-The `Gzip` middleware for Faraday 1 and 2 adds the necessary `Accept-Encoding` headers and automatically decompresses the response. If the "Accept-Encoding" header isn't set in the request, it defaults to `gzip,deflate` and appropriately handles the server's compressed response. This functionality resembles what Ruby does internally in `Net::HTTP#get`. If [Brotli](https://github.com/miyucy/brotli) is included in your Gemfile, the middleware also adds `br` to the header for Brotli support.
+The `Gzip` middleware for Faraday 1 and 2 adds appropriate `Accept-Encoding` request headers and automatically decompresses supported response bodies (`gzip`, `deflate`, and optionally `br`). If the `Accept-Encoding` header is not explicitly set, it defaults to `gzip,deflate` and includes `br` when [Brotli](https://github.com/miyucy/brotli) support is available. The middleware safely handles multiple and malformed `Content-Encoding` headers, and avoids modifying unsupported or streaming response bodies. This behavior is similar in spirit to Ruby's internal handling in `Net::HTTP#get`, while remaining conservative to preserve compatibility with Faraday adapters.
 
 ## Prerequisites
 
-* faraday-gzip v3 supports only Faraday v2 and is tested with Ruby 3.0+ and JRuby 9.4
+* faraday-gzip v3 supports only Faraday v2 and is tested with Ruby 3.0+ and JRuby 9.4+
 * [faraday-gzip v2](https://github.com/bodrovis/faraday-gzip/tree/v2) supports Faraday v1 and v2 and is tested with Ruby 2.7+ and JRuby 9.4.
 
 ## Installation

data/lib/faraday/gzip/middleware.rb

@@ -13,6 +13,11 @@ module Faraday
   module Gzip
     # Faraday middleware for decompression
     class Middleware < Faraday::Middleware
+      ACCEPT_ENCODING  = 'Accept-Encoding'
+      CONTENT_ENCODING = 'Content-Encoding'
+      CONTENT_LENGTH   = 'Content-Length'
+      IDENTITY         = 'identity'
+
       # System method required by Faraday
       def self.optional_dependency(lib = nil)
         lib ? require(lib) : yield
@@ -31,9 +36,6 @@ module Faraday
         encodings
       end
 
-      ACCEPT_ENCODING = 'Accept-Encoding'
-      CONTENT_ENCODING = 'Content-Encoding'
-      CONTENT_LENGTH = 'Content-Length'
       SUPPORTED_ENCODINGS = supported_encodings.join(',').freeze
 
       # Main method to process the response
@@ -47,32 +49,31 @@ module Faraday
 
       # Finds a proper processor
       def find_processor(response_env)
-        if empty_body?(response_env)
-          ->(body) { raw_body(body) }
-        else
-          processors[response_env[:response_headers][CONTENT_ENCODING]]
-        end
+        encodings = parse_content_encoding(
+          response_env[:response_headers][CONTENT_ENCODING]
+        )
+        return nil if skip_decompression?(response_env, encodings)
+
+        chain = processor_chain(encodings)
+        return nil if chain.empty?
+
+        ->(body) { chain.reduce(body) { |acc, fn| fn.call(acc) } }
       end
 
       # Calls the proper processor to decompress body
       def reset_body(env, processor)
         return if processor.nil?
 
-        env[:body] = processor.call(env[:body])
-        env[:response_headers].delete(CONTENT_ENCODING)
+        body = processor.call(env[:body])
 
-        env[:response_headers][CONTENT_LENGTH] = env[:body].nil? ? 0 : env[:body].length
+        env[:body] = body
+        env[:response_headers][CONTENT_LENGTH] = body.bytesize
+        env[:response_headers].delete(CONTENT_ENCODING)
       end
 
       # Process gzip
       def uncompress_gzip(body)
-        io = StringIO.new(body)
-        gzip_reader = Zlib::GzipReader.new(io, encoding: 'ASCII-8BIT')
-        begin
-          gzip_reader.read
-        ensure
-          gzip_reader.close
-        end
+        Zlib::GzipReader.zcat(StringIO.new(body))
       end
 
       # Process deflate
@@ -95,23 +96,40 @@ module Faraday
         Brotli.inflate(body)
       end
 
-      # Do not process anything, leave body as is
-      def raw_body(body)
-        body
+      private
+
+      def skip_decompression?(env, encodings)
+        body = env[:body]
+
+        return true unless body.is_a?(String) && !body.empty?
+        return true if env[:status] == 206
+
+        encodings.empty? || encodings.include?(IDENTITY)
       end
 
-      private
+      def parse_content_encoding(value)
+        return [] if value.nil?
+
+        value.to_s
+             .split(',')
+             .map { |v| v.strip.downcase }
+             .reject(&:empty?)
+      end
+
+      # Decode in reverse order of application:
+      # "gzip, br"  => br -> gzip
+      # If the encoding is unknown, do not touch the content
+      def processor_chain(encodings)
+        return [] unless encodings.all? { |enc| processors[enc] }
 
-      def empty_body?(response_env)
-        response_env[:body].nil? || response_env[:body].empty?
+        encodings.reverse.map { |enc| processors[enc] }
       end
 
-      # Method providing the processors
       def processors
         @processors ||= {
           'gzip' => ->(body) { uncompress_gzip(body) },
           'deflate' => ->(body) { inflate(body) },
-          'br' => ->(body) { brotli_inflate(body) }
+          'br' => (BROTLI_SUPPORTED ? ->(body) { brotli_inflate(body) } : nil)
         }
       end
     end

data/lib/faraday/gzip/version.rb

@@ -2,6 +2,6 @@
 
 module Faraday
   module Gzip
-    VERSION = '3.0.4'
+    VERSION = '3.2.0'
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: faraday-gzip
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.2.0
 platform: java
 authors:
 - Ilya Krukowski
 bindir: bin
 cert_chain: []
-date: 2025-04-06 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -29,104 +29,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.22'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.22'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.32'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.32'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 description: 'Faraday plugin to automatically set compression headers (GZip, Deflate,
   Brotli) and decompress the response.
 
@@ -149,7 +51,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/bodrovis/faraday-gzip/issues
   changelog_uri: https://github.com/bodrovis/faraday-gzip/blob/master/CHANGELOG.md
-  documentation_uri: http://www.rubydoc.info/gems/faraday-gzip/3.0.4
+  documentation_uri: https://www.rubydoc.info/gems/faraday-gzip/3.2.0
   source_code_uri: https://github.com/bodrovis/faraday-gzip
   rubygems_mfa_required: 'true'
 rdoc_options: []
@@ -166,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 4.0.21
 specification_version: 4
 summary: Automatically sets compression headers and decompresses the response
 test_files: []