qeweney 0.11 → 0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 256f14b402547865d5b7ce2357ef5ac79cd4f1f8e30129544450c7b8a60e39bb
-  data.tar.gz: 94ecbd44f44c1e858873315780ae0661237692a20396bf0a06b96497ea93f76a
+  metadata.gz: 742be1b1238ea117928a544134e57702776b707caf0cccdf68b74225ff3990d7
+  data.tar.gz: 357beb13e5f99b3f776de0a9e30447a034a647af208c1d69adedc118cabe8be1
 SHA512:
-  metadata.gz: 794a72410e59205ae66325aea81ee3d8a3b3e2bdaa7053118922e9a855f6d0e474d7d1e741787fe4b753a9c626e2672d9de4b95af14dc80c3f4a62175f72f0e5
-  data.tar.gz: 1775acaaa03ab16287f18dd18deb8d4720febcd2d13d1e502afbe8525a244921bb2b2946dee15da949f1aae9ed803275c2faf7b4675e4f6f6542554769ca0b94
+  metadata.gz: 2b0249f07ce24a2acb3d9d20a9a43927de50217b9b27d23b911819c50ad6ca6312c395c966ebd57fda8db69908de392667ed3294ced76d4143b1ecbc37820cef
+  data.tar.gz: c80e535de1921e6b655a019c74a1a35fc808a9a7088ef368b84a485b42582d37d03ac9eb53250fd73277fe077cdd6c28ae6a4f60b814931fd6150f22ab929a42

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.13 2021-08-02
+
+- Restore `Request#complete?` method
+- Add buffered_only argument to `Request#next_chunk`
+
+## 0.12 2021-07-30
+
+- Remove `Request#consume` method
+- Remove `Request#complete?` and associated methods
+
 ## 0.11 2021-07-26
 
 - Fix rack env (digital-fabric/tipi#11)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    qeweney (0.11)
+    qeweney (0.13)
       escape_utils (~> 1.2.1)
 
 GEM

data/README.md

@@ -1,4 +1,8 @@
-# Qeweney
+# Qeweney - add water, makes its own sauce!
+
+[![Gem Version](https://badge.fury.io/rb/qeweney.svg)](http://rubygems.org/gems/qeweney)
+[![Modulation Test](https://github.com/digital-fabric/qeweney/workflows/Tests/badge.svg)](https://github.com/digital-fabric/qeweney/actions?query=workflow%3ATests)
+[![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/digital-fabric/qeweney/blob/master/LICENSE)
 
 ## Cross-library HTTP request / response API for servers
 

data/lib/qeweney/rack.rb

@@ -67,12 +67,33 @@ module Qeweney
     end
   end
 
+  # TODO: integrate in env
+  # Implements a rack input stream:
+  # https://www.rubydoc.info/github/rack/rack/master/file/SPEC#label-The+Input+Stream
+  class InputStream
+    def initialize(request)
+      @request = request
+    end
+      
+    def gets; end
+      
+    def read(length = nil, outbuf = nil); end
+      
+    def each(&block)
+      @request.each_chunk(&block)
+    end
+      
+    def rewind; end
+  end
+
   def self.rack_env_from_request(request)
     Hash.new do |h, k|
       h[k] = rack_env_value_from_request(request, k)
     end
   end
 
+  # TODO: improve conformance to rack spec
+  # TODO: set values like port, scheme etc from actual connection
   RACK_ENV = {
     'SCRIPT_NAME'                    => '',
     'rack.version'                   => [1, 3],

data/lib/qeweney/request.rb

@@ -27,14 +27,16 @@ module Qeweney
       @buffered_body_chunks << chunk
     end
 
-    def next_chunk
+    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
 
-      @message_complete ? nil : @adapter.get_body_chunk(self)
+      @adapter.get_body_chunk(self, buffered_only)
     end
     
     def each_chunk
@@ -44,37 +46,19 @@ module Qeweney
         end
         @buffered_body_chunks = nil
       end
-      while !@message_complete && (chunk = @adapter.get_body_chunk(self))
+      while (chunk = @adapter.get_body_chunk(self))
         yield chunk
       end
     end
 
-    def complete!(keep_alive = nil)
-      @message_complete = true
-      @keep_alive = keep_alive
-    end
-    
-    def complete?
-      @message_complete
-    end
-    
-    def consume
-      @adapter.consume_request(self)
-    end
-    
-    def keep_alive?
-      @keep_alive
-    end
-    
     def read
-      buf = @buffered_body_chunks ? @buffered_body_chunks.join : nil
-      while (chunk = @adapter.get_body_chunk(self))
-        (buf ||= +'') << chunk
-      end
-      @buffered_body_chunks = nil
-      buf
+      @adapter.get_body(self)
     end
     alias_method :body, :read
+
+    def complete?
+      @adapter.complete?(self)
+    end
     
     def respond(body, headers = {})
       @adapter.respond(self, body, headers)

data/lib/qeweney/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Qeweney
-  VERSION = '0.11'
+  VERSION = '0.13'
 end

data/test/test_response.rb

@@ -179,7 +179,7 @@ class ServeRackTest < MiniTest::Test
     })
 
     assert_equal [
-      [:respond, r, 'get /foo/bar', {':status' => 404, 'Foo' => 'Bar' }]
+      [:respond, r, 'GET /foo/bar', {':status' => 404, 'Foo' => 'Bar' }]
     ], r.response_calls
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qeweney
 version: !ruby/object:Gem::Version
-  version: '0.11'
+  version: '0.13'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-26 00:00:00.000000000 Z
+date: 2021-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils