qeweney 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7beaa70b4d37af5b9bb46aa06bcd78e6d9353eada5715e28d22bc8b5fac61a4
-  data.tar.gz: 030c6f1fb05fde6ae12c2bb61844c98b9e821b4f7e21f1e7d51fa934814bc3b1
+  metadata.gz: c4a3ab1651dedfc78d9d35aa048db2d77e3eb8873d2cbd81d2944746b07ecee8
+  data.tar.gz: f75a0a000b4c1f690885deb9b163baf9ead6d285ab2c58366821c26e995342d4
 SHA512:
-  metadata.gz: 82b3104f93f3ac826f2c4319fb4c9c324efbb490983af4b8035f402fcb04c13f8f8f28dd2443764dcff26e9d7e33f0eb071c3ec0005acefd4fe27cbd13d314e4
-  data.tar.gz: 9629ed95b4b7397fc8c15ef1b10b8948d31fc047e913c5aab9b7450eaa4ff31cbf7dde4b027870757eb02c0d72e00d8f766c57871aca9fc6948a75ed90adb769
+  metadata.gz: e6aa575224a992f928fd42bec42979798e6656841eb676ca43996776ede7e24b303982a69376f735be0a5ec2ce02ced79b573a10353cd5b5d7097e168f4ce625
+  data.tar.gz: 3870128bb83a47be1fee088bd128e8701098b92f301cc515e863da462001ea65af51018ab3e1ae0e9c2dfd7250fad310690917d47fa2afa8b3fd88c5b2cbb381

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.7.5 2021-03-08
+
+- Set content-type header in 
+
 ## 0.7.4 2021-03-07
 
 - Add `Request#cookies`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    qeweney (0.7.4)
+    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

@@ -87,6 +87,8 @@ module Qeweney
     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
   

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/version.rb

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

data/test/test_request_info.rb

@@ -32,6 +32,10 @@ class RequestInfoTest < MiniTest::Test
   end
 
   def test_cookies
+    r = Qeweney.mock
+
+    assert_equal({}, r.cookies)
+
     r = Qeweney.mock(
       'cookie' => 'uaid=a%2Fb; lastLocus=settings; signin_ref=/'
     )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qeweney
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-07 00:00:00.000000000 Z
+date: 2021-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils