removed the compression modules from the transcoders, using them directly in the plugin, rewrote the encoder to be more interchangeable

lib/httpx/plugins/compression.rb

@@ -15,11 +15,22 @@ module HTTPX
         end
       end
 
+      module RequestBodyMethods
+        def initialize(*)
+          super
+          return if @body.nil?
+          @headers.get("content-encoding").each do |encoding|
+            @body = Encoder.new(@body, Compression.registry(encoding).encoder)
+          end
+          @headers["content-length"] = @body.bytesize unless chunked?
+        end
+      end
+
       module ResponseBodyMethods
         def initialize(*)
           super
           @_decoders = @headers.get("content-encoding").map do |encoding|
-            Transcoder.registry(encoding).decoder
+            Compression.registry(encoding).decoder
           end
           @_compressed_length = if @headers.key?("content-length")
             @headers["content-length"].to_i
@@ -50,6 +61,47 @@ module HTTPX
         end 
       end
        
+      class Encoder
+        def initialize(body, deflater)
+          @body = body.respond_to?(:read) ? body : StringIO.new(body.to_s)
+          @buffer = StringIO.new("".b, File::RDWR)
+          @deflater = deflater 
+        end
+
+        def each(&blk)
+          return enum_for(__method__) unless block_given?
+          unless @buffer.size.zero?
+            @buffer.rewind
+            return @buffer.each(&blk)
+          end
+          deflate(&blk)
+        end
+
+        def bytesize
+          deflate
+          @buffer.size
+        end
+
+        def to_s
+          deflate
+          @buffer.rewind
+          @buffer.read
+        end
+
+        def close
+          @buffer.close
+          @body.close
+        end
+
+        private
+
+        def deflate(&blk)
+          return unless @buffer.size.zero?
+          @body.rewind
+          @deflater.deflate(@body, @buffer, chunk_size: 16_384, &blk)
+        end
+      end
+
       class Decoder
         extend Forwardable
 
@@ -65,41 +117,6 @@ module HTTPX
           @inflater.inflate(chunk)
         end
       end
-
-      class CompressEncoder
-        attr_reader :content_type
-
-        def initialize(raw, encoder)
-          @content_type = raw.content_type
-          @raw = raw.respond_to?(:read) ? raw : StringIO.new(raw.to_s)
-          @buffer = StringIO.new("".b, File::RDWR)
-          @encoder = encoder
-        end
-
-        def each(&blk)
-          return enum_for(__method__) unless block_given?
-          unless @buffer.size.zero?
-            @buffer.rewind
-            return @buffer.each(&blk)
-          end
-          @encoder.compress(@raw, @buffer, chunk_size: 16_384, &blk)
-        end
-
-        def to_s
-          compress
-          @buffer.rewind
-          @buffer.read
-        end
-
-        def bytesize
-          @encoder.compress(@raw, @buffer, chunk_size: 16_384)
-          @buffer.size
-        end
-
-        def close
-          # @buffer.close
-        end
-      end
     end
     register_plugin :compression, Compression
   end

lib/httpx/plugins/compression/brotli.rb

@@ -11,16 +11,13 @@ module HTTPX
         end
 
         def self.configure(*)
-          Transcoder.register "br", BrotliTranscoder
           Compression.register "br", self 
         end
 
         module Encoder
           module_function
 
-          def compress(raw, buffer, chunk_size: )
+          def deflate(raw, buffer, chunk_size: )
-            return unless buffer.size.zero?
-            raw.rewind
             begin
               while chunk = raw.read(chunk_size)
                 compressed = ::Brotli.deflate(chunk)
@@ -43,11 +40,10 @@ module HTTPX
           end
         end
 
-        module BrotliTranscoder
         module_function
         
-          def encode(payload)
+        def encoder
-            CompressEncoder.new(payload, Encoder)
+          Encoder
         end
         
         def decoder 
@@ -55,7 +51,6 @@ module HTTPX
         end
       end
     end
-    end
     register_plugin :"compression/brotli", Compression::Brotli
   end
 end

lib/httpx/plugins/compression/deflate.rb

@@ -10,17 +10,13 @@ module HTTPX
         end
 
         def self.configure(*)
-          Transcoder.register "deflate", DeflateTranscoder
           Compression.register "deflate", self 
         end
 
-        module DeflateTranscoder
         module Encoder
           module_function
 
-            def compress(raw, buffer, chunk_size: )
+          def deflate(raw, buffer, chunk_size: )
-              return unless buffer.size.zero?
-              raw.rewind
             begin
               deflater = Zlib::Deflate.new(Zlib::BEST_COMPRESSION,
                                            Zlib::MAX_WBITS,
@@ -42,8 +38,8 @@ module HTTPX
 
         module_function
 
-          def encode(payload)
+        def encoder
-            CompressEncoder.new(payload, Encoder)
+          Encoder
         end
 
         def decoder
@@ -51,7 +47,6 @@ module HTTPX
         end
       end
     end
-    end
     register_plugin :"compression/deflate", Compression::Deflate
   end
 end

lib/httpx/plugins/compression/gzip.rb

@@ -11,15 +11,11 @@ module HTTPX
         end
 
         def self.configure(*)
-          Transcoder.register "gzip", GZIPTranscoder
           Compression.register "gzip", self 
         end
 
-        module GZIPTranscoder
         class Encoder
-            def compress(raw, buffer, chunk_size: )
+          def deflate(raw, buffer, chunk_size: )
-              return unless buffer.size.zero?
-              raw.rewind
             begin
               gzip = Zlib::GzipWriter.new(self)
 
@@ -52,8 +48,8 @@ module HTTPX
 
         module_function
         
-          def encode(payload)
+        def encoder
-            CompressEncoder.new(payload, Encoder.new)
+          Encoder.new
         end
         
         def decoder
@@ -61,7 +57,6 @@ module HTTPX
         end
       end
     end
-    end
     register_plugin :"compression/gzip", Compression::GZIP 
   end
 end