qeweney 0.7 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57bbb94d61917bad178ee53693fdecc3f3aa878495c3d53d04d263bd34934792
-  data.tar.gz: 5075929ee6a35dc1c1420b6a312ff5c861e6e2b7267993eacb3b55ec09d6f6c6
+  metadata.gz: c4a3ab1651dedfc78d9d35aa048db2d77e3eb8873d2cbd81d2944746b07ecee8
+  data.tar.gz: f75a0a000b4c1f690885deb9b163baf9ead6d285ab2c58366821c26e995342d4
 SHA512:
-  metadata.gz: '096b6148118776622ba648d9bb4dc8808575b35beecc90b2893518d83edc402a0d257a79db04d698a656f937249d130b56e0e0eeff4df7475b413a98d9012374'
-  data.tar.gz: 6b9fe12bd28d762e1116313bf9dfb6f4e4804d75dd02edbf887449bb24100e098e178121401b4061f892d47c1dfee1dc5adc8b4f22376a6c8b08c96f4b3a0302
+  metadata.gz: e6aa575224a992f928fd42bec42979798e6656841eb676ca43996776ede7e24b303982a69376f735be0a5ec2ce02ced79b573a10353cd5b5d7097e168f4ce625
+  data.tar.gz: 3870128bb83a47be1fee088bd128e8701098b92f301cc515e863da462001ea65af51018ab3e1ae0e9c2dfd7250fad310690917d47fa2afa8b3fd88c5b2cbb381

data/CHANGELOG.md

@@ -1,4 +1,17 @@
-## 0.7 20921-03-04
+## 0.7.5 2021-03-08
+
+- Set content-type header in 
+
+## 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
 

data/Gemfile.lock

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

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/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,24 @@ 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
@@ -138,7 +160,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/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|

data/lib/qeweney/routing.rb

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

data/lib/qeweney/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Qeweney
-  VERSION = '0.7'
+  VERSION = '0.7.5'
 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_routing.rb

@@ -74,25 +74,43 @@ class RoutingTest < MiniTest::Test
   end
 
   def test_relative_path
+    default_relative_path = nil
+
     app = Qeweney.route do |r|
-      r.on_root { r.respond('root') }
+      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.7'
+  version: 0.7.5
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-04 00:00:00.000000000 Z
+date: 2021-03-08 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