qeweney 0.8.1 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43b284ffdbd86680bb9e5c34738006fa8b3e0d48f36ce45df533e8afcd3f2961
-  data.tar.gz: 5d69cc440ed42251b6970a86e9b63ec3419aa0fad946f9353d29ec58526c6d0f
+  metadata.gz: e7607c9eba1cc73f966e3da34d266c40aa0dec6d9294da905b49f3b3efc628ff
+  data.tar.gz: 16c15a7655cab3ed23437ed6f1f12d63df3676d63145cfb75a0505de1b8b5f3b
 SHA512:
-  metadata.gz: 5fd5ce37b83afc129ae262d8dcfc0288bd206e6b3c260577c00a89a5bcc7b44a3337d67087a9b05c281f49aa9f35b6202d44c8c5f535023c9c30929232e5bee5
-  data.tar.gz: cb7636b76961093665c6cf92c882a377ed028d0afa2a048dfd92da51fae88ca2815353287de5f2c34f75f81ddf056fc434c9cc71c34c4b6429f594c6b1c30068
+  metadata.gz: 7ce90ffad9f012d33ebaf6a48100ad684151b1b62be47004fdc8d991e6e755755c15ce945a602d607d1124db962e7a49921e369d9c9dadb059c776ae7c94c175
+  data.tar.gz: 0b950d98a942954ae7c824c3a475eaaeb9752a6d7a854fbebd383a02afde1d703ddf530538900d5f79ba61eddc1ab8220a0e2b9e95c488be225170d62d7de296

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+## 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
+
+## 0.8.4 2021-03-23
+
+- Rename and fix `#parse_query` to deal with no-value query parts
+
+## 0.8.3 2021-03-22
+
+- Streamline routing behaviour in sub routes (an explicit default sub route is
+  now required if no sub route matches)
+
+## 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`

data/Gemfile.lock

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

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']
@@ -52,14 +53,16 @@ module Qeweney
     def query
       return @query if @query
       
-      @query = (q = uri.query) ? split_query_string(q) : {}
+      @query = (q = uri.query) ? parse_query(q) : {}
     end
     
-    def split_query_string(query)
+    QUERY_KV_REGEXP = /([^=]+)(?:=(.*))?/
+    
+    def parse_query(query)
       query.split('&').each_with_object({}) do |kv, h|
-        k, v = kv.split('=')
-        p split_query_string: { k: k, v: v }
-        h[k.to_sym] = URI.decode_www_form_component(v)
+        k, v = kv.match(QUERY_KV_REGEXP)[1..2]
+        # k, v = kv.split('=')
+        h[k.to_sym] = v ? URI.decode_www_form_component(v) : true
       end
     end
 
@@ -102,10 +105,10 @@ module Qeweney
   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/routing.rb

@@ -16,7 +16,7 @@ module Qeweney
 
     def route_found(&block)
       catch(:stop, &block)
-      throw :stop, headers_sent? ? :found : nil
+      throw :stop, :found
     end
 
     @@regexp_cache = {}

data/lib/qeweney/version.rb

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

data/test/test_request_info.rb

@@ -13,12 +13,31 @@ class RequestInfoTest < MiniTest::Test
     assert_equal({ a: '1', b: '2', c: '3/4' }, r.query)
   end
 
+  def test_query
+    r = Qeweney.mock(':path' => '/GponForm/diag_Form?images/')
+    assert_equal '/GponForm/diag_Form', r.path
+    assert_equal({:'images/' => true}, r.query)
+
+    r = Qeweney.mock(':path' => '/?a=1&b=2')
+    assert_equal '/', r.path
+    assert_equal({a: '1', b: '2'}, r.query)
+
+    r = Qeweney.mock(':path' => '/?l=a&t=&x=42')
+    assert_equal({l: 'a', t: '', x: '42'}, r.query)
+  end
+
   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_routing.rb

@@ -12,6 +12,7 @@ class RoutingTest < MiniTest::Test
         r.on_post do
           r.redirect '/'
         end
+        r.default { r.respond nil, ':status' => 404 }
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qeweney
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.1
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-10 00:00:00.000000000 Z
+date: 2021-06-14 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.4
 signing_key: 
 specification_version: 4
 summary: Qeweney - cross library HTTP request / response API