http-negotiate 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97e8bcc59dec991c82e9e253b34ab3643ee7b62441b2d890c1988bcd2bd6a941
-  data.tar.gz: 66a3825c19b6ab786a4b1fdca2cd5fff90d03b91d72aea495576f2e3312c2bb1
+  metadata.gz: 5eba28c71dd714d3254c4f9d0922b9c337ac5ec1ef91c353abd276aea7ec58ad
+  data.tar.gz: 714671385c02e7977da9adbef08e8cab7cf7665fd146e64613ba18814fbc2922
 SHA512:
-  metadata.gz: 89807147d59bfeadcfa20e4228bbd6de119c2bcadcfcf76c204516e20a47c049c8c0a7d736e05265f5f737d10ce8b1c4a49ee7da4719a0c30abe7e62dba57c2c
-  data.tar.gz: 8f83584309e4a1fb37b46c53b3618bba9a470030414e20d30c8f96bbf09deecc003674fd265262193ea4fecf3053de20927f35fd676a547c46586941e77e8381
+  metadata.gz: '085588d4db497e88d80de41198fff309d3ff0babe419803e5b915b150a5717a24b849cca6219593da6e122490b18676c199f793d626ec860d3bafb49011db278'
+  data.tar.gz: fc87172adb4cd18ae9ede3e373655cef0c67d20d2f37989d8fb6e5f464f602ed0f333a5a8e63db0b1c1e5ca70da66d13efd98715cd643dc08944b70a96fb53e9

data/lib/http/negotiate/version.rb

@@ -1,5 +1,5 @@
 module HTTP
   module Negotiate
-    VERSION = '0.1.2'
+    VERSION = '0.1.3'
   end
 end

data/lib/http/negotiate.rb

@@ -145,24 +145,30 @@ module HTTP::Negotiate
 
       # calculate the language quality
       ql = 1
-      if accept[:language] and language
-        ql = 0.001 # initial value is very low but not zero
-        lang = language.split(/-+/)
-        (1..lang.length).to_a.reverse.each do |i|
-          test = lang.slice(0, i).join ?-
-          if accept[:language][test]
-            al = accept[:language][test][:q]
-            if al == 0
-              ql = 0
-              break
-            elsif al > ql
-              ql = al
+      if accept[:language]
+        if language
+          ql = 0.001 # initial value is very low but not zero
+          lang = language.split(/-+/)
+          (0..lang.length).to_a.reverse.each do |i|
+            # apparently there is no wildcard for accept-language? no
+            # wait there is: rfc4647 $2.1 via rfc7231 $5.3.5
+            test = i > 0 ? lang.slice(0, i).join(?-) : ?*
+            if accept[:language][test]
+              al = accept[:language][test][:q]
+              # *;q=0 will override 
+              if al == 0 and test != ?*
+                ql = 0
+                break
+              elsif al > ql
+                ql = al
+              end
             end
           end
+        elsif any_lang
+          # XXX not sure if language-less variants in the same pool
+          # with language-y ones
+          ql = 0.5
         end
-        # apparently there is no wildcard for accept-language?
-      elsif accept[:language] and any_lang
-        ql = 0.5
       end
 
       # calculate the type quality

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: http-negotiate
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Dorian Taylor
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-08 00:00:00.000000000 Z
+date: 2021-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler