rack-user-locale 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39d2236bcd061b79e92a196c564fc2b3e09053ed063a272128cc81d29610d4f2
-  data.tar.gz: cca5a0b5b88dd00cd575ee3ae811f41ce7d233a7ddf11be6d99fd450c80efdd7
+  metadata.gz: 9dc51ae0380e03d6cb6b2d97f76c35046ce797743542438d4034b325208f858e
+  data.tar.gz: 771dfb2612220a99c331d38b1814a1559f9fcacdb3e1ed415547cf0e4dd268c5
 SHA512:
-  metadata.gz: '0533867d9f8ce4113b9c3b6cafea2bc016508b05755019d89b04a94baec798a12e74802ef5ec55a9546986ffb43f0cf4d4df509c778380b02ba386692b4095ae'
-  data.tar.gz: 8558978f95d16347b585367c987e99e5c52f0bc6cc41f83d9f25b59f063f7daea18310254ce334a2dc04e98cdf779dd8643a87a379820b042d3ed44493febee6
+  metadata.gz: b1aa1b2a4b177f9d7b0df84ce5c7b64e170a47e999f35732ed89fb7c787ddb1fc3483710d217e2480af3be1765d412bcf4ca9aa1cf9650339ecf27e9394ad62f
+  data.tar.gz: d4ec84e5e50d6a1a99591a32eec18bd5f35641b7d1a163e113f8b5520202575fa804965d1658342bbf125379f609a8cfa49efb0caa5fcd66d4f0544fdab9a418

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2020 Stuart Chinery
+Copyright (c) 2020 Stuart Chinery
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,6 +1,7 @@
 # Rack User Locale
 
-[![Gem Version](https://badge.fury.io/rb/rack-user-locale.png)](http://badge.fury.io/rb/rack-user-locale) [![Build Status](https://secure.travis-ci.org/schinery/rack-user-locale.png)](http://travis-ci.org/schinery/rack-user-locale)
+[![Gem Version](https://badge.fury.io/rb/rack-user-locale.png)](http://badge.fury.io/rb/rack-user-locale) 
+[![Build Status](https://secure.travis-ci.org/schinery/rack-user-locale.png)](http://travis-ci.org/schinery/rack-user-locale)
 
 A Rack module for getting and setting a user's locale via a cookie or browser default language.
 

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.1.0

data/lib/user_locale.rb

@@ -16,7 +16,7 @@ module Rack
 
     def call(env)
       @env = env
-      set_i18n_locale
+      set_i18n
       app.call(env) && return unless request.get?
 
       @status, @headers, @body = app.call(env)
@@ -31,16 +31,7 @@ module Rack
     end
 
     def browser_locale
-      return if http_accept_languages.nil?
-
-      if check_accepted?
-        weighted_langs.each do |lang|
-          l = accepted_locale(split_lang(lang.first).to_sym)
-          return l unless l.nil?
-        end
-      end
-
-      split_lang(weighted_langs.first.first)
+      @browser_locale ||= detect_browser_locale
     end
 
     def check_accepted?
@@ -55,12 +46,21 @@ module Rack
       @default_locale ||= I18n.default_locale
     end
 
-    def http_accept_languages
-      @http_accept_languages ||= env["HTTP_ACCEPT_LANGUAGE"]
+    def detect_browser_locale
+      return if http_accept_languages.nil?
+
+      if check_accepted?
+        weighted_langs.each do |lang|
+          l = accepted_locale(split_lang(lang.first).to_sym)
+          return l unless l.nil?
+        end
+      end
+
+      split_lang(weighted_langs.first.first)
     end
 
-    def locale
-      @locale ||= cookie_locale || browser_locale || default_locale
+    def http_accept_languages
+      @http_accept_languages ||= env["HTTP_ACCEPT_LANGUAGE"]
     end
 
     def request
@@ -71,8 +71,8 @@ module Rack
       @response ||= Rack::Response.new(body, status, headers)
     end
 
-    def set_i18n_locale
-      new_locale = check_accepted? ? accepted_locale(locale.to_sym, default_locale) : locale.to_sym
+    def set_i18n
+      new_locale = check_accepted? ? accepted_locale(user_locale.to_sym, default_locale) : user_locale.to_sym
       I18n.locale = env["rack.locale"] = new_locale
     end
 
@@ -95,6 +95,10 @@ module Rack
       lang.split("-").first
     end
 
+    def user_locale
+      @user_locale ||= cookie_locale || browser_locale || default_locale
+    end
+
     def weighted_langs
       @weighted_langs ||= split_http_accept_languages.sort { |a, b| b[1] <=> a[1] }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-user-locale
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Stuart Chinery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-02 00:00:00.000000000 Z
+date: 2020-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.2
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '11.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '11.1'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.13'
+        version: '5.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.13'
+        version: '5.14'
 - !ruby/object:Gem::Dependency
   name: minitest-fail-fast
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.78'
+        version: '0.79'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.78'
+        version: '0.79'
 description: A Rack module for getting and setting a user's locale via a cookie or
   browser default language.
 email: