rack-locale_memorable 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ccb7d078d2dd4d582f7db663cf0436da123b94e6531f8d6de83a63c1eb03bbd
-  data.tar.gz: eb20d6db30ef828dfac9f27843ab9a249308c889835f912e61986d1f08f1edc9
+  metadata.gz: ee932ccf31e17732f87bcbf4db7647cae4836b1424d85097da281ffe1ffaeddf
+  data.tar.gz: 9c807857bf6296170af7746df724aa24d90ff9f7fb22d4c41b508f365da51cda
 SHA512:
-  metadata.gz: 5b6212b7c2a58b6f110a22856ac52c8197600ccc9929f229147f8324d6342a15e5472ef45917fe11dfbdd2bf196877fd8b5e26f962cfa9668b95d7622b77cd8d
-  data.tar.gz: 6fdd32c5bad90120d759514971c20b2de1330fbc9774bbf218cd91a7781cfffb89f2a29f3da5547452b4ae1cede23d757d6b25ca345429cb7b5f81b6f98f0eae
+  metadata.gz: 4ba6eff0fbb1cd813a1ad908cea006779858702d63911592679893060b10ba0c464cef63d7a493ef366aaedac558fa85f492cbd9f6653b06de8e5baebac7ae97
+  data.tar.gz: ac2e798b0ac97a176af482b78f260eae3ece611c197f2435196895c869127d7cf2beb0c25d0798e5858003d369be131e7d2a097cbe8d11790a133755cb2082c6

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 ## [Unreleased]
 
+## [0.3.4] - 2022-09-28
+
+### Fixed
+
+- fix changelog url https://github.com/nov/rack-locale_memorable/commit/fc744c6fe1489cee12225b8cc5991a9f4d797278
+
+## [0.3.3] - 2022-09-28
+
+### Refactored
+
+- requre active_support/core_ext only https://github.com/nov/rack-locale_memorable/commit/bf56b49f064a30d9688d65d2dd2901763bf31cee
+- stop using request class's instance variables following response class's design https://github.com/nov/rack-locale_memorable/commit/056807010fcb5c01d4d1745f06f8a9f87aad2ec6
+
 ## [0.3.2] - 2022-09-28
 
 ### Fixed

data/README.md

@@ -21,29 +21,20 @@ Rails.application.configure do |config|
 end
 ```
 
-NOTE: If you're using devise, set `Rack::LocaleMemorable` before `Warden::Manager`, otherwise you see warden error messages in wrong locale.
-
-```ruby
-Rails.application.configure do |config|
-  config.middleware.insert_before Warden::Manager, Rack::LocaleMemorable
-end
-```
-
-By default, this gem handles
+By default, this gem handles locale variables in 3 places in the order below, and when explicit locale is specified (= when locale is specified via query params) in the request, remember it in cookie too.
 
-* `params['locale']` as explicit locale
-* `cookies['locale']` as remembered locale
-* `headers['HTTP_ACCEPT_LANGUAGE']` as implicit locale
+1. `params['locale']` as explicit locale
+2. `cookies['locale']` as remembered locale
+3. `headers['HTTP_ACCEPT_LANGUAGE']` as implicit locale
 
-and when explicit locale is specified in the request, remember it in cookie.
+There are several customizable options listed below.
 
-You can customize those values
 * params_key (`'locale'` by default)
 * cookie_key (`'locale'` by default)
 * secure_cookie (`true` by default)
 * cookie_lifetime (`1.year` by default)
 
-like below
+You can customize them like below
 
 ```ruby
 Rails.application.configure do |config|
@@ -57,6 +48,14 @@ Rails.application.configure do |config|
 end
 ```
 
+NOTE: If you're using devise, set `Rack::LocaleMemorable` before `Warden::Manager`, otherwise you see warden error messages in wrong locale.
+
+```ruby
+Rails.application.configure do |config|
+  config.middleware.insert_before Warden::Manager, Rack::LocaleMemorable
+end
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/rack/locale_memorable/request.rb

@@ -3,30 +3,24 @@
 module Rack
   class LocaleMemorable
     class Request < Rack::Request
-      attr_reader :explicit_locale, :params_key, :cookie_key
+      attr_reader :explicit_locale
 
-      def initialize(env, params_key:, cookie_key:)
-        super env
-        @params_key = params_key
-        @cookie_key = cookie_key
-      end
-
-      def detect_locale
+      def detect_locale(params_key:, cookie_key:)
         (
-          from_params ||
-          from_cookies ||
+          from_params(params_key) ||
+          from_cookies(cookie_key) ||
           from_headers
         )
       end
 
       private
 
-      def from_params
-        @explicit_locale = primary_locale_from params[params_key]
+      def from_params(key)
+        @explicit_locale = primary_locale_from params[key]
       end
 
-      def from_cookies
-        primary_locale_from cookies[cookie_key]
+      def from_cookies(key)
+        primary_locale_from cookies[key]
       end
 
       def from_headers

data/lib/rack/locale_memorable/version.rb

@@ -2,6 +2,6 @@
 
 module Rack
   class LocaleMemorable
-    VERSION = '0.3.2'
+    VERSION = '0.3.4'
   end
 end

data/lib/rack/locale_memorable.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_support'
-require 'active_support/all'
+require 'active_support/core_ext'
 require 'http/accept'
 require 'rack'
 
@@ -16,8 +16,8 @@ module Rack
     end
 
     def call(env)
-      request = Request.new(env, params_key: @params_key, cookie_key: @cookie_key)
-      I18n.with_locale(request.detect_locale) do
+      request = Request.new env
+      I18n.with_locale(request.detect_locale params_key: @params_key, cookie_key: @cookie_key) do
         status, headers, body = @app.call(env)
         response = Response.new body, status, headers
         if request.explicit_locale.present?

data/rack-locale_memorable.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = 'https://github.com/nov/rack-locale_memorable'
-  spec.metadata['changelog_uri'] = 'https://github.com/nov/rack-locale_memorable/CHANGELOG.md'
+  spec.metadata['changelog_uri'] = 'https://github.com/nov/rack-locale_memorable/blob/main/CHANGELOG.md'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-locale_memorable
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - nov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-27 00:00:00.000000000 Z
+date: 2022-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -147,7 +147,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/nov/rack-locale_memorable
   source_code_uri: https://github.com/nov/rack-locale_memorable
-  changelog_uri: https://github.com/nov/rack-locale_memorable/CHANGELOG.md
+  changelog_uri: https://github.com/nov/rack-locale_memorable/blob/main/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Remember locale in rack layer