qeweney 0.7.3 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8410ab97bb9ce59f14cd87659fa5eeb77595f2a4a1fad873392e403d0b27a80a
-  data.tar.gz: 5b8404bf25b0b23cb72f0e3e919245d7f41361b692601f0e1bf5b208bc0215ed
+  metadata.gz: 5df52e7e0b995f2e515f13dd405b8113f82c9ff56029fc7124e6c72bb1782354
+  data.tar.gz: 64f53dd7900143576734f6d05942dd8bea23dcec3f3f913f48f384ea6c1928a8
 SHA512:
-  metadata.gz: 5ec5cb26a660c15cd465c04597c8135857f18b5cf8f706582243e3406f9163038c515d4d7a13678777ad71ab4c6fe26b11b35df8d27673316cf423f844c0529d
-  data.tar.gz: 85d6961f2eb42cf6d7299318e24dbf0ac697a89051667be99fc485b1359c0a0365eabeb69bbe2744d70bbefe9bcbce0226a1cf37196480defc7a6845572963e8
+  metadata.gz: 5d932768bd895b3dcbcc72ebad4ef37cb5ed5a02db856af446bc24face24d515715515a12a4617d0f070ef579aa6cbdf95dd17e9dc3d83fceb322c9b595c47df
+  data.tar.gz: cc0c52ffe47b2ae0244660e02c66929f48a97093f30de028b0364c45285d6b667011e74aa14d8be847cb5f16f221630f16ee8751af940273f986a8668033d2be

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+## 0.8.2 2021-03-17
+
+- Fix form parsing when charset is specified
+
+## 0.8.1 2021-03-10
+
+- Add `Request#transfer_counts`, `Request#total_transfer`
+- Fix `Request#rx_incr`
+
+## 0.8 2021-03-10
+
+- Pass request as first argument to all adapter methods
+
+## 0.7.5 2021-03-08
+
+- Set content-type header in `#serve_file`
+
+## 0.7.4 2021-03-07
+
+- Add `Request#cookies`
+- Add `Request#full_uri`
+
 ## 0.7.3 2021-03-05
 
 - Fix `parse_urlencoded_form_data`

data/Gemfile.lock

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

data/README.md

@@ -1,11 +1,71 @@
 # Qeweney
 
-## Cross-library feature rich HTTP request / response API
+## Cross-library HTTP request / response API for servers
 
