rack-user-locale 0.5.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18edbefb461736ba8d7daca4b82cab3ff3b1a326c156c6056eeb99a9c194e499
-  data.tar.gz: 3979ae6da19cd2abf1ae03f16be3e7a3109f2c4bd90c0dc9c3c2c0d9ac00ca5e
+  metadata.gz: 2a996b94aedc7a9d81e79b92a22ea8b89eaaefee9b4d757f8409ccdf951980cf
+  data.tar.gz: 94c2d1fa648b0921b9ad1cedf4a0b3c52fb371708745161bd6c3f80f4be93e50
 SHA512:
-  metadata.gz: 9f225a2e4cf119c3b14e45c50a8ffa2cd3e5d641871d0b3d9aa031b3c4b653255ff794986272c7df23cdbc1d8cd1dbd96ed5451d9a22d6347ec3fb8cf1d34913
-  data.tar.gz: d6279eeb3abae40976c7920a72e71089f44ee982ac988c63b038ea4a3ec2f5680a3ec98b471459c6739222ac09cd4b6f19acc0aa9824556ffb265d8ebafcf0be
+  metadata.gz: b7d017f4c32cbed718cb66c97d761f9a8cfc2b6fabe563b8bc4e37c54a53f4268764fe3652d7f328d165e2c96f3075fbe5c2695b0158ef5406b988746d07a86e
+  data.tar.gz: dc4303e47bf37925d0e739b560a32845cff61f5f5ad40a784c953896b0b26e6228a46dbbb21b47f74973c6bdf86badee137186495350b1bb7ffceb2ad681f57a

data/README.md

@@ -86,6 +86,6 @@ use Rack::UserLocale, cookie_name: "some-cookie-name"
 
 ## Copyright
 
-Copyright (c) 2019 [Stuart Chinery](https://github.com/schinery) and [Dave Hrycyszyn](https://github.com/futurechimp).
+Copyright (c) 2020 [Stuart Chinery](https://github.com/schinery) and [Dave Hrycyszyn](https://github.com/futurechimp).
 
 See LICENSE.txt for further details.

data/VERSION

@@ -1 +1 @@
-0.5.0
+1.0.0

data/lib/user_locale.rb

@@ -0,0 +1,102 @@
+# frozen_string_literal: true
+
+require "i18n"
+
+module Rack
+  class UserLocale
+    attr_reader :app, :body, :env, :headers, :options, :status
+
+    def initialize(app, options = {})
+      @app = app
+      @options = {
+        accepted_locales: [],
+        cookie_name: "user-locale"
+      }.merge(options)
+    end
+
+    def call(env)
+      @env = env
+      set_i18n_locale
+      app.call(env) && return unless request.get?
+
+      @status, @headers, @body = app.call(env)
+      set_response_cookie
+      response.finish
+    end
+
+    private
+
+    def accepted_locale(locale, other_locale = nil)
+      options[:accepted_locales].include?(locale) ? locale : other_locale
+    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)
+    end
+
+    def check_accepted?
+      @check_accepted ||= options[:accepted_locales].count.positive?
+    end
+
+    def cookie_locale
+      @cookie_locale ||= request.cookies[options[:cookie_name]]
+    end
+
+    def default_locale
+      @default_locale ||= I18n.default_locale
+    end
+
+    def http_accept_languages
+      @http_accept_languages ||= env["HTTP_ACCEPT_LANGUAGE"]
+    end
+
+    def locale
+      @locale ||= cookie_locale || browser_locale || default_locale
+    end
+
+    def request
+      @request ||= Rack::Request.new(env)
+    end
+
+    def response
+      @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
+      I18n.locale = env["rack.locale"] = new_locale
+    end
+
+    def set_response_cookie
+      return if cookie_locale == I18n.locale.to_s
+
+      response.set_cookie(options[:cookie_name], value: I18n.locale, path: "/")
+    end
+
+    def split_http_accept_languages
+      @split_http_accept_languages ||= http_accept_languages.split(",").map do |l|
+        l += ";q=1.0" unless l =~ /;q=\d+\.\d+$/
+        l.split(";q=")
+      end
+    end
+
+    def split_lang(lang)
+      return if lang.nil?
+
+      lang.split("-").first
+    end
+
+    def weighted_langs
+      @weighted_langs ||= split_http_accept_languages.sort { |a, b| b[1] <=> a[1] }
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-user-locale
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Stuart Chinery
@@ -38,76 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.8
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.13'
-- !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.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-- !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
@@ -149,7 +79,7 @@ files:
 - Rakefile
 - VERSION
 - lib/rack/user-locale/version.rb
-- lib/user-locale.rb
+- lib/user_locale.rb
 homepage: https://github.com/schinery/rack-user-locale
 licenses:
 - MIT
@@ -169,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A Rack module for getting and setting a user's locale

data/lib/user-locale.rb

@@ -1,102 +0,0 @@
-# frozen_string_literal: true
-
-require "i18n"
-
-module Rack
-  class UserLocale
-    # TODO: Write notes
-    #
-    def initialize(app, options = {})
-      @app = app
-      @options = {
-        accepted_locales: [],
-        cookie_name: "user-locale"
-      }.merge(options)
-    end
-
-    # TODO: Write notes
-    #
-    def call(env)
-      @env = env
-      @request = Rack::Request.new(@env)
-      set_locale
-
-      @app.call(env) && return if @request.post? || @request.put? || @request.delete?
-
-      status, headers, body = @app.call(@env)
-      response = Rack::Response.new(body, status, headers)
-      response.set_cookie(@options[:cookie_name], value: I18n.locale, path: "/") if cookie_locale != I18n.locale.to_s
-      response.finish
-    end
-
-    private
-
-    # TODO: Write notes
-    #
-    def set_locale
-      new_locale = check_accepted? ? accepted_locale(locale.to_sym, default_locale) : locale.to_sym
-      I18n.locale = @env["rack.locale"] = new_locale
-    end
-
-    # TODO: Write notes
-    #
-    def accepted_locale(locale, other_locale = nil)
-      @options[:accepted_locales].include?(locale) ? locale : other_locale
-    end
-
-    # TODO: Write notes
-    #
-    def locale
-      cookie_locale || browser_locale || default_locale
-    end
-
-    # TODO: Write notes
-    #
-    def cookie_locale
-      @request.cookies[@options[:cookie_name]]
-    end
-
-    # TODO: Write notes
-    #
-    def browser_locale
-      accept_lang = @env["HTTP_ACCEPT_LANGUAGE"]
-      return if accept_lang.nil?
-
-      langs = accept_lang.split(",").map do |l|
-        l += ";q=1.0" unless l =~ /;q=\d+\.\d+$/
-        l.split(";q=")
-      end
-
-      langs.sort! { |a, b| b[1] <=> a[1] }
-
-      if check_accepted?
-        langs.each do |lang|
-          l = accepted_locale(split_lang(lang.first).to_sym)
-          return l unless l.nil?
-        end
-      end
-
-      split_lang(langs.first.first)
-    end
-
-    # TODO: Write notes
-    #
-    def split_lang(lang)
-      return if lang.nil?
-
-      lang.split("-").first
-    end
-
-    # TODO: Write notes
-    #
-    def default_locale
-      I18n.default_locale
-    end
-
-    # TODO: Write notes
-    #
-    def check_accepted?
-      @options[:accepted_locales].count.positive?
-    end
-  end
-end