rails_locale_detection 2.3.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: da94d0ec0d03f37345a4a131ef18c8d3362824c0
-  data.tar.gz: 57a594826fb7ce78c8834cb2bbd9e946310ffd91
+SHA256:
+  metadata.gz: dec076589ca16f216a536e23b3d099e774928fd14b56a24bf8254e05348c715e
+  data.tar.gz: 471f5933c6021b16f900d54a6f77e4a1c5c71aedd488e54971168902bdb98aa0
 SHA512:
-  metadata.gz: c0a227eeb4c9a54e6cddfaf11200898b575a1513fb6d86055aa5f955118a984b685e3590f9e99f5fd36a8ef376c9090d28b476dc91a9861ce1336388b6cf8e62
-  data.tar.gz: 690f7ddf3bd22052dce18345d6edab80b23a66c1e9be5fe81dc9c41dffd43ee835b389129757091684b3f25d878108ef15df277ba8f06c43b72c79c5b34fc14e
+  metadata.gz: e8866c4544627be14a013f7d1d414f0e35bad3aff38b221394ebc9d9d9f3dfd5948eecb6ea7ab4b7c8575ac0d4d2fcf64a5cb9822f4ee2049f24314d1baa3253
+  data.tar.gz: 31f10d8820d4867224a0ae48dff54d639077c48751240f8ebc85f40c94d980d02d509f728aea4f70e5bf578843aa8bb4e5b1d86128c220d3d55c3858be83c8b0

data/.github/workflows/ci.yml

@@ -0,0 +1,38 @@
+name: CI
+
+on:
+  push:
+    branches: [master, main]
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["3.1", "3.2", "3.3", "3.4"]
+        gemfile:
+          - rails_6.1
+          - rails_7.0
+          - rails_7.1
+          - rails_7.2
+          - rails_8.0
+        exclude:
+          - ruby: "3.1"
+            gemfile: rails_7.2
+          - ruby: "3.1"
+            gemfile: rails_8.0
+          - ruby: "3.4"
+            gemfile: rails_6.1
+
+    env:
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle exec rspec

data/.gitignore

@@ -1,3 +1,6 @@
+# dev config
+.vscode
+
 # rcov generated
 coverage
 
@@ -19,4 +22,4 @@ pkg
 .ruby-*
 
 # appraisals
-*.gemfile.lock
+*.gemfile.lock

data/.mise.toml

@@ -0,0 +1,2 @@
+[tools]
+ruby = "3.4.9"

data/Appraisals

@@ -1,27 +1,19 @@
-appraise "rails3.2" do
-  gem "rails", "3.2.22"
+appraise "rails-6.1" do
+  gem "rails", "~> 6.1.0"
 end
 
-appraise "rails4.0" do
-  gem "rails", "4.0.13"
+appraise "rails-7.0" do
+  gem "rails", "~> 7.0.0"
 end
 
-appraise "rails4.1" do
-  gem "rails", "4.1.13"
+appraise "rails-7.1" do
+  gem "rails", "~> 7.1.0"
 end
 
-appraise "rails4.2" do
-  gem "rails", "4.2.4"
+appraise "rails-7.2" do
+  gem "rails", "~> 7.2.0"
 end
 
-appraise "rails5.0" do
-  gem "rails", "5.0.7"
-end
-
-appraise "rails5.1" do
-  gem "rails", "5.1.6"
-end
-
-appraise "rails5.2" do
-  gem "rails", "5.2.0"
+appraise "rails-8.0" do
+  gem "rails", "~> 8.0.0"
 end

data/CHANGELOG.md

@@ -0,0 +1,37 @@
+# Changelog
+
+## 3.0.1 (2026-05-15)
+
+* Corrected `required_ruby_version` to `>= 3.1` to match the supported CI matrix
+* Documented `ActionController::API` support in the README
+* Added a compatibility line to the top of the README
+* Extracted changelog into `CHANGELOG.md`
+
+## 3.0 (2026-05-15)
+
+* Rails 6.1, 7.0, 7.1, 7.2, and 8.0 compatibility
+* Dropped support for Rails < 6.1 and Ruby < 3.1
+* `ActionController::API` controllers are now supported alongside `ActionController::Base`
+* Replaced Travis CI with GitHub Actions
+* Internal cleanup: removed legacy version conditionals, modernized syntax, dropped the `timecop` dev dependency in favor of ActiveSupport's `freeze_time`
+
+## 2.3 (2018-06-16)
+
+* Update dependencies
+
+## 2.2 (2017-04-22)
+
+* Cookie is now set only when the locale differs from the previous value, to avoid Set-Cookie headers being sent with every request
+
+## 2.1 (2016-08-01)
+
+* Rails 5 compatibility
+
+## 2.0 (2015-10-14)
+
+* Rails 4 compatibility
+* Namespace has been changed from Rails::LocaleDetection to RailsLocaleDetection,
+    although the previous namespace is still supported for legacy config files
+* Locale detection has been moved to a separate object, to avoid polluting controllers with extra methods.
+* Detection order has been changed to `param` first, as this make more sense in most contexts.
+* Shortcut locale accessors are now mixed into views as well

data/Gemfile.lock

@@ -1,161 +1,256 @@
 PATH
   remote: .
   specs:
-    rails_locale_detection (2.3.0)
-      http_accept_language (~> 2.0.5)
-      rails (>= 3.2.0)
+    rails_locale_detection (3.0.1)
+      http_accept_language (~> 2.1)
+      rails (>= 6.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.0)
-      actionpack (= 5.2.0)
+    actioncable (7.2.3.1)
+      actionpack (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.0)
-      actionpack (= 5.2.0)
-      actionview (= 5.2.0)
-      activejob (= 5.2.0)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.2.0)
-      actionview (= 5.2.0)
-      activesupport (= 5.2.0)
-      rack (~> 2.0)
+      zeitwerk (~> 2.6)
+    actionmailbox (7.2.3.1)
+      actionpack (= 7.2.3.1)
+      activejob (= 7.2.3.1)
+      activerecord (= 7.2.3.1)
+      activestorage (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
+      mail (>= 2.8.0)
+    actionmailer (7.2.3.1)
+      actionpack (= 7.2.3.1)
+      actionview (= 7.2.3.1)
+      activejob (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
+      mail (>= 2.8.0)
+      rails-dom-testing (~> 2.2)
+    actionpack (7.2.3.1)
+      actionview (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
+      cgi
+      nokogiri (>= 1.8.5)
+      racc
+      rack (>= 2.2.4, < 3.3)
+      rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.0)
-      activesupport (= 5.2.0)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+      useragent (~> 0.16)
+    actiontext (7.2.3.1)
+      actionpack (= 7.2.3.1)
+      activerecord (= 7.2.3.1)
+      activestorage (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
+      globalid (>= 0.6.0)
+      nokogiri (>= 1.8.5)
+    actionview (7.2.3.1)
+      activesupport (= 7.2.3.1)
       builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.0)
-      activesupport (= 5.2.0)
+      cgi
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activejob (7.2.3.1)
+      activesupport (= 7.2.3.1)
       globalid (>= 0.3.6)
-    activemodel (5.2.0)
-      activesupport (= 5.2.0)
-    activerecord (5.2.0)
-      activemodel (= 5.2.0)
-      activesupport (= 5.2.0)
-      arel (>= 9.0)
-    activestorage (5.2.0)
-      actionpack (= 5.2.0)
-      activerecord (= 5.2.0)
-      marcel (~> 0.3.1)
-    activesupport (5.2.0)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    appraisal (2.2.0)
+    activemodel (7.2.3.1)
+      activesupport (= 7.2.3.1)
+    activerecord (7.2.3.1)
+      activemodel (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
+      timeout (>= 0.4.0)
+    activestorage (7.2.3.1)
+      actionpack (= 7.2.3.1)
+      activejob (= 7.2.3.1)
+      activerecord (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
+      marcel (~> 1.0)
+    activesupport (7.2.3.1)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
+      minitest (>= 5.1, < 6)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+    appraisal (2.5.0)
       bundler
       rake
       thor (>= 0.14.0)
-    arel (9.0.0)
-    builder (3.2.3)
-    concurrent-ruby (1.0.5)
-    crass (1.0.4)
-    diff-lcs (1.3)
-    erubi (1.7.1)
-    gem-release (0.5.5)
-    globalid (0.4.1)
-      activesupport (>= 4.2.0)
-    http_accept_language (2.0.5)
-    i18n (0.7.0)
-    loofah (2.2.2)
+    base64 (0.3.0)
+    benchmark (0.5.0)
+    bigdecimal (4.1.2)
+    builder (3.3.0)
+    cgi (0.5.1)
+    concurrent-ruby (1.3.6)
+    connection_pool (2.5.5)
+    crass (1.0.6)
+    date (3.5.1)
+    diff-lcs (1.6.2)
+    drb (2.2.3)
+    erb (4.0.4.1)
+      cgi (>= 0.3.3)
+    erubi (1.13.1)
+    gem-release (2.2.4)
+    globalid (1.3.0)
+      activesupport (>= 6.1)
+    http_accept_language (2.1.1)
+    i18n (1.14.8)
+      concurrent-ruby (~> 1.0)
+    io-console (0.8.2)
+    irb (1.18.0)
+      pp (>= 0.6.0)
+      prism (>= 1.3.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    logger (1.7.0)
+    loofah (2.25.1)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.0)
+      nokogiri (>= 1.12.0)
+    mail (2.9.0)
+      logger
       mini_mime (>= 0.1.1)
-    marcel (0.3.2)
-      mimemagic (~> 0.3.2)
-    method_source (0.9.0)
-    mimemagic (0.3.2)
-    mini_mime (1.0.0)
-    mini_portile2 (2.3.0)
-    minitest (5.11.3)
-    nio4r (2.3.1)
-    nokogiri (1.8.3)
-      mini_portile2 (~> 2.3.0)
-    power_assert (1.1.2)
-    rack (2.0.5)
-    rack-test (1.0.0)
-      rack (>= 1.0, < 3)
-    rails (5.2.0)
-      actioncable (= 5.2.0)
-      actionmailer (= 5.2.0)
-      actionpack (= 5.2.0)
-      actionview (= 5.2.0)
-      activejob (= 5.2.0)
-      activemodel (= 5.2.0)
-      activerecord (= 5.2.0)
-      activestorage (= 5.2.0)
-      activesupport (= 5.2.0)
-      bundler (>= 1.3.0)
-      railties (= 5.2.0)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.1.0)
+    mini_mime (1.1.5)
+    minitest (5.27.0)
+    net-imap (0.5.14)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.2)
+      timeout
+    net-smtp (0.5.1)
+      net-protocol
+    nio4r (2.7.5)
+    nokogiri (1.18.10-aarch64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.10-aarch64-linux-musl)
+      racc (~> 1.4)
+    nokogiri (1.18.10-arm-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.10-arm-linux-musl)
+      racc (~> 1.4)
+    nokogiri (1.18.10-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.10-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.10-x86_64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.10-x86_64-linux-musl)
+      racc (~> 1.4)
+    pp (0.6.3)
+      prettyprint
+    prettyprint (0.2.0)
+    prism (1.9.0)
+    psych (5.3.1)
+      date
+      stringio
+    racc (1.8.1)
+    rack (3.2.6)
+    rack-session (2.1.2)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0)
+    rack-test (2.2.0)
+      rack (>= 1.3)
+    rackup (2.3.1)
+      rack (>= 3)
+    rails (7.2.3.1)
+      actioncable (= 7.2.3.1)
+      actionmailbox (= 7.2.3.1)
+      actionmailer (= 7.2.3.1)
+      actionpack (= 7.2.3.1)
+      actiontext (= 7.2.3.1)
+      actionview (= 7.2.3.1)
+      activejob (= 7.2.3.1)
+      activemodel (= 7.2.3.1)
+      activerecord (= 7.2.3.1)
+      activestorage (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
+      bundler (>= 1.15.0)
+      railties (= 7.2.3.1)
+    rails-dom-testing (2.3.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.0)
-      actionpack (= 5.2.0)
-      activesupport (= 5.2.0)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (11.2.2)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rails-html-sanitizer (1.7.0)
+      loofah (~> 2.25)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+    railties (7.2.3.1)
+      actionpack (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
+      cgi
+      irb (~> 1.13)
+      rackup (>= 1.0.0)
+      rake (>= 12.2)
+      thor (~> 1.0, >= 1.2.2)
+      tsort (>= 0.2)
+      zeitwerk (~> 2.6)
+    rake (13.4.2)
+    rdoc (7.2.0)
+      erb
+      psych (>= 4.0.0)
+      tsort
+    reline (0.6.3)
+      io-console (~> 0.5)
+    rspec-core (3.13.6)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-rails (3.7.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    sprockets (3.7.1)
+      rspec-support (~> 3.13.0)
+    rspec-rails (6.1.5)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
+      railties (>= 6.1)
+      rspec-core (~> 3.13)
+      rspec-expectations (~> 3.13)
+      rspec-mocks (~> 3.13)
+      rspec-support (~> 3.13)
+    rspec-support (3.13.7)
+    securerandom (0.4.1)
+    stringio (3.2.0)
+    thor (1.5.0)
+    timeout (0.6.1)
+    tsort (0.2.0)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    test-unit (3.2.8)
-      power_assert
-    thor (0.20.0)
-    thread_safe (0.3.6)
-    timecop (0.6.3)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    websocket-driver (0.7.0)
+    useragent (0.16.11)
+    websocket-driver (0.8.0)
+      base64
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.6.18)
 
 PLATFORMS
-  ruby
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  arm-linux-gnu
+  arm-linux-musl
+  arm64-darwin
+  x86_64-darwin
+  x86_64-linux-gnu
+  x86_64-linux-musl
 
 DEPENDENCIES
-  appraisal (~> 2.2.0)
-  bundler (~> 1.16.2)
-  gem-release (~> 0.5.3)
-  i18n (~> 0.7.0)
+  appraisal (~> 2.5)
+  gem-release (~> 2.2)
   rails_locale_detection!
-  rake (~> 11.2.2)
-  rspec-rails (~> 3.0)
-  test-unit (~> 3.0)
-  timecop (~> 0.6.1)
+  rake (~> 13.0)
+  rspec-rails (~> 6.1)
 
 BUNDLED WITH
-   1.16.2
+   2.7.2

data/README.md

@@ -1,7 +1,8 @@
 # rails_locale_detection
 
-[![Build Status](https://travis-ci.org/mateomurphy/rails_locale_detection.png?branch=master)](https://travis-ci.org/mateomurphy/rails_locale_detection)
-[![Dependency Status](https://gemnasium.com/mateomurphy/rails_locale_detection.png)](https://gemnasium.com/mateomurphy/rails_locale_detection)
+[![CI](https://github.com/mateomurphy/rails_locale_detection/actions/workflows/ci.yml/badge.svg)](https://github.com/mateomurphy/rails_locale_detection/actions/workflows/ci.yml)
+
+**Compatibility:** Rails 6.1–8.0, Ruby 3.1+
 
 Sets the current locale of a request using a combination of params, cookies, http headers, and an optional user object.
 
@@ -28,7 +29,9 @@ To support user locales, add a `user_locale` method
       end
     end
 
-Methods for accessing `current_locale`, `available_locales`, and `alternate_locales` are available in controller and views
+Methods for accessing `current_locale`, `available_locales`, and `alternate_locales` are available in controller and views.
+
+Works with both `ActionController::Base` and `ActionController::API` controllers.
 
 ## Configuration
 
@@ -36,7 +39,7 @@ Configuration is done via a block that can be added as an initializer:
 
     RailsLocaleDetection.config do |config|
       config.locale_expiry = 3.months
-      config.set_default_url_option = :always # valid values are true, false, :always, :never and :explicity
+      config.set_default_url_option = :always # valid values are true, false, :always, :never and :explicitly
       config.detection_order = [:param, :user, :cookie, :request]
       config.automatically_detect = true
       config.locale_key = :locale
@@ -48,7 +51,7 @@ The configuration options:
 * `set_default_url_option` determines under which conditions the `default_url_option` is set
   * `true` or `:always` sets the option on all requests
   * `false` or `:never` never sets the option
-  * `:explicity` sets the option only when a param[:locale] is present
+  * `:explicitly` sets the option only when a `params[:locale]` is present
 * `detection_order` set the order in which locale detection occurs. Omit values to skip those sources
 * `automatically_detect` configures automatic inclusion of the detection callback.
     You can set this to false and include the callback yourself by calling `detect_locale` in your controller as required.
@@ -56,26 +59,7 @@ The configuration options:
 
 ## Changelog
 
-### 2.3 (2018-06-16)
-
-* Update dependencies
-
-### 2.2 (2017-04-22)
-
-* Cookie is now set only when the locale differs from the previous value, to avoid Set-Cookie headers being sent with every request
-
-### 2.1 (2016-08-01)
-
-* Rails 5 compatibility
-
-### 2.0 (2015-10-14)
-
-* Rails 4 compatibility
-* Namespace has been changed from Rails::LocaleDetection to RailsLocaleDetection,
-    although the previous namespace is still supported for legacy config files
-* Locale detection has been moved to a seperate object, to avoid polluting controllers with extra methods.
-* Detection order has been changed to `param` first, as this make more sense in most contexts.
-* Shortcut locale accessors are now mixed into views as well
+See [CHANGELOG.md](CHANGELOG.md).
 
 ## Contributing to rails_locale_detection
 

data/gemfiles/{rails4.2.gemfile → rails_6.1.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "4.2.4"
+gem "rails", "~> 6.1.0"
 
 gemspec path: "../"

data/gemfiles/{rails3.2.gemfile → rails_7.0.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "3.2.22"
+gem "rails", "~> 7.0.0"
 
 gemspec path: "../"

data/gemfiles/{rails4.0.gemfile → rails_7.1.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "4.0.13"
+gem "rails", "~> 7.1.0"
 
 gemspec path: "../"

data/gemfiles/{rails4.1.gemfile → rails_7.2.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "4.1.13"
+gem "rails", "~> 7.2.0"
 
 gemspec path: "../"

data/gemfiles/rails_8.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 8.0.0"
+
+gemspec path: "../"

data/lib/rails_locale_detection/controller_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsLocaleDetection
   module ControllerMethods
     extend ActiveSupport::Concern
@@ -8,14 +10,8 @@ module RailsLocaleDetection
     end
 
     module ClassMethods
-      if ::Rails.version.to_s < "4.0"
-        def detect_locale
-          append_before_filter LocaleDetector
-        end
-      else
-        def detect_locale
-          append_before_action LocaleDetector
-        end
+      def detect_locale
+        append_before_action LocaleDetector
       end
     end
 

data/lib/rails_locale_detection/detection_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsLocaleDetection
   module DetectionMethods
     # returns the (symbolized) value passed if it's in the available_locales
@@ -40,15 +42,21 @@ module RailsLocaleDetection
 
       if locale_from_cookie != current_locale
         cookies[locale_key] = {
-          :value => current_locale,
-          :expires => RailsLocaleDetection.locale_expiry.from_now
+          value: current_locale,
+          expires: RailsLocaleDetection.locale_expiry.from_now
         }
       end
     end
 
-    # returns true if the default url option should be set for this request
     def set_default_url_option_for_request?
-      RailsLocaleDetection.set_default_url_option === true || RailsLocaleDetection.set_default_url_option == :always || RailsLocaleDetection.set_default_url_option == :explicitly && params[locale_key].present?
+      case RailsLocaleDetection.set_default_url_option
+      when true, :always
+        true
+      when :explicitly
+        params[locale_key].present?
+      else
+        false
+      end
     end
   end
 end

data/lib/rails_locale_detection/locale_accessors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsLocaleDetection
   module LocaleAccessors
     def alternate_locales

data/lib/rails_locale_detection/locale_detector.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsLocaleDetection
   class LocaleDetector
     include DetectionMethods
@@ -5,7 +7,7 @@ module RailsLocaleDetection
 
     attr_reader :controller
 
-    delegate :params, :request, :default_url_options, :user_locale, :http_accept_language, :to => :controller
+    delegate :params, :request, :default_url_options, :user_locale, :http_accept_language, to: :controller
 
     def initialize(controller = nil)
       @controller = controller

data/lib/rails_locale_detection/railtie.rb

@@ -1,13 +1,19 @@
+# frozen_string_literal: true
+
 module RailsLocaleDetection
   class Railtie < Rails::Railtie
-    initializer "rails_locale_detection.append_before_filter" do
-      ActiveSupport.on_load(:action_controller) do
-        ActionController::Base.send :include, RailsLocaleDetection::ControllerMethods
+    initializer "rails_locale_detection.include_controller_methods" do
+      ActiveSupport.on_load(:action_controller_base) do
+        include RailsLocaleDetection::ControllerMethods
       end
-      
+
+      ActiveSupport.on_load(:action_controller_api) do
+        include RailsLocaleDetection::ControllerMethods
+      end
+
       ActiveSupport.on_load(:action_view) do
-        ActionView::Base.send :include, Rails::LocaleDetection::LocaleAccessors
-      end      
+        include RailsLocaleDetection::LocaleAccessors
+      end
     end
   end
-end
+end

data/lib/rails_locale_detection/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsLocaleDetection
-  VERSION = "2.3.0"
+  VERSION = "3.0.1"
 end

data/lib/rails_locale_detection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails'
 require 'i18n'
 require 'http_accept_language'

data/rails_locale_detection.gemspec

@@ -13,20 +13,17 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/mateomurphy/rails_locale_detection"
   gem.license       = 'MIT'
 
+  gem.required_ruby_version = '>= 3.1'
+
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency('http_accept_language', '~> 2.0.5')
-  gem.add_dependency('rails', '>= 3.2.0')
+  gem.add_dependency('http_accept_language', '~> 2.1')
+  gem.add_dependency('rails', '>= 6.1')
 
-  gem.add_development_dependency('appraisal', '~> 2.2.0')
-  gem.add_development_dependency('bundler', '~> 1.16.2')
-  gem.add_development_dependency('i18n', '~> 0.7.0')
-  gem.add_development_dependency('gem-release', '~> 0.5.3')
-  gem.add_development_dependency('rake', '~> 11.2.2')
-  gem.add_development_dependency('rspec-rails', '~> 3.0')
-  gem.add_development_dependency('timecop', '~> 0.6.1')
-  gem.add_development_dependency('test-unit', '~> 3.0')
+  gem.add_development_dependency('appraisal', '~> 2.5')
+  gem.add_development_dependency('gem-release', '~> 2.2')
+  gem.add_development_dependency('rake', '~> 13.0')
+  gem.add_development_dependency('rspec-rails', '~> 6.1')
 end

data/spec/rails_locale_detection/controller_methods_spec.rb

@@ -12,23 +12,7 @@ describe RailsLocaleDetection::ControllerMethods do
     expect(controller.class).to respond_to(:detect_locale)
   end
 
-  context 'when the rails is 4.0 or later' do
-    before do
-      skip "Rails version is #{::Rails.version.to_s}" unless ::Rails.version.to_s >= '4.0'
-    end
-
-    it 'adds the detector as a before action' do
-      expect(controller.class.before_actions).to eq([[RailsLocaleDetection::LocaleDetector]])
-    end
-  end
-
-  context 'when the rails is less than 4.0' do
-    before do
-      skip "Rails version is #{::Rails.version.to_s}" unless ::Rails.version.to_s < '4.0'
-    end
-
-    it 'adds the detector as a before filter' do
-      expect(controller.class.before_filters).to eq([[RailsLocaleDetection::LocaleDetector]])
-    end
+  it 'adds the detector as a before action' do
+    expect(controller.class.before_actions).to eq([[RailsLocaleDetection::LocaleDetector]])
   end
 end

data/spec/spec_helper.rb

@@ -1,14 +1,20 @@
+require 'logger'
 require 'abstract_controller'
 require 'action_controller'
 require 'active_support/core_ext/integer/time'
 require 'active_support/core_ext/numeric/time'
+require 'active_support/testing/time_helpers'
 require 'action_view'
 require 'rspec/rails'
-require 'timecop'
 require 'rails_locale_detection'
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 I18n.default_locale = :en
 I18n.available_locales = [:en, :fr]
-Timecop.freeze
+
+RSpec.configure do |config|
+  config.include ActiveSupport::Testing::TimeHelpers
+  config.before(:each) { freeze_time }
+  config.after(:each)  { travel_back }
+end

data/spec/support/mocks.rb

@@ -6,11 +6,7 @@ class MockRequest
   def initialize
     @env = {'HTTP_ACCEPT_LANGUAGE' => ''}
     @cookies = {}
-    @cookie_jar = if ::Rails.version.to_s < "5.0"
-      ActionDispatch::Cookies::CookieJar.build(self)
-    else
-      ActionDispatch::Cookies::CookieJar.build(self, @cookies)
-    end
+    @cookie_jar = ActionDispatch::Cookies::CookieJar.build(self, @cookies)
   end
 
   def host
@@ -20,6 +16,10 @@ class MockRequest
   def ssl?
     false
   end
+
+  def cookies_same_site_protection
+    proc { nil }
+  end
 end
 
 class MockUser
@@ -44,20 +44,9 @@ class MockController
   end
 
   class << self
-    attr_reader :before_filters
     attr_reader :before_actions
   end
 
-  def self.before_filter(*args)
-    @before_filters ||= []
-    @before_filters << args
-  end
-
-  def self.append_before_filter(*args)
-    @before_filters ||= []
-    @before_filters << args
-  end
-
   def self.append_before_action(*args)
     @before_actions ||= []
     @before_actions << args

data/spec/support/rails.rb

@@ -24,12 +24,7 @@ class CallbackTestsController < ActionController::Base
   end
 
   def show
-    if ::Rails.version.to_s < "4.1"
-      render text: current_locale
-    else
-      render plain: current_locale
-    end
-
+    render plain: current_locale
   end
 
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rails_locale_detection
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Mateo Murphy
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-17 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_accept_language
@@ -16,140 +15,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.16.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.16.2
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.2.2
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.2.2
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '6.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.1
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '6.1'
 description: Sets the current locale of a request using a combination of params, cookies,
   and http headers
 email:
@@ -159,22 +102,22 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".document"
+- ".github/workflows/ci.yml"
 - ".gitignore"
+- ".mise.toml"
 - ".rspec"
-- ".travis.yml"
 - Appraisals
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
-- gemfiles/rails3.2.gemfile
-- gemfiles/rails4.0.gemfile
-- gemfiles/rails4.1.gemfile
-- gemfiles/rails4.2.gemfile
-- gemfiles/rails5.0.gemfile
-- gemfiles/rails5.1.gemfile
-- gemfiles/rails5.2.gemfile
+- gemfiles/rails_6.1.gemfile
+- gemfiles/rails_7.0.gemfile
+- gemfiles/rails_7.1.gemfile
+- gemfiles/rails_7.2.gemfile
+- gemfiles/rails_8.0.gemfile
 - lib/rails_locale_detection.rb
 - lib/rails_locale_detection/controller_methods.rb
 - lib/rails_locale_detection/detection_methods.rb
@@ -195,7 +138,6 @@ homepage: https://github.com/mateomurphy/rails_locale_detection
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -203,24 +145,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Locale setting for rails projects
-test_files:
-- spec/controllers/callback_tests_controller_spec.rb
-- spec/rails_locale_detection/config_spec.rb
-- spec/rails_locale_detection/controller_methods_spec.rb
-- spec/rails_locale_detection/locale_accessors_spec.rb
-- spec/rails_locale_detection/locale_detector_spec.rb
-- spec/spec_helper.rb
-- spec/support/mocks.rb
-- spec/support/rails.rb
+test_files: []

data/.travis.yml

@@ -1,15 +0,0 @@
-before_install: gem install bundler --version '1.16.2'
-
-sudo: false
-
-gemfile:
-  - gemfiles/rails3.2.gemfile
-  - gemfiles/rails4.0.gemfile
-  - gemfiles/rails4.1.gemfile
-  - gemfiles/rails4.2.gemfile
-  - gemfiles/rails5.0.gemfile
-  - gemfiles/rails5.1.gemfile
-  - gemfiles/rails5.2.gemfile
-
-rvm:
-  - "2.3.0"

data/gemfiles/rails5.0.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "5.0.7"
-
-gemspec path: "../"

data/gemfiles/rails5.1.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "5.1.6"
-
-gemspec path: "../"

data/gemfiles/rails5.2.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "5.2.0"
-
-gemspec path: "../"