iain · mjankowski · Jun 20, 2024 · Jun 20, 2024 · Jun 20, 2024 · Jun 20, 2024
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,36 @@
+name: Ruby
+
+on:
+  push:
+    branches:
+    - main
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby-version:
+          - '3.0'
+          - '3.1'
+          - '3.2'
+          - '3.3'
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+
+      - name: Run specs
+        run: |
+          bin/rspec
+
+      - name: Lint with standard
+        run: |
+          bin/standardrb
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,8 @@ pkg/*
 .rvmrc
 log/*.log
 tmp/
+
+# rspec failure tracking
+.rspec_status
+
+/coverage/
diff --git a/.rspec b/.rspec
@@ -1,2 +1,3 @@
 --color
 --format progress
+--require spec_helper
diff --git a/.travis.yml b/.travis.yml
diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,12 @@
 source "https://rubygems.org"
 
 gemspec
+
+gem "combustion"
+gem "rack-test"
+gem "rails", "> 6"
+gem "rake"
+gem "rspec-rails"
+gem "rspec"
+gem "simplecov", require: false
+gem "standard"
diff --git a/Guardfile b/Guardfile
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2024
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/README.md b/README.md
@@ -1,10 +1,15 @@
-# HttpAcceptLanguage [![Build Status](https://travis-ci.org/iain/http_accept_language.svg?branch=master)](https://travis-ci.org/iain/http_accept_language)
+# HttpAcceptLanguage
 
-A gem which helps you detect the users preferred language, as sent by the "Accept-Language" HTTP header.
+A gem which helps you detect the users preferred language, as sent by the
+"Accept-Language" HTTP header.
 
-The algorithm is based on [RFC 2616](http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html), with one exception:
-when a user requests "en-US" and "en" is an available language, "en" is deemed compatible with "en-US".
-The RFC specifies that the requested language must either exactly match the available language or must exactly match a prefix of the available language. This means that when the user requests "en" and "en-US" is available, "en-US" would be compatible, but not the other way around. This is usually not what you're looking for.
+The algorithm is based on [RFC 2616], with one exception: when a user requests
+`en-US` and `en` is an available language, `en` is deemed compatible with
+`en-US`. The RFC specifies that the requested language must either exactly match
+the available language or must exactly match a prefix of the available language.
+This means that when the user requests `en` and `en-US` is available, `en-US`
+would be compatible, but not the other way around. This is usually not what
+you're looking for.
 
 Since version 2.0, this gem is Rack middleware.
 
@@ -30,11 +35,11 @@ class SomeController < ApplicationController
 end
 ```
 
-You can easily set the locale used for i18n in a before-filter:
+You can easily set the locale used for i18n with a filter:
 
 ```ruby
 class SomeController < ApplicationController
-  before_filter :set_locale
+  before_action :set_locale
 
   private
     def set_locale
@@ -43,12 +48,11 @@ class SomeController < ApplicationController
 end
 ```
 
-If you want to enable this behavior by default in your controllers, you can just include the provided concern:
+To enable this behavior by default, include the provided concern:
 
 ```ruby
 class ApplicationController < ActionController::Base
   include HttpAcceptLanguage::AutoLocale
-
 #...
 end
 ```
@@ -88,21 +92,21 @@ end
 
 ## Available methods
 
-* **user_preferred_languages**:
-  Returns a sorted array based on user preference in HTTP_ACCEPT_LANGUAGE, sanitized and all.
-* **preferred_language_from(languages)**:
-  Finds the locale specifically requested by the browser
-* **compatible_language_from(languages)**:
-  Returns the first of the user_preferred_languages that is compatible with the available locales.
+* **user_preferred_languages**: Returns a sorted array based on user preference
+  in `HTTP_ACCEPT_LANGUAGE`, sanitized and all.
+* **preferred_language_from(languages)**: Finds the locale specifically
+  requested by the browser.
+* **compatible_language_from(languages)**: Returns the first of the
+  `user_preferred_languages` that is compatible with the available locales.
   Ignores region.
-* **sanitize_available_locales(languages)**:
-  Returns a supplied list of available locals without any extra application info
-  that may be attached to the locale for storage in the application.
-* **language_region_compatible_from(languages)**:
-  Returns the first of the user preferred languages that is
-  also found in available languages.  Finds best fit by matching on
-  primary language first and secondarily on region.  If no matching region is
-  found, return the first language in the group matching that primary language.
+* **sanitize_available_locales(languages)**: Returns a supplied list of
+  available locales without any extra application info that may be attached to
+  the locale for storage in the application.
+* **language_region_compatible_from(languages)**: Returns the first of the user
+  preferred languages that is also found in available languages.  Finds best fit
+  by matching on primary language first and secondarily on region.  If no
+  matching region is found, return the first language in the group matching that
+  primary language.
 
 ## Installation
 
@@ -122,4 +126,6 @@ Run `bundle install` to install it.
 
 ---
 
-Released under the MIT license
+Released under the MIT license.
+
+[RFC 2616]: http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html
diff --git a/Rakefile b/Rakefile
@@ -1,13 +1,6 @@
 require "bundler/gem_tasks"
 
-require 'rspec/core/rake_task'
+require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 
-require 'cucumber/rake/task'
-Cucumber::Rake::Task.new(:cucumber)
-
-Cucumber::Rake::Task.new(:wip, "Run features tagged with @wip") do |t|
-  t.profile = "wip"
-end
-
-task :default => [:spec, :cucumber, :wip]
+task default: [:spec]
diff --git a/bin/rspec b/bin/rspec
@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+
+bundle_binstub = File.expand_path("bundle", __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")
diff --git a/bin/setup b/bin/setup
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here
diff --git a/bin/standardrb b/bin/standardrb
@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'standardrb' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+
+bundle_binstub = File.expand_path("bundle", __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("standard", "standardrb")
diff --git a/config.ru b/config.ru
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require "rubygems"
+require "bundler"
+
+Bundler.require :default, :development
+
+Combustion.initialize! :all
+run Combustion::Application
diff --git a/cucumber.yml b/cucumber.yml
diff --git a/features/rails_integration.feature b/features/rails_integration.feature
diff --git a/features/steps/rails.rb b/features/steps/rails.rb