qeweney 0.8 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccff703b19924cf5dc8797b02a5338f12d990eacfa4fbcebf35123dae7f8840e
-  data.tar.gz: 385e5518ff1715d6e57b95f01ee6edfbcc45b49dfab3105d51014cd4a68a92cd
+  metadata.gz: 1fbf7ec4eb0c73fef2003190fd086c46fff0edc74ab4544c5a36b7d6fcce4041
+  data.tar.gz: 328254edf151b4ce1acc201438b315eb6569c96868b84b9160a2ed0ff0636870
 SHA512:
-  metadata.gz: 234aac50cd2f39f754d31fac0e401d06a8117f771de69d1840fcfb43f31b748df521a658eae3ff3989eb4683d76d2999fb2b510c80cef578218cf4d4b90f1ed1
-  data.tar.gz: b2c2b1f2a3109f5438862877aa0283c54a0818154f310fde257fdec01e92356972e88cbf3508050843d4434a6735f45ec79e9a559f9a8e3e1819c714957f3161
+  metadata.gz: 31ba2523f8ef5dd0155eaba082967b1a2ee97bea5f40b319c3b3110e9cb549032909a95c9a5147161ed2613a9c3f8688d81496286684876c614f0b185629232b
+  data.tar.gz: 2d2b4a3b7a30b6a6ec5fa83c95e2b19a37bad50ab195af011ca52f504f597069d4d3ef0a60e6553a99132baac506fe6e0be570532392557be207923125f47577

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+## 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`
+- Fix `Request#rx_incr`
+
 ## 0.8 2021-03-10
 
 - Pass request as first argument to all adapter methods

data/Gemfile.lock

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

data/lib/qeweney/request.rb

@@ -106,11 +106,19 @@ module Qeweney
     end
 
     def rx_incr(count)
-      headers[':rx'] ? headers[';rx'] += count : headers[':rx'] = 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

@@ -52,14 +52,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 +104,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'
+  VERSION = '0.9.0'
 end

data/test/test_request_info.rb

@@ -13,6 +13,19 @@ 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

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'
+  version: 0.9.0
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-10 00:00:00.000000000 Z
+date: 2021-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils