qeweney 0.10 → 0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '048091b6174ddf88ab76f9676514db59d42a77d363db9be53d90e16235322ac7'
-  data.tar.gz: 8b346882f337e3b48bd8dd17dc2345458df6fc01c74a9a96d9d94bae31f2d841
+  metadata.gz: 3f515f9637f0d993c9dfbea4d425695f76915871ad0c62e090cbb31a4a57b4a7
+  data.tar.gz: 80a6bf6da6a0d2b85771deff0cb24ad9bcf389e4af37042a6fd62c215617a657
 SHA512:
-  metadata.gz: a1c9db7e7e6c494124f6306b3de4e43bd5d58d2148cef0bea8ef653598c2ba2e5fe3220b0009aa35d43085267572c0a0914db0cb568c2de93be89c66a97470af
-  data.tar.gz: '09693533b8686a6aeddb8d409434c3e3dfd212e04ff1364adcc79feb1c74c65d2526f087107374df366e96a1dc3edaf71b5876e69f10ac5886e5d41d0aec6e93'
+  metadata.gz: d08170e772a3fad93d49a06bc8ee6c656e5057e5368d3dfba6687d1f838dff50e7cfb8895315480f3f85ea519d8ee0ae20a3a480ee26293bd86bfec2c4912918
+  data.tar.gz: a1918424e95a70891eb4f8fb1b163cdf62167bb3847c16192be9f8dffd95c77513cca4f0e6d4a759275b14bc7891d770585b3625b4601177195ade7a731f6814

data/CHANGELOG.md

@@ -1,4 +1,26 @@
-## 0.10.0 2021-06-24
+## 0.14 2021-08-10
+
+- Fix Request#on with paths containing slashes
+
+## 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

data/Gemfile.lock

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

@@ -164,6 +164,8 @@ module Qeweney
     MAX_PARAMETER_VALUE_SIZE = 2**20 # 1MB
 
     def parse_urlencoded_form_data(body)
+      return {} unless body
+
       body.force_encoding(Encoding::UTF_8) unless body.encoding == Encoding::UTF_8
       body.split('&').each_with_object({}) do |i, m|
         raise 'Invalid parameter format' unless i =~ PARAMETER_RE

data/lib/qeweney/routing.rb

@@ -29,22 +29,24 @@ module Qeweney
       @path_parts.empty? ? '/' : "/#{@path_parts[@path_parts_idx..-1].join('/')}"
     end
 
-    def enter_route
-      @path_parts_idx += 1
+    def enter_route(depth = 1)
+      @path_parts_idx += depth
     end
 
-    def leave_route
-      @path_parts_idx -= 1
+    def leave_route(depth = 1)
+      @path_parts_idx -= depth
     end
 
-    def on(route = nil, &block)
-      if route
-        return unless @path_parts[@path_parts_idx] == route
-      end
+    def on(route, &block)
+      return route_found(&block) unless route
+      
+      route_parts = route.split('/')
+      route_length = route_parts.size
+      return unless @path_parts[@path_parts_idx, route_length] == route_parts
   
-      enter_route
+      enter_route(route_length)
       route_found(&block)
-      leave_route
+      leave_route(route_length)
     end
 
     def is(route = '/', &block)

data/lib/qeweney/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Qeweney
-  VERSION = '0.10'
+  VERSION = '0.14'
 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

data/test/test_routing.rb

@@ -114,4 +114,16 @@ class RoutingTest < MiniTest::Test
     assert_equal '/baz/d/e/f', default_relative_path
     assert_equal [[:respond, r, '/d/e/f', {}]], r.response_calls
   end
+
+  def test_well_known
+    app = Qeweney.route do |r|
+      r.on('.well-known/acme-challenge') { r.respond(r.route_relative_path) }
+      r.default { r.respond('not found') }
+    end
+
+    r = Qeweney.mock(':path' => '/.well-known/acme-challenge/foo')
+    app.(r)
+    assert_equal [[:respond, r, '/foo', {}]], r.response_calls
+  end
 end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qeweney
 version: !ruby/object:Gem::Version
-  version: '0.10'
+  version: '0.14'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-24 00:00:00.000000000 Z
+date: 2021-08-10 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