Cleanup

Author: noteflakes

lib/syntropy/app.rb

@@ -497,7 +497,7 @@ def file_watcher_loop
         @module_loader.invalidate_fn(fn)
         debounce_file_change
       }
-      
+
 
 
       # Syntropy.file_watch(@machine, @root_dir, period: period) do |event, fn|

lib/syntropy/connection.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'stringio'
 require 'syntropy/errors'
 
 module Syntropy
@@ -117,7 +116,7 @@ def get_body(req)
       nil
     end
 
-    def get_body_chunk(req, _buffered_only = false)
+    def get_body_chunk(req)
       headers = req.headers
       content_length = headers['content-length']
       if content_length

lib/syntropy/request.rb

@@ -10,7 +10,7 @@ class Request
     include RequestInfoMethods
     include RequestValidationMethods
     include ResponseMethods
-    
+
     extend RequestInfoClassMethods
 
     attr_reader :headers, :adapter, :start_stamp, :route_params
@@ -30,45 +30,17 @@ def ctx
       @ctx ||= {}
     end
 
-    def buffer_body_chunk(chunk)
-      @buffered_body_chunks ||= []
-      @buffered_body_chunks << chunk
-    end
-
-    def next_chunk(buffered_only = false)
-      if @buffered_body_chunks
-        chunk = @buffered_body_chunks.shift
-        @buffered_body_chunks = nil if @buffered_body_chunks.empty?
-        return chunk
-      elsif buffered_only
-        return nil
-      end
-
-      @adapter.get_body_chunk(self, buffered_only)
+    def next_chunk
+      @adapter.get_body_chunk(self)
     end
 
     def each_chunk
-      if @buffered_body_chunks
-        while (chunk = @buffered_body_chunks.shift)
-          yield chunk
-        end
-        @buffered_body_chunks = nil
-      end
-      while (chunk = @adapter.get_body_chunk(self, false))
+      while (chunk = @adapter.get_body_chunk(self))
         yield chunk
       end
     end
 
     def read
-      if @buffered_body_chunks
-        body = @buffered_body_chunks.join
-        if !complete?
-          rest = @adapter.get_body(self)
-          body << rest if rest
-        end
-        @buffered_body_chunks = nil
-        return body
-      end
       @adapter.get_body(self)
     end
     alias_method :body, :read

lib/syntropy/request/mock_adapter.rb

@@ -4,7 +4,7 @@ module Syntropy
   class MockAdapter
     attr_reader :response_body, :response_headers, :calls
 
-    def get_body_chunk(_req, _buffered_only)
+    def get_body_chunk(_req)
       @request_body_chunks.shift
     end
 

lib/syntropy/request/response.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require 'time'
-require 'zlib'
-require 'stringio'
 require 'digest/sha1'
 
 require_relative './status'
@@ -94,29 +92,6 @@ def serve_io(io, opts)
       respond(io.read, opts[:headers] || {})
     end
 
-    def serve_io_deflate(io, opts)
-      deflate = Zlib::Deflate.new
-      headers = opts[:headers].merge(
-        'content-encoding' => 'deflate',
-        'vary' => 'Accept-Encoding'
-      )
-
-      respond(deflate.deflate(io.read, Zlib::FINISH), headers)
-    end
-
-    def serve_io_gzip(io, opts)
-      buf = StringIO.new
-      z = Zlib::GzipWriter.new(buf)
-      z << io.read
-      z.flush
-      z.close
-      headers = opts[:headers].merge(
-        'content-encoding' => 'gzip',
-        'vary' => 'Accept-Encoding'
-      )
-      respond(buf.string, headers)
-    end
-
     def respond_with_static_file(path, etag, last_modified, opts)
       cache_headers = (etag || last_modified) ? {
         'etag' => etag,

test/test_connection.rb

@@ -614,7 +614,7 @@ def test_set_cookie_single
     response = read_client_side(65536)
     expected = "HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\nSet-Cookie: foo=bar; HttpOnly\r\n\r\n3\r\nfoo\r\n0\r\n\r\n"
     assert_equal expected, response
-    
+
   end
 
   def test_set_cookie_multi1
@@ -628,7 +628,7 @@ def test_set_cookie_multi1
     response = read_client_side(65536)
     expected = "HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\nSet-Cookie: foo=bar; HttpOnly\r\nSet-Cookie: bar=baz\r\n\r\n3\r\nfoo\r\n0\r\n\r\n"
     assert_equal expected, response
-    
+
   end
 
   def test_set_cookie_multi2
@@ -644,6 +644,6 @@ def test_set_cookie_multi2
     response = read_client_side(65536)
     expected = "HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\nSet-Cookie: a=1\r\nSet-Cookie: b=2\r\nSet-Cookie: c=3\r\nSet-Cookie: d=4\r\nSet-Cookie: e=5\r\n\r\n3\r\nfoo\r\n0\r\n\r\n"
     assert_equal expected, response
-    
+
   end
 end