http-negotiate 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37db2775817222cbcb2d1d27845d37011cfec405d7b8ddc9f0030383bc53264c
-  data.tar.gz: 84e031f85bc9d04b8f1ed52213a0c681e5be4bb638e0ab13881f5320a0ad511a
+  metadata.gz: 97e8bcc59dec991c82e9e253b34ab3643ee7b62441b2d890c1988bcd2bd6a941
+  data.tar.gz: 66a3825c19b6ab786a4b1fdca2cd5fff90d03b91d72aea495576f2e3312c2bb1
 SHA512:
-  metadata.gz: bde399e1e18835553bd15b72c9062c98d6560b7ae8e705739f4e4ea3fc96caa70b2db000b93897c5470a71f9f8cdc0a7674fc1afb2952d841a43c652c5a447fe
-  data.tar.gz: 6575f6321b5beac495967b5e42fca6e2c238a4e7171588ef3e653efa925397cf8a8e2d3563ee7ba395e5cb012d4bd12edf06277b0468dc4189c90398a2d9939a
+  metadata.gz: 89807147d59bfeadcfa20e4228bbd6de119c2bcadcfcf76c204516e20a47c049c8c0a7d736e05265f5f737d10ce8b1c4a49ee7da4719a0c30abe7e62dba57c2c
+  data.tar.gz: 8f83584309e4a1fb37b46c53b3618bba9a470030414e20d30c8f96bbf09deecc003674fd265262193ea4fecf3053de20927f35fd676a547c46586941e77e8381

data/Gemfile

@@ -3,5 +3,5 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in http-negotiate.gemspec
 gemspec
 
-gem "rake", "~> 13.0"
-gem "rspec", "~> 3.0"
+#gem "rake", "~> 13.0"
+#gem "rspec", "~> 3.0"

data/http-negotiate.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
   # dev/test dependencies
-  spec.add_development_dependency 'bundler', '~> 2.1'
+  spec.add_development_dependency 'bundler', '~> 2.2'
   spec.add_development_dependency 'rake',    '~> 13.0'
-  spec.add_development_dependency 'rspec',   '~> 3.9'
+  spec.add_development_dependency 'rspec',   '~> 3.10'
 end

data/lib/http/negotiate/version.rb

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

data/lib/http/negotiate.rb

@@ -32,10 +32,11 @@ module HTTP::Negotiate
   #
   # @param request [Hash,Rack::Request,#env] Anything roughly a hash of headers
   # @param variants [Hash] the variants, described above
+  # @param add_langs [false, true] whether to supplant language tags
   # @param all [false, true] whether to return a sorted list or not
   # @param cmp [Proc] a secondary comparison of variants as a tiebreaker
   #
-  def negotiate request, variants, all: false, cmp: nil
+  def negotiate request, variants, add_langs: false, all: false, cmp: nil
     # pull accept headers
     request = request.env if request.respond_to? :env
     # this will ensure that the keys will match irrespective of
@@ -56,6 +57,11 @@ module HTTP::Negotiate
         # but we don't care (although interestingly according to rfc7231,
         # accept-language only affords q= and not arbitrary parameters)
         hdr = hdr.dup.gsub(/\s+/, '')
+
+        # don't add the test group if it's an empty string, because
+        # postel's law is a thing
+        next if hdr.empty?
+
         accept[k] = hdr.split(/,+/).map do |c|
           val, *params = c.split(/;+/)
           params = params.map do |p|
@@ -77,6 +83,23 @@ module HTTP::Negotiate
       end
     end
 
+    # sneakily supplant shorter language tags at 99% q
+    if accept[:language]
+      langs = accept[:language]
+      langs.transform_keys! { |k| k.tr(?_, ?-).tr_s(?-, ?-).downcase }
+      if add_langs
+        langs.keys.select { |k| k.include? ?- }.each do |k|
+          # a tag with q=0 has to be explicitly set in the header
+          next if (q = langs[k][:q]) == 0
+          lang = k.split ?-
+          (1..lang.length).to_a.reverse.each do |i|
+            # each shorter language tag will have a slightly lower score
+            langs[lang.slice(0, i).join ?-] ||= { q: q *= 0.999 }
+          end
+        end
+      end
+    end
+
     # convert variants to array
     variants = variants.transform_values do |v|
       v.is_a?(Hash) ? v.values_at(*KEYS) : v
@@ -162,37 +185,32 @@ module HTTP::Negotiate
         # warn maj.inspect, min.inspect
 
         # XXX match params at some point
-        if at[maj]
-          if at[maj][min]
-            qt = at[maj][min][:q]
-          elsif at[maj][?*]
-            qt = at[maj][?*][:q]
-          else
-            qt = 0.1
-          end
-        elsif at[?*]
-          # ???
-          qt = at[?*].fetch(?*, { q: 0.1 })[:q]
-        else
-          # ???
-          qt = 0.1
-        end
+        qt = if at.fetch(maj, {})[min]
+               at[maj][min][:q]
+             elsif at.fetch(maj, {})[?*]
+               at[maj][?*][:q]
+             elsif at.fetch(?*, {})[?*]
+               at[?*][?*][:q]
+             else
+               0.1
+             end
 
       end
 
-      scores[var] = qs * qe * qc * ql * qt
+      scores[var] = [qs * qe * qc * ql * qt, size]
     end
 
     # XXX do something smarter here for secondary comparison
     cmp ||= -> a, b { 0 }
 
     chosen = scores.sort do |a, b|
-      c = b.last <=> a.last
-      c == 0 ? cmp.call(a.first, b.first) : c
+      c = b.last.first <=> a.last.first        # first compare scores
+      c = cmp.call(a.first, b.first) if c == 0 # then secondary cmp
+      c == 0 ? a.last.last <=> b.last.last : c # then finally by size
     end.map(&:first)
+
     all ? chosen : chosen.first
   end
 
   extend self
 end
-3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http-negotiate
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Dorian Taylor
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
 description:
 email:
 - code@doriantaylor.com