qeweney 0.13.1 → 0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54e76d6fe9d2c6490b00db19756306242b78465041f25e5771bedd630b6ad542
-  data.tar.gz: 791acd0d69d9a3d95d62e207127829a3509986870ffcf94bd1690ebc37a76ea0
+  metadata.gz: 3f515f9637f0d993c9dfbea4d425695f76915871ad0c62e090cbb31a4a57b4a7
+  data.tar.gz: 80a6bf6da6a0d2b85771deff0cb24ad9bcf389e4af37042a6fd62c215617a657
 SHA512:
-  metadata.gz: 7717cd77a46b8c13f496dcbeadf34af9ee7b5ba9173f8d3c638b46dc1cbdaabbda20045d59bb4a33b843145baf426ecc484df3b5ab9f018e5c9566116d4d4232
-  data.tar.gz: e42853c551362e72fff6a51be7f236fd958a26e4415c6b924022ea711ac10058a56864051fc542f3eb0c926a0013af8fbb30451235bac949dadfd6bc4255d15e
+  metadata.gz: d08170e772a3fad93d49a06bc8ee6c656e5057e5368d3dfba6687d1f838dff50e7cfb8895315480f3f85ea519d8ee0ae20a3a480ee26293bd86bfec2c4912918
+  data.tar.gz: a1918424e95a70891eb4f8fb1b163cdf62167bb3847c16192be9f8dffd95c77513cca4f0e6d4a759275b14bc7891d770585b3625b4601177195ade7a731f6814

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.14 2021-08-10
+
+- Fix Request#on with paths containing slashes
+
 ## 0.13.1 2021-08-03
 
 - Fix `Request#read`

data/Gemfile.lock

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

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