accept_language 2.0.0 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1b6659d931a56171b880e543a4364fdd0212cf1664d9fa32d04f29c9142b1a6
-  data.tar.gz: 259ddc12dc7ef62325a5fe634dd0bcb284f1dce0d9629d929858751dcc8cd936
+  metadata.gz: a5c9dad0529da52e9c0fa650e2825c788a673ecf57c7158a9e160797079607c9
+  data.tar.gz: b9e7430c21121d7fb111cf6159f27bb8690e6728dbf8e8ecdd410ce9bbae4a58
 SHA512:
-  metadata.gz: c1566e1af8e2cd77e96eebebf25e7f694237f1562396d42ee001349d6fb75503fe022a8325e208db9cd24e354d90253496e11af66f1bd5b7704e8b54ac347263
-  data.tar.gz: 0d7d2c59183e9eae327e61f4ccae25c050f5a82eb511041b2c86c4478548c7144ea10fa78f9c9a4d4b501fdbf8375b72e001e77f73d0820272c139fa9dad5972
+  metadata.gz: 2dc2b91a4809e88dadef537c951a00bec5adda83a6f80e9717a7ca4651352c606c94dc00a4b5a439668555c6942a92e5de26c985b8c11dc433aed7dde414d710
+  data.tar.gz: 1178cd443cd3c731a90347a9ad2b97cfe9f57084b234c98c1570d2ee8546e59112f0415e992e92bb342301bc3bd2861ac53739eefa55fc3967c64f0e7b086f09

data/LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019-2021 Cyril Kato
+Copyright (c) 2019-2022 Cyril Kato
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,12 +1,22 @@
-# Accept Language
+# Accept Language 🌐
 
 A tiny library for parsing the `Accept-Language` header from browsers (as defined in [RFC 2616](https://tools.ietf.org/html/rfc2616#section-14.4)).
 
 ## Status
 
-[![Gem Version](https://badge.fury.io/rb/accept_language.svg)](https://badge.fury.io/rb/accept_language)
-[![Build Status](https://travis-ci.org/cyril/accept_language.rb.svg?branch=master)](https://travis-ci.org/cyril/accept_language.rb)
-[![Inline Docs](https://inch-ci.org/github/cyril/accept_language.rb.svg)](https://inch-ci.org/github/cyril/accept_language.rb)
+[![Version](https://img.shields.io/github/v/tag/cyril/accept_language.rb?label=Version&logo=github)](https://github.com/cyril/accept_language.rb/releases)
+[![Yard documentation](https://img.shields.io/badge/Yard-documentation-blue.svg?logo=github)](https://rubydoc.info/github/cyril/accept_language.rb/main)
+[![CI](https://github.com/cyril/accept_language.rb/workflows/CI/badge.svg?branch=main)](https://github.com/cyril/accept_language.rb/actions?query=workflow%3Aci+branch%3Amain)
+[![RuboCop](https://github.com/cyril/accept_language.rb/workflows/RuboCop/badge.svg?branch=main)](https://github.com/cyril/accept_language.rb/actions?query=workflow%3Arubocop+branch%3Amain)
+[![License](https://img.shields.io/github/license/cyril/accept_language.rb?label=License&logo=github)](https://github.com/cyril/accept_language.rb/raw/main/LICENSE.md)
+
+## Why this tool?
+
+- Thread-safe implementation.
+- Small algorithm that can handle tricky cases.
+- Match strings and symbols ignoring the case.
+- Works also well without Rails, Rack, i18n.
+- Comes with [BCP 47](https://www.rfc-editor.org/bcp/bcp47.txt) support.
 
 ## Installation
 
@@ -18,11 +28,15 @@ gem "accept_language"
 
 And then execute:
 
-    $ bundle
+```sh
+bundle install
+```
 
 Or install it yourself as:
 
-    $ gem install accept_language
+```sh
+gem install accept_language
+```
 
 ## Usage
 
@@ -76,10 +90,15 @@ 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/)
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+The [gem](https://rubygems.org/gems/accept_language) is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

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.0
+  version: 2.0.3
 platform: ruby
 authors:
 - Cyril Kato
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-02 00:00:00.000000000 Z
+date: 2022-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: r_spec-clone
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,8 +165,9 @@ files:
 homepage: https://github.com/cyril/accept_language.rb
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -174,15 +175,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 2.7.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
-summary: Parser for Accept-Language request HTTP header
+summary: "Parser for Accept-Language request HTTP header \U0001F310"
 test_files: []