qeweney 0.9.0 → 0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fbf7ec4eb0c73fef2003190fd086c46fff0edc74ab4544c5a36b7d6fcce4041
-  data.tar.gz: 328254edf151b4ce1acc201438b315eb6569c96868b84b9160a2ed0ff0636870
+  metadata.gz: 742be1b1238ea117928a544134e57702776b707caf0cccdf68b74225ff3990d7
+  data.tar.gz: 357beb13e5f99b3f776de0a9e30447a034a647af208c1d69adedc118cabe8be1
 SHA512:
-  metadata.gz: 31ba2523f8ef5dd0155eaba082967b1a2ee97bea5f40b319c3b3110e9cb549032909a95c9a5147161ed2613a9c3f8688d81496286684876c614f0b185629232b
-  data.tar.gz: 2d2b4a3b7a30b6a6ec5fa83c95e2b19a37bad50ab195af011ca52f504f597069d4d3ef0a60e6553a99132baac506fe6e0be570532392557be207923125f47577
+  metadata.gz: 2b0249f07ce24a2acb3d9d20a9a43927de50217b9b27d23b911819c50ad6ca6312c395c966ebd57fda8db69908de392667ed3294ced76d4143b1ecbc37820cef
+  data.tar.gz: c80e535de1921e6b655a019c74a1a35fc808a9a7088ef368b84a485b42582d37d03ac9eb53250fd73277fe077cdd6c28ae6a4f60b814931fd6150f22ab929a42

data/CHANGELOG.md

@@ -1,3 +1,26 @@
+## 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
+
 ## 0.9.0 2021-05-14
 
 - Fix query parsing for fields with empty value

data/Gemfile.lock

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

@@ -6,8 +6,9 @@ require 'escape_utils'
 module Qeweney
   module RequestInfoMethods
     def host
-      @headers['host']
+      @headers['host'] || @headers[':authority']
     end
+    alias_method :authority, :host
 
     def connection
       @headers['connection']

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.0'
+  VERSION = '0.13'
 end

data/test/test_request_info.rb

@@ -29,9 +29,15 @@ class RequestInfoTest < MiniTest::Test
   def test_host
     r = Qeweney.mock(':path' => '/')
     assert_nil r.host
+    assert_nil r.authority
 
     r = Qeweney.mock('host' => 'my.example.com')
     assert_equal 'my.example.com', r.host
+    assert_equal 'my.example.com', r.authority
+
+    r = Qeweney.mock(':authority' => 'my.foo.com')
+    assert_equal 'my.foo.com', r.host
+    assert_equal 'my.foo.com', r.authority
   end
 
   def test_full_uri

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.0
+  version: '0.13'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-14 00:00:00.000000000 Z
+date: 2021-08-02 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.0.8
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Qeweney - cross library HTTP request / response API