accept_language 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d350dc26f69d89636ac4794c3a9d678cdf44f3f849c1f640b38c959da3637f9
-  data.tar.gz: ce3bd0c7254ebc9d3dbad9ca6d7503fd6c2dcf396232c0641a8de56872bd97fa
+  metadata.gz: af6ad773549b67a530133a79fd84c7b6de133ab571cb14642ce261eb0f9255d4
+  data.tar.gz: c5a11c41e67023583c9b3ece32babeee369760d6d8b5f0fb2890f4dc055da5dc
 SHA512:
-  metadata.gz: 8a2c7f1ca2b56dc774aa2c62dc1ab58cf0ed25dc2dd02e55f9a5c7fafe162480855068222a1cc73aeeefe4ec594abb72bebdcf7adbf179b786015837ca9abb27
-  data.tar.gz: 177e781389b91cf7e9a2bc572e318abef16fd4d6267fb83a61cc2d0f6609106b39a56f85ea0f8a5d6070fb924c49d69c0262e828b983b275fc069a725ba1885d
+  metadata.gz: f35d229b0ab907ebcbeba66f6163c7f66ef7567cca0795bb669487713ed0eb9bcf1caff663ae953ef070eca4f0a2f932ffb72a5ed4349f876ed871df3649dcae
+  data.tar.gz: a05701325ee77c8aab3ce9057bd26bff5e75564e937020a7694306e81257a72ffbae7530dae570027dcff72afa8f8c2af31acc29ab50005638ecaf9f04f22af6

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-06-12 08:15:50 +0200 using RuboCop version 0.71.0.
+# on 2019-06-12 23:02:50 +0200 using RuboCop version 0.71.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    accept_language (0.1.2)
+    accept_language (0.1.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.0)
     diff-lcs (1.3)
-    docile (1.3.1)
+    docile (1.3.2)
     jaro_winkler (1.5.2)
     json (2.2.0)
     parallel (1.17.0)

data/README.md

@@ -28,7 +28,7 @@ Or install it yourself as:
 
 It's intended to be used in a Web server that supports some level of internationalization (i18n), but can be used anytime an `Accept-Language` header string is available.
 
-### Examples
+Examples:
 
 ```ruby
 AcceptLanguage.parse('da, en-gb;q=0.8, en;q=0.7') # => [:da, :"en-gb", :en]
@@ -37,7 +37,7 @@ AcceptLanguage.parse('fr-CH, fr;q=0.9, en;q=0.8, de;q=0.7, *;q=0.5') # => [:"fr-
 
 In order to help facilitate better i18n, a method is provided to return the intersection of the languages the user prefers and the languages your application supports.
 
-### Examples
+Examples:
 
 ```ruby
 AcceptLanguage.intersection('da, en-gb;q=0.8, en;q=0.7', :ar, :da, :ja, :ro) # => :da
@@ -50,6 +50,34 @@ AcceptLanguage.intersection('*;q=0.5, zh;q=0.4', :ja, :zh) # => :ja
 AcceptLanguage.intersection('fr;q=0, zh;q=0.4', :fr) # => nil
 ```
 
+### Rails integration example
+
+```ruby
+# app/controllers/application_controller.rb
+class ApplicationController < ActionController::Base
+  before_action :best_locale_from_request!
+
+  def best_locale_from_request!
+    I18n.locale = best_locale_from_request
+  end
+
+  def best_locale_from_request
+    return I18n.default_locale unless request.headers.key?('HTTP_ACCEPT_LANGUAGE')
+
+    string = request.headers.fetch('HTTP_ACCEPT_LANGUAGE')
+    locale = AcceptLanguage.intersection(string, I18n.default_locale, *I18n.available_locales)
+
+    # If the server cannot serve any matching language,
+    # it can theoretically send back a 406 (Not Acceptable) error code.
+    # But, for a better user experience, this is rarely done and more
+    # common way is to ignore the Accept-Language header in this case.
+    return I18n.default_locale if locale.nil?
+
+    locale
+  end
+end
+```
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/cyril/accept_language.rb. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/VERSION.semver

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/accept_language/parser.rb

@@ -21,13 +21,10 @@ module AcceptLanguage
     def preferences
       @string.delete(' ').split(',').inject({}) do |result, language|
         tag, quality = language.split(/;q=/i)
-
-        tag     = tag.downcase
         quality = quality.nil? ? 1.0 : quality.to_f
-
         next result if quality.zero?
 
-        result.merge(tag.to_sym => quality)
+        result.merge(tag.downcase.to_sym => quality)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: accept_language
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Cyril Kato