-Qeweney provides a uniform API for dealing with HTTP requests and responses.
+Qeweney provides a uniform API for dealing with HTTP requests and responses on
+the server side. Qeweney defines a uniform adapter interface that allows
+handling incoming HTTP requests and sending HTTP responses over any protocol or
+transport, be it HTTP/1, HTTP/2 or a Rack interface.
+
+Qeweney is primarily designed to work with
+[Tipi](https://github.com/digital-fabric/tipi), but can also be used directly
+inside Rack apps, or to drive Rack apps.
 
 ## Features
 
-- Works with different web server APIs, notably Tipi, Digital Fabric, and Rack
-- Transport-agnostic
-- High-performance routing API inspired by Roda
+- Works with different web server APIs, notably Tipi, Digital Fabric, and Rack.
+- Transport-agnostic.
+- High-performance routing API inspired by Roda.
+- Rich API for extracting data from HTTP requests: form parsing, cookies, file
+  uploads, etc.
+- Rich API for constructing HTTP responses: streaming responses, HTTP upgrades,
+  static file serving, delate and gzip encoding, caching etc.
+- Suitable for both blocking and non-blocking concurrency models.
+- Allows working with request before request body is read and parsed.
+
+## Overview
+
+In Qeweney, the main class developers will interact with is `Qeweney::Request`,
+which encapsulates an HTTP request (from the server's point of view), and offers
+an API for extracting request information and responding to that request.
+
+A request is always associated with an _adapter_, an object that implements the
+Qeweney adapter interface, and that allows reading request bodies (for uploads
+and form submissions) and sending responses.
+
+## The Qeweney Adapter Interface
+
+```ruby
+class AdapterInterface
+  # Reads a chunk from the request body
+  # @req [Qeweney::Request] request for which the chunk is to be read
+  def get_body_chunk(req)
+  end
+
+  # Send a non-streaming response
+  # @req [Qeweney::Request] request for which the response is sent
+  # @body [String, nil] response body
+  # @headers [Hash] response headers
+  def respond(req, body, headers)
+  end
+
+  # Send only headers
+  # @req [Qeweney::Request] request for which the response is sent
+  # @headers [Hash] response headers
+  # @empty_response [boolean] whether response is empty
+  def send_headers(req, headers, empty_response: nil)
+  end
+
+  # Send a body chunk (this implies chunked transfer encoding)
+  # @req [Qeweney::Request] request for which the response is sent
+  # @body [String, nil] chunk
+  # @done [boolean] whether response is finished
+  def send_chunk(req, body, done: false)
+  end
+
+  # Finishes response
+  # @req [Qeweney::Request] request for which the response is sent
+  def finish(req)
+  end
+end
+```

data/lib/qeweney/mime_types.rb

@@ -7,7 +7,7 @@ module Qeweney
       'html'  => 'text/html',
       'css'   => 'text/css',
       'js'    => 'application/javascript',
-      'txt'   => 'text/plain'
+      'txt'   => 'text/plain',
 
       'gif'   => 'image/gif',
       'jpg'   => 'image/jpeg',
@@ -19,7 +19,7 @@ module Qeweney
       'json'  => 'application/json',
     }.freeze
 
-    def [](ref)
+    def self.[](ref)
       case ref
       when Symbol
         TYPES[ref.to_s]

data/lib/qeweney/rack.rb

@@ -32,20 +32,20 @@ module Qeweney
       headers
     end
 
-    def respond(body, headers)
+    def respond(req, body, headers)
       @response_body << body
       @response_headers = headers
     end
 
-    def send_headers(headers, empty_response: nil)
+    def send_headers(req, headers, empty_response: nil)
       @response_headers = headers
     end
 
-    def send_chunk(body, done: false)
+    def send_chunk(req, body, done: false)
       @response_body << body
     end
 
-    def finish
+    def finish(req)
     end
 
     def rack_response

data/lib/qeweney/request.rb

@@ -34,7 +34,7 @@ module Qeweney
         return chunk
       end
 
-      @message_complete ? nil : @adapter.get_body_chunk
+      @message_complete ? nil : @adapter.get_body_chunk(self)
     end
     
     def each_chunk
@@ -44,7 +44,7 @@ module Qeweney
         end
         @buffered_body_chunks = nil
       end
-      while !@message_complete && (chunk = @adapter.get_body_chunk)
+      while !@message_complete && (chunk = @adapter.get_body_chunk(self))
         yield chunk
       end
     end
@@ -59,7 +59,7 @@ module Qeweney
     end
     
     def consume
-      @adapter.consume_request
+      @adapter.consume_request(self)
     end
     
     def keep_alive?
@@ -68,7 +68,7 @@ module Qeweney
     
     def read
       buf = @buffered_body_chunks ? @buffered_body_chunks.join : nil
-      while (chunk = @adapter.get_body_chunk)
+      while (chunk = @adapter.get_body_chunk(self))
         (buf ||= +'') << chunk
       end
       @buffered_body_chunks = nil
@@ -77,7 +77,7 @@ module Qeweney
     alias_method :body, :read
     
     def respond(body, headers = {})
-      @adapter.respond(body, headers)
+      @adapter.respond(self, body, headers)
       @headers_sent = true
     end
     
@@ -85,24 +85,40 @@ module Qeweney
       return if @headers_sent
       
       @headers_sent = true
-      @adapter.send_headers(headers, empty_response: empty_response)
+      @adapter.send_headers(self, headers, empty_response: empty_response)
     end
     
     def send_chunk(body, done: false)
       send_headers({}) unless @headers_sent
       
-      @adapter.send_chunk(body, done: done)
+      @adapter.send_chunk(self, body, done: done)
     end
     alias_method :<<, :send_chunk
     
     def finish
       send_headers({}) unless @headers_sent
       
-      @adapter.finish
+      @adapter.finish(self)
     end
 
     def headers_sent?
       @headers_sent
     end
+
+    def rx_incr(count)
+      headers[':rx'] ? headers[':rx'] += count : headers[':rx'] = count
+    end
+
+    def tx_incr(count)
+      headers[':tx'] ? headers[':tx'] += count : headers[':tx'] = count
+    end
+
+    def transfer_counts
+      [headers[':rx'], headers[':tx']]
+    end
+
+    def total_transfer
+      (headers[':rx'] || 0) + (headers[':tx'] || 0)
+    end
   end
 end

data/lib/qeweney/request_info.rb

@@ -37,6 +37,10 @@ module Qeweney
       @uri ||= URI.parse(@headers[':path'] || '')
     end
     
+    def full_uri
+      @full_uri = "#{scheme}://#{host}#{uri}"
+    end
+    
     def path
       @path ||= uri.path
     end
@@ -74,15 +78,33 @@ module Qeweney
 
       encoding.split(',').map { |i| i.strip }
     end
+
+    def cookies
+      @cookies ||= parse_cookies(headers['cookie'])
+    end
+
+    COOKIE_RE = /^([^=]+)=(.*)$/.freeze
+    SEMICOLON = ';'
+  
+    def parse_cookies(cookies)
+      return {} unless cookies
+
+      cookies.split(SEMICOLON).each_with_object({}) do |c, h|
+        raise BadRequestError, 'Invalid cookie format' unless c.strip =~ COOKIE_RE
+  
+        key, value = Regexp.last_match[1..2]
+        h[key] = EscapeUtils.unescape_uri(value)
+      end
+    end
   end
 
   module RequestInfoClassMethods
     def parse_form_data(body, headers)
       case (content_type = headers['content-type'])
-      when /multipart\/form\-data; boundary=([^\s]+)/
+      when /^multipart\/form\-data; boundary=([^\s]+)/
         boundary = "--#{Regexp.last_match(1)}"
         parse_multipart_form_data(body, boundary)
-      when 'application/x-www-form-urlencoded'
+      when /^application\/x-www-form-urlencoded/
         parse_urlencoded_form_data(body)
       else
         raise "Unsupported form data content type: #{content_type}"

data/lib/qeweney/response.rb

@@ -6,6 +6,7 @@ require 'stringio'
 require 'digest/sha1'
 
 require_relative 'status'
+require_relative 'mime_types'
 
 module Qeweney
   module StaticFileCaching
@@ -59,7 +60,7 @@ module Qeweney
       redirect(secure_uri, status)
     end
 
-    def serve_file(path, opts)
+    def serve_file(path, opts = {})
       full_path = file_full_path(path, opts)
       stat = File.stat(full_path)
       etag = StaticFileCaching.file_stat_to_etag(stat)
@@ -72,17 +73,25 @@ module Qeweney
         })
       end
 
