rack-user-locale 1.0.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a996b94aedc7a9d81e79b92a22ea8b89eaaefee9b4d757f8409ccdf951980cf
-  data.tar.gz: 94c2d1fa648b0921b9ad1cedf4a0b3c52fb371708745161bd6c3f80f4be93e50
+  metadata.gz: c0309b9693bca3c0277caa6678a05322cbcb197374e036efd9f0a1909be450a6
+  data.tar.gz: 0e08b6bc4d7ab39d99c56b1ad7c69036817be89c3dae5628ae35c128f349a5cf
 SHA512:
-  metadata.gz: b7d017f4c32cbed718cb66c97d761f9a8cfc2b6fabe563b8bc4e37c54a53f4268764fe3652d7f328d165e2c96f3075fbe5c2695b0158ef5406b988746d07a86e
-  data.tar.gz: dc4303e47bf37925d0e739b560a32845cff61f5f5ad40a784c953896b0b26e6228a46dbbb21b47f74973c6bdf86badee137186495350b1bb7ffceb2ad681f57a
+  metadata.gz: 979f73d6c22e4575c66078d0bcadec97e5498401fe778a0a3f044a083369a9b542b6891cee1daaf5cc5c34cb0435b85acb8b4c0066863cb0c96cbe96421f74cc
+  data.tar.gz: 2c0c1d348b5f908e48d0891ff4dae994b8160bc9e41258423f1c231a6976407616214f8559e28016f66e2cf4a7db1b5c674abd3afdea08b786862e58e9718ade

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2019 Stuart Chinery
+Copyright (c) 2021 Technical Panda Ltd
 
 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,15 +1,9 @@
 # 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.svg)](http://badge.fury.io/rb/rack-user-locale)
 
 A Rack module for getting and setting a user's locale via a cookie or browser default language.
 
-Credit to these gems for pointing me in the direction I wanted to go in...
-
-- https://github.com/rack/rack-contrib/blob/master/lib/rack/contrib/locale.rb
-- https://github.com/jeremyvdw/rack-locale-selector
-- https://github.com/jeffersongirao/rack-locale_chooser
-
 ## Installation
 
 ```
@@ -74,18 +68,23 @@ If you don't want to use the default cookie name of `user-locale`, you can set i
 use Rack::UserLocale, cookie_name: "some-cookie-name"
 ```
 
-## Contributing to rack-user-locale
+## Inspiration
+
+Credit to these gems for pointing me in the direction I wanted to go in...
+
+- https://github.com/rack/rack-contrib/blob/main/lib/rack/contrib/locale.rb
+- https://github.com/jeremyvdw/rack-locale-selector
+- https://github.com/jeffersongirao/rack-locale_chooser
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/technicalpanda/rack-user-locale. 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.
+
+## License
 
-- Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
-- Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
-- Fork the project.
-- Start a feature/bugfix branch.
-- Commit and push until you are happy with your contribution.
-- Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-- Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
 
-## Copyright
+## Code of Conduct
 
-Copyright (c) 2020 [Stuart Chinery](https://github.com/schinery) and [Dave Hrycyszyn](https://github.com/futurechimp).
+Everyone interacting with this project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/technicalpanda/rack-user-locale/blob/main/CODE_OF_CONDUCT.md).
 
-See LICENSE.txt for further details.

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.3.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.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Stuart Chinery
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-02 00:00:00.000000000 Z
+date: 2021-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -16,28 +16,98 @@ 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.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: 2.2.0
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.1'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.14'
+- !ruby/object:Gem::Dependency
+  name: minitest-fail-fast
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: minitest-macos-notification
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -66,10 +136,52 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: rubocop-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 description: A Rack module for getting and setting a user's locale via a cookie or
   browser default language.
 email:
-- stuart.chinery@gmail.com
+- code@technicalpanda.co.uk
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -80,11 +192,11 @@ files:
 - VERSION
 - lib/rack/user-locale/version.rb
 - lib/user_locale.rb
-homepage: https://github.com/schinery/rack-user-locale
+homepage: https://github.com/technicalpanda/rack-user-locale
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -92,15 +204,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: A Rack module for getting and setting a user's locale
 test_files: []