rack-locale_memorable 0.5.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ffe06754e47f1f4e78b11466c82b3e6eec83328a39ced2f7643531cf13663d5
-  data.tar.gz: feeb7868eb676e2b53e2e8cb6d6f72344c54ce0f1552a0bac81ade90afbf1d63
+  metadata.gz: 9efbac61d08eec634b8977fc7c223f50c6dcd6cba0cfd09d7b368c3bd9f8eee9
+  data.tar.gz: e5c23a00f8386c708e24b3279c91c15bf71631153ece153c1904995f326424fa
 SHA512:
-  metadata.gz: 110f31d182de015b71c26bf2b9d952537c4444966efabe116c2a67d8eee59196d24515cb37a34df66f0d3d1fb308e74626ec11aac1d43f38feb932b79726f3f9
-  data.tar.gz: 16359f3551313019d6b346e071b520fd2dae13e44d6715149f95e2bc15ad77bfe7688aca30e3349b373ef40d9808a0c5bb657056192ab9def3ccc9a02971e920
+  metadata.gz: a3fced878df7d908990f9962c18375e39b9c569f687bb07ef53bb53870154ca248e7bcea5a660c9689df8562140d64a8a0f5f0a29eefa2bfe451cb487549ffb9
+  data.tar.gz: 68b01b69ed47d96825a705d65fd234ce4e703ac93ded7c8f646ba4aeb82ef3b4c68b4421b4f8a1746cac2fc6c8d5d00fd30085c7e08352d524a794b55899350a

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [Unreleased]
 
+## [1.0.0] - 2022-10-01
+
+### Changed
+
+- remove activesupport https://github.com/nov/rack-locale_memorable/pull/2
+
 ## [0.5.0] - 2022-10-01
 
 ### Changed

data/README.md

@@ -2,7 +2,7 @@
 
 Handle query params, cookie and HTTP_ACCEPT_LANGUAGE header to detect user-preffered locale, and remember it when necessary.
 
-Since some libraries (e.g., Devise & Warden) handles i18n strings in rack-middleware layer, setting `I18n.locale` is not enough for some cases.
+Since some libraries (e.g., Devise & Warden) or applications may handle i18n strings in rack-middleware layer, setting `I18n.locale` in Rails layer is not enough in such cases.
 
 This gem sets `I18n.locale` in rack-middleware layer, so that you can let other rack-middlewares use proper `I18n.locale`.
 
@@ -40,6 +40,7 @@ There are several customizable options listed below.
 * `cookie_options[:path]` (`/` by default)
 * `cookie_options[:http_only]` (`true` by default)
 * `cookie_options[:secure]` (`true` by default)
+* `cookie_options[:same_site]` (`nil` by default)
 
 You can customize them like below
 
@@ -54,13 +55,14 @@ Rails.application.configure do |config|
       domain:    'example.com',
       path:      '/localized',
       http_only: false,
-      secure:    Rails.env.production?
+      secure:    Rails.env.production?,
+      same_site  :none
     }
   )
 end
 ```
 
-NOTE: If you're using devise, set `Rack::LocaleMemorable` before `Warden::Manager`, otherwise you see warden error messages in wrong locale.
+NOTE: If you're using devise, set `Rack::LocaleMemorable` before `Warden::Manager`, otherwise you might see warden error messages in wrong locale.
 
 ```ruby
 Rails.application.configure do |config|

data/Rakefile

@@ -5,4 +5,16 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
+namespace :coverage do
+  desc "Open coverage report"
+  task :report do
+    require 'simplecov'
+    `open "#{File.join SimpleCov.coverage_path, 'index.html'}"`
+  end
+end
+
+task :spec do
+  Rake::Task[:'coverage:report'].invoke unless ENV['GITHUB_ACTIONS']
+end
+
 task default: :spec

data/lib/rack/locale_memorable/request.rb

@@ -28,7 +28,7 @@ module Rack
       end
 
       def primary_locale_from(locales)
-        available_locales_from(locales)&.first if locales.present?
+        available_locales_from(locales)&.first if locales
       end
 
       def available_locales_from(locales)

data/lib/rack/locale_memorable/response.rb

@@ -3,14 +3,15 @@
 module Rack
   class LocaleMemorable
     class Response < Rack::Response
-      def remember_locale(explicit_locale, key:, lifetime: 1.year, domain: nil, path: '/', http_only: true, secure: true)
+      def remember_locale(explicit_locale, key:, lifetime: 31536000, domain: nil, path: '/', http_only: true, secure: true, same_site: nil)
         set_cookie key, {
           value:     explicit_locale,
-          expires:   lifetime.from_now,
+          expires:   Time.at(Time.now.to_i + lifetime.to_i),
           domain:    domain,
           path:      path,
           http_only: http_only,
-          secure:    secure
+          secure:    secure,
+          same_site: same_site
         }.compact
       end
 

data/lib/rack/locale_memorable/version.rb

@@ -2,6 +2,6 @@
 
 module Rack
   class LocaleMemorable
-    VERSION = '0.5.0'
+    VERSION = '1.1.0'
   end
 end

data/lib/rack/locale_memorable.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-require 'active_support'
-require 'active_support/core_ext'
+require 'i18n'
 require 'http/accept'
 require 'rack'
 
@@ -16,11 +15,11 @@ module Rack
 
     def call(env)
       request = Request.new env
-      I18n.with_locale(request.detect_locale params_key: @params_key, cookie_key: @cookie_key) do
+      I18n.with_locale request.detect_locale(params_key: @params_key, cookie_key: @cookie_key) do
         env['rack.locale'] = I18n.locale.to_s
         status, headers, body = @app.call(env)
         response = Response.new body, status, headers
-        if request.explicit_locale.present?
+        if request.explicit_locale
           response.remember_locale request.explicit_locale, key: @cookie_key, **@cookie_options
         end
         response.finish

data/rack-locale_memorable.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.7.0'
 
   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/blob/main/CHANGELOG.md'
+  spec.metadata['source_code_uri'] = spec.homepage
+  spec.metadata['changelog_uri'] = File.join(spec.homepage, '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.
@@ -32,7 +32,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rack'
   spec.add_dependency 'i18n'
   spec.add_dependency 'http-accept'
-  spec.add_dependency 'activesupport'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'simplecov'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-locale_memorable
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 1.1.0
 platform: ruby
 authors:
 - nov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-01 00:00:00.000000000 Z
+date: 2023-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -177,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Remember locale in rack layer