qeweney 0.9.1 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7607c9eba1cc73f966e3da34d266c40aa0dec6d9294da905b49f3b3efc628ff
-  data.tar.gz: 16c15a7655cab3ed23437ed6f1f12d63df3676d63145cfb75a0505de1b8b5f3b
+  metadata.gz: 54e76d6fe9d2c6490b00db19756306242b78465041f25e5771bedd630b6ad542
+  data.tar.gz: 791acd0d69d9a3d95d62e207127829a3509986870ffcf94bd1690ebc37a76ea0
 SHA512:
-  metadata.gz: 7ce90ffad9f012d33ebaf6a48100ad684151b1b62be47004fdc8d991e6e755755c15ce945a602d607d1124db962e7a49921e369d9c9dadb059c776ae7c94c175
-  data.tar.gz: 0b950d98a942954ae7c824c3a475eaaeb9752a6d7a854fbebd383a02afde1d703ddf530538900d5f79ba61eddc1ab8220a0e2b9e95c488be225170d62d7de296
+  metadata.gz: 7717cd77a46b8c13f496dcbeadf34af9ee7b5ba9173f8d3c638b46dc1cbdaabbda20045d59bb4a33b843145baf426ecc484df3b5ab9f018e5c9566116d4d4232
+  data.tar.gz: e42853c551362e72fff6a51be7f236fd958a26e4415c6b924022ea711ac10058a56864051fc542f3eb0c926a0013af8fbb30451235bac949dadfd6bc4255d15e

data/CHANGELOG.md

@@ -1,3 +1,26 @@
+## 0.13.1 2021-08-03
+
+- Fix `Request#read`
+
+## 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)
+
+## 0.10 2021-06-24
+
+- Include file stat in `#serve_io` options as hint for adapter
+- Fix `MimeTypes#[]` for empty extension
+
 ## 0.9.1 2021-06-14
 
 - Fix reading host from `:authority` header

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    qeweney (0.9.1)
+    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/mime_types.rb

@@ -19,12 +19,16 @@ module Qeweney
       'json'  => 'application/json',
     }.freeze
 
+    EXT_REGEXP = /\.?([^\.]+)$/.freeze
+
     def self.[](ref)
       case ref
       when Symbol
         TYPES[ref.to_s]
-      when /\.?([^\.]+)$/
+      when EXT_REGEXP
         TYPES[Regexp.last_match(1)]
+      when ''
+        nil
       else
         raise "Invalid argument #{ref.inspect}"
       end

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] = env_value_from_request(request, 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],
@@ -90,9 +111,11 @@ module Qeweney
     'rack.multipar.tempfile_factory' => nil
   }
   
-  def self.env_value_from_request(request, key)
+  HTTP_HEADER_RE = /^HTTP_(.+)$/.freeze
+
+  def self.rack_env_value_from_request(request, key)
     case key
-    when 'REQUEST_METHOD' then request.method
+    when 'REQUEST_METHOD' then request.method.upcase
     when 'PATH_INFO'      then request.path
     when 'QUERY_STRING'   then request.query_string || ''
     when 'SERVER_NAME'    then request.headers['host']

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,28 @@ 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
+      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
-      @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/response.rb

@@ -74,6 +74,7 @@ module Qeweney
       end
 
       mime_type = Qeweney::MimeTypes[File.extname(path)]
+      opts[:stat] = stat
       (opts[:headers] ||= {})['Content-Type'] ||= mime_type if mime_type
 
       respond_with_static_file(full_path, etag, last_modified, opts)

data/lib/qeweney/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Qeweney
-  VERSION = '0.9.1'
+  VERSION = '0.13.1'
 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.9.1
+  version: 0.13.1
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-14 00:00:00.000000000 Z
+date: 2021-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Qeweney - cross library HTTP request / response API