+      mime_type = Qeweney::MimeTypes[File.extname(path)]
+      (opts[:headers] ||= {})['Content-Type'] ||= mime_type if mime_type
+
       respond_with_static_file(full_path, etag, last_modified, opts)
     rescue Errno::ENOENT => e
       respond(nil, ':status' => Status::NOT_FOUND)
     end
 
     def respond_with_static_file(path, etag, last_modified, opts)
+      cache_headers = {
+        'etag' => etag,
+        'last-modified' => last_modified,
+      }
       File.open(path, 'r') do |f|
-        opts = opts.merge(headers: {
-          'etag' => etag,
-          'last-modified' => last_modified,
-        })
+        if opts[:headers]
+          opts[:headers].merge!(cache_headers)
+        else
+          opts[:headers] = cache_headers
+        end
 
         # accept_encoding should return encodings in client's order of preference
         accept_encoding.each do |encoding|
@@ -150,6 +159,7 @@ module Qeweney
 
       # TODO: send separate chunks for multi-part body
       # TODO: add support for streaming body
+      # TODO: add support for websocket
     end
   end
 end

data/lib/qeweney/version.rb

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

data/test/test_request_info.rb

@@ -20,4 +20,30 @@ class RequestInfoTest < MiniTest::Test
     r = Qeweney.mock('host' => 'my.example.com')
     assert_equal 'my.example.com', r.host
   end
+
+  def test_full_uri
+    r = Qeweney.mock(
+      ':scheme' => 'https',
+      'host' => 'foo.bar',
+      ':path' => '/hey?a=b&c=d'
+    )
+
+    assert_equal 'https://foo.bar/hey?a=b&c=d', r.full_uri
+  end
+
+  def test_cookies
+    r = Qeweney.mock
+
+    assert_equal({}, r.cookies)
+
+    r = Qeweney.mock(
+      'cookie' => 'uaid=a%2Fb; lastLocus=settings; signin_ref=/'
+    )
+
+    assert_equal({
+      'uaid' => 'a/b',
+      'lastLocus' => 'settings',
+      'signin_ref' => '/'
+    }, r.cookies)
+  end
 end

data/test/test_response.rb

@@ -8,7 +8,7 @@ class RedirectTest < MiniTest::Test
     r.redirect('/foo')
 
     assert_equal [
-      [:respond, nil, {":status"=>302, "Location"=>"/foo"}]
+      [:respond, r, nil, {":status"=>302, "Location"=>"/foo"}]
     ], r.response_calls
   end
 
@@ -17,7 +17,7 @@ class RedirectTest < MiniTest::Test
     r.redirect('/bar', Qeweney::Status::MOVED_PERMANENTLY)
 
     assert_equal [
-      [:respond, nil, {":status"=>301, "Location"=>"/bar"}]
+      [:respond, r, nil, {":status"=>301, "Location"=>"/bar"}]
     ], r.response_calls
   end
 end
