qeweney 0.6 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc2a56f6f21001d4122d990b735f952521f2949b6d76811bc2f5e528f60ca8ed
-  data.tar.gz: e7f1a6fa8e788ef4bf1612ac043f847497f3c4b9558a8959ad75182806106088
+  metadata.gz: a7beaa70b4d37af5b9bb46aa06bcd78e6d9353eada5715e28d22bc8b5fac61a4
+  data.tar.gz: 030c6f1fb05fde6ae12c2bb61844c98b9e821b4f7e21f1e7d51fa934814bc3b1
 SHA512:
-  metadata.gz: 4be0bb1c58d67ccaa8550b6b1ce59dfbc5cdb6a87d19ede17702293eb521bec416d9932b54627eb43ba832c55dee4e4320983d6eb14fdae4131d751eb459391a
-  data.tar.gz: 5cf454ddf41665c9abf6cdba864161257c2d11da5c60add1926cc27e9ba5fcef3a3eeba003815e4cbd8095d70632ed999390cfd07912a135cb33813155876762
+  metadata.gz: 82b3104f93f3ac826f2c4319fb4c9c324efbb490983af4b8035f402fcb04c13f8f8f28dd2443764dcff26e9d7e33f0eb071c3ec0005acefd4fe27cbd13d314e4
+  data.tar.gz: 9629ed95b4b7397fc8c15ef1b10b8948d31fc047e913c5aab9b7450eaa4ff31cbf7dde4b027870757eb02c0d72e00d8f766c57871aca9fc6948a75ed90adb769

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 0.7.4 2021-03-07
+
+- Add `Request#cookies`
+- Add `Request#full_uri`
+
+## 0.7.3 2021-03-05
+
+- Fix `parse_urlencoded_form_data`
+
+## 0.7.2 2021-03-04
+
+- Add `#route_relative_path` method
+
 ## 0.6 2021-03-03
 
 - More work on routing (still WIP)

data/Gemfile.lock

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

data/TODO.md

@@ -58,7 +58,7 @@ PAGES = Tipi::PageManager(
 
 app = Tipi.app do |r|
   r.on 'static' do
-    r.serve_file(r.routing_path, base_path: ASSETS_PATH)
+    r.serve_file(r.route_path, base_path: ASSETS_PATH)
   end
 
   r.default do

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,6 +78,22 @@ 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)
+      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
@@ -138,7 +158,7 @@ module Qeweney
     MAX_PARAMETER_VALUE_SIZE = 2**20 # 1MB
 
     def parse_urlencoded_form_data(body)
-      body.force_encoding(UTF_8) unless body.encoding == Encoding::UTF_8
+      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

@@ -25,6 +25,10 @@ module Qeweney
       @path_parts[@path_parts_idx]
     end
 
+    def route_relative_path
+      @path_parts.empty? ? '/' : "/#{@path_parts[@path_parts_idx..-1].join('/')}"
+    end
+
     def enter_route
       @path_parts_idx += 1
     end

data/lib/qeweney/version.rb

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

data/test/test_request_info.rb

@@ -20,4 +20,26 @@ 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(
+      'cookie' => 'uaid=a%2Fb; lastLocus=settings; signin_ref=/'
+    )
+
+    assert_equal({
+      'uaid' => 'a/b',
+      'lastLocus' => 'settings',
+      'signin_ref' => '/'
+    }, r.cookies)
+  end
 end

data/test/test_routing.rb

@@ -72,4 +72,45 @@ class RoutingTest < MiniTest::Test
     app.(r)
     assert_equal [[:respond, 'baz root', {}]], r.response_calls
   end
+
+  def test_relative_path
+    default_relative_path = nil
+
+    app = Qeweney.route do |r|
+      default_relative_path = r.route_relative_path
+      r.on_root { r.respond(File.join('ROOT', r.route_relative_path)) }
+      r.on('foo') { r.respond(File.join('FOO', r.route_relative_path)) }
+      r.on('bar') { 
+        r.on('baz') { r.respond(File.join('BAR/BAZ', r.route_relative_path)) }
+        r.default { r.respond(File.join('BAR', r.route_relative_path)) }
+      }
+      r.on('baz') { r.respond(r.route_relative_path) }
+    end
+
+    r = Qeweney.mock(':path' => '/')
+    app.(r)
+    assert_equal '/', default_relative_path
+    assert_equal [[:respond, '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
+
+    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
+
+    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
+
+    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
+  end
 end

metadata

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