accept_language 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25f4296b38885118c1d127873d887a138bbfb6615ec0dc3d2db826e14e96e7d7
-  data.tar.gz: 9f2fac2c3818c94c5b7c7bc6d95655e3fefcb54c5ec5a3ba4ef28d05213fa00f
+  metadata.gz: a5c9dad0529da52e9c0fa650e2825c788a673ecf57c7158a9e160797079607c9
+  data.tar.gz: b9e7430c21121d7fb111cf6159f27bb8690e6728dbf8e8ecdd410ce9bbae4a58
 SHA512:
-  metadata.gz: b138c701a374afec0e26b9560570b3f48490a1da1e79f42daa768aa03f038f969f4670e4af57a97c109192410df0b8c66bc39bcc33f7362cc7440be6d243b0e6
-  data.tar.gz: 4a149d54102620ef411b1c1966f159840e3dec65cf5a2e33e5e045154e1234ee759be0b6ddda4cc8577f778a62e753f96642e49c5fc99e22760e6335a9bfb7aa
+  metadata.gz: 2dc2b91a4809e88dadef537c951a00bec5adda83a6f80e9717a7ca4651352c606c94dc00a4b5a439668555c6942a92e5de26c985b8c11dc433aed7dde414d710
+  data.tar.gz: 1178cd443cd3c731a90347a9ad2b97cfe9f57084b234c98c1570d2ee8546e59112f0415e992e92bb342301bc3bd2861ac53739eefa55fc3967c64f0e7b086f09

data/README.md

@@ -29,7 +29,7 @@ gem "accept_language"
 And then execute:
 
 ```sh
-bundle
+bundle install
 ```
 
 Or install it yourself as:
@@ -90,6 +90,11 @@ class ApplicationController < ActionController::Base
 end
 ```
 
+## Read more
+
+* [Language negotiation with Ruby](https://dev.to/cyri_/language-negotiation-with-ruby-5166)
+* [Rubyで、言語交渉](https://qiita.com/cyril/items/45dc233edb7be9d614e7)
+
 ## Versioning
 
 __AcceptLanguage__ uses [Semantic Versioning 2.0.0](https://semver.org/)

data/lib/accept_language/matcher.rb

@@ -8,17 +8,19 @@ module AcceptLanguage
   #   Matcher.new("da" => 1.0, "en-GB" => 0.8, "en" => 0.7).call(:ug, :kk, :ru, :en) # => :en
   #   Matcher.new("da" => 1.0, "en-GB" => 0.8, "en" => 0.7).call(:fr, :en, :"en-GB") # => :"en-GB"
   class Matcher
+    WILDCARD = "*"
+
     attr_reader :excluded_langtags, :preferred_langtags
 
     # @param [Hash<String, BigDecimal>] languages_range A list of accepted
     #   languages with their respective qualities.
     def initialize(**languages_range)
-      @excluded_langtags = Set[]
+      @excluded_langtags = ::Set[]
       langtags = []
 
       languages_range.select do |langtag, quality|
         if quality.zero?
-          @excluded_langtags << langtag unless langtag.eql?("*")
+          @excluded_langtags << langtag unless wildcard?(langtag)
         else
           level = (quality * 1_000).to_i
           langtags[level] = langtag
@@ -37,7 +39,7 @@ module AcceptLanguage
       available_langtags = drop_unacceptable(*available_langtags)
 
       preferred_langtags.each do |preferred_tag|
-        if preferred_tag.eql?("*")
+        if wildcard?(preferred_tag)
           langtag = any_other_langtag(*available_langtags)
           return langtag unless langtag.nil?
         else
@@ -54,7 +56,7 @@ module AcceptLanguage
 
     def any_other_langtag(*available_langtags)
       available_langtags.find do |available_langtag|
-        langtags = preferred_langtags - ["*"]
+        langtags = preferred_langtags - [WILDCARD]
 
         langtags.none? do |langtag|
           available_langtag.match?(/\A#{langtag}/i)
@@ -63,10 +65,10 @@ module AcceptLanguage
     end
 
     def drop_unacceptable(*available_langtags)
-      available_langtags.inject(Set[]) do |langtags, available_langtag|
+      available_langtags.inject(::Set[]) do |langtags, available_langtag|
         next langtags if unacceptable?(available_langtag)
 
-        langtags + Set[available_langtag]
+        langtags + ::Set[available_langtag]
       end
     end
 
@@ -75,6 +77,10 @@ module AcceptLanguage
         langtag.match?(/\A#{excluded_langtag}/i)
       end
     end
+
+    def wildcard?(value)
+      value.eql?(WILDCARD)
+    end
   end
 end
 

data/lib/accept_language/parser.rb

@@ -1,11 +1,18 @@
 # frozen_string_literal: true
 
+require "bigdecimal"
+
 module AcceptLanguage
   # @note Parser for Accept-Language header fields.
   # @example
   #   Parser.new("da, en-GB;q=0.8, en;q=0.7") # => #<AcceptLanguage::Parser:0x00007 @languages_range={"da"=>0.1e1, "en-GB"=>0.8e0, "en"=>0.7e0}>
   # @see https://tools.ietf.org/html/rfc2616#section-14.4
   class Parser
+    DEFAULT_QUALITY = BigDecimal("1")
+    SEPARATOR = ","
+    SPACE = " "
+    SUFFIX = ";q="
+
     attr_reader :languages_range
 
     # @param [String] field The Accept-Language header field to parse.
@@ -30,16 +37,15 @@ module AcceptLanguage
     # @return [Hash<String, BigDecimal>] A list of accepted languages with their
     #   respective qualities.
     def import(field)
-      field.delete(" ").split(",").inject({}) do |hash, lang|
-        tag, quality = lang.split(/;q=/i)
+      field.delete(SPACE).split(SEPARATOR).inject({}) do |hash, lang|
+        tag, quality = lang.split(SUFFIX)
         next hash if tag.nil?
 
-        quality = quality.nil? ? BigDecimal("1") : BigDecimal(quality)
+        quality = quality.nil? ? DEFAULT_QUALITY : BigDecimal(quality)
         hash.merge(tag => quality)
       end
     end
   end
 end
 
-require "bigdecimal"
 require_relative "matcher"

data/lib/accept_language.rb

@@ -14,4 +14,4 @@ module AcceptLanguage
   end
 end
 
-require_relative "accept_language/parser"
+require_relative File.join("accept_language", "parser")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: accept_language
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Cyril Kato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-08 00:00:00.000000000 Z
+date: 2022-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -175,7 +175,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.5
+      version: 2.7.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="