@@ -37,7 +37,7 @@ class StaticFileResponeTest < MiniTest::Test
     r.serve_file('helper.rb', base_path: __dir__)
 
     assert_equal [
-      [:respond, @content, { 'etag' => @etag, 'last-modified' => @last_modified }]
+      [:respond, r, @content, { 'etag' => @etag, 'last-modified' => @last_modified }]
     ], r.response_calls
   end
 
@@ -45,25 +45,25 @@ class StaticFileResponeTest < MiniTest::Test
     r = Qeweney.mock('if-none-match' => @etag)
     r.serve_file('helper.rb', base_path: __dir__)
     assert_equal [
-      [:respond, nil, { 'etag' => @etag, ':status' => Qeweney::Status::NOT_MODIFIED }]
+      [:respond, r, nil, { 'etag' => @etag, ':status' => Qeweney::Status::NOT_MODIFIED }]
     ], r.response_calls
 
     r = Qeweney.mock('if-modified-since' => @last_modified)
     r.serve_file('helper.rb', base_path: __dir__)
     assert_equal [
-      [:respond, nil, { 'etag' => @etag, ':status' => Qeweney::Status::NOT_MODIFIED }]
+      [:respond, r, nil, { 'etag' => @etag, ':status' => Qeweney::Status::NOT_MODIFIED }]
     ], r.response_calls
 
     r = Qeweney.mock('if-none-match' => 'foobar')
     r.serve_file('helper.rb', base_path: __dir__)
     assert_equal [
-      [:respond, @content, { 'etag' => @etag, 'last-modified' => @last_modified }]
+      [:respond, r, @content, { 'etag' => @etag, 'last-modified' => @last_modified }]
     ], r.response_calls
 
     r = Qeweney.mock('if-modified-since' => Time.now.httpdate)
     r.serve_file('helper.rb', base_path: __dir__)
     assert_equal [
-      [:respond, @content, { 'etag' => @etag, 'last-modified' => @last_modified }]
+      [:respond, r, @content, { 'etag' => @etag, 'last-modified' => @last_modified }]
     ], r.response_calls
   end
 
@@ -75,7 +75,7 @@ class StaticFileResponeTest < MiniTest::Test
     deflated_content = deflate.deflate(@content, Zlib::FINISH)
     
     assert_equal [
-      [:respond, deflated_content, {
+      [:respond, r, deflated_content, {
         'etag' => @etag,
         'last-modified' => @last_modified,
         'vary' => 'Accept-Encoding',
@@ -96,7 +96,7 @@ class StaticFileResponeTest < MiniTest::Test
     gzipped_content = buf.string
     
     assert_equal [
-      [:respond, gzipped_content, {
+      [:respond, r, gzipped_content, {
         'etag' => @etag,
         'last-modified' => @last_modified,
         'vary' => 'Accept-Encoding',
@@ -109,7 +109,7 @@ class StaticFileResponeTest < MiniTest::Test
     r = Qeweney.mock
     r.serve_file('foo.rb', base_path: __dir__)
     assert_equal [
-      [:respond, nil, { ':status' => Qeweney::Status::NOT_FOUND }]
+      [:respond, r, nil, { ':status' => Qeweney::Status::NOT_FOUND }]
     ], r.response_calls
   end
 end
@@ -120,7 +120,7 @@ class UpgradeTest < MiniTest::Test
     r.upgrade('df')
 
     assert_equal [
-      [:respond, nil, {
+      [:respond, r, nil, {
         ':status' => 101,
         'Upgrade' => 'df',
         'Connection' => 'upgrade'
@@ -132,7 +132,7 @@ class UpgradeTest < MiniTest::Test
     r.upgrade('df', { 'foo' => 'bar' })
 
     assert_equal [
-      [:respond, nil, {
+      [:respond, r, nil, {
         ':status' => 101,
         'Upgrade' => 'df',
         'Connection' => 'upgrade',
@@ -155,7 +155,7 @@ class UpgradeTest < MiniTest::Test
     accept = Digest::SHA1.base64digest('abcdefghij258EAFA5-E914-47DA-95CA-C5AB0DC85B11')
 
     assert_equal [
-      [:respond, nil, {
+      [:respond, r, nil, {
         ':status' => 101,
         'Upgrade' => 'websocket',
         'Connection' => 'upgrade',
@@ -179,7 +179,7 @@ class ServeRackTest < MiniTest::Test
     })
 
     assert_equal [
-      [:respond, "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

@@ -19,27 +19,27 @@ class RoutingTest < MiniTest::Test
   def test_app1
     r = Qeweney.mock(':path' => '/foo')
     App1.(r)
-    assert_equal [[:respond, nil, { ':status' => 404 }]], r.response_calls
+    assert_equal [[:respond, r, nil, { ':status' => 404 }]], r.response_calls
 
     r = Qeweney.mock(':path' => '/')
     App1.(r)
-    assert_equal [[:respond, nil, { ':status' => 302, 'Location' => '/hello' }]], r.response_calls
+    assert_equal [[:respond, r, nil, { ':status' => 302, 'Location' => '/hello' }]], r.response_calls
 
     r = Qeweney.mock(':path' => '/hello', ':method' => 'foo')
     App1.(r)
-    assert_equal [[:respond, nil, { ':status' => 404 }]], r.response_calls
+    assert_equal [[:respond, r, nil, { ':status' => 404 }]], r.response_calls
 
     r = Qeweney.mock(':path' => '/hello', ':method' => 'get')
     App1.(r)
-    assert_equal [[:respond, 'Hello', {}]], r.response_calls
+    assert_equal [[:respond, r, 'Hello', {}]], r.response_calls
 
     r = Qeweney.mock(':path' => '/hello', ':method' => 'post')
     App1.(r)
-    assert_equal [[:respond, nil, { ':status' => 302, 'Location' => '/' }]], r.response_calls
+    assert_equal [[:respond, r, nil, { ':status' => 302, 'Location' => '/' }]], r.response_calls
 
     r = Qeweney.mock(':path' => '/hello/world', ':method' => 'get')
     App1.(r)
-    assert_equal [[:respond, 'Hello world', {}]], r.response_calls
+    assert_equal [[:respond, r, 'Hello world', {}]], r.response_calls
   end
 
   def test_on_root
@@ -58,19 +58,19 @@ class RoutingTest < MiniTest::Test
 
     r = Qeweney.mock(':path' => '/')
     app.(r)
-    assert_equal [[:respond, 'root', {}]], r.response_calls
+    assert_equal [[:respond, r, 'root', {}]], r.response_calls
 
     r = Qeweney.mock(':path' => '/foo')
     app.(r)
-    assert_equal [[:respond, 'foo root', {}]], r.response_calls
+    assert_equal [[:respond, r, 'foo root', {}]], r.response_calls
 
     r = Qeweney.mock(':path' => '/foo/bar')
     app.(r)
-    assert_equal [[:respond, 'bar root', {}]], r.response_calls
+    assert_equal [[:respond, r, 'bar root', {}]], r.response_calls
 
     r = Qeweney.mock(':path' => '/foo/bar/baz')
     app.(r)
-    assert_equal [[:respond, 'baz root', {}]], r.response_calls
+    assert_equal [[:respond, r, 'baz root', {}]], r.response_calls
   end
 
   def test_relative_path
@@ -90,27 +90,27 @@ class RoutingTest < MiniTest::Test
     r = Qeweney.mock(':path' => '/')
     app.(r)
     assert_equal '/', default_relative_path
-    assert_equal [[:respond, 'ROOT/', {}]], r.response_calls
+    assert_equal [[:respond, r, 'ROOT/', {}]], r.response_calls
 
 
     r = Qeweney.mock(':path' => '/foo/bar/baz')
     app.(r)
     assert_equal '/foo/bar/baz', default_relative_path
-    assert_equal [[:respond, 'FOO/bar/baz', {}]], r.response_calls
+    assert_equal [[:respond, r, 'FOO/bar/baz', {}]], r.response_calls
 
     r = Qeweney.mock(':path' => '/bar/a/b/c')
     app.(r)
     assert_equal '/bar/a/b/c', default_relative_path
-    assert_equal [[:respond, 'BAR/a/b/c', {}]], r.response_calls
+    assert_equal [[:respond, r, 'BAR/a/b/c', {}]], r.response_calls
 
     r = Qeweney.mock(':path' => '/bar/baz/b/c')
     app.(r)
     assert_equal '/bar/baz/b/c', default_relative_path
-    assert_equal [[:respond, 'BAR/BAZ/b/c', {}]], r.response_calls
+    assert_equal [[:respond, r, 'BAR/BAZ/b/c', {}]], r.response_calls
 
     r = Qeweney.mock(':path' => '/baz/d/e/f')
     app.(r)
     assert_equal '/baz/d/e/f', default_relative_path
-    assert_equal [[:respond, '/d/e/f', {}]], r.response_calls
+    assert_equal [[:respond, r, '/d/e/f', {}]], r.response_calls
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qeweney
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.2
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-05 00:00:00.000000000 Z
+date: 2021-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils