rack-user-locale 0.0.5 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 0c4e00a7465d3f7c676c1a3b472b5cd078ac1b890c73c23f1cb64c27ecb05894
+  data.tar.gz: dae9ce1f81036483f82de4af343afc7c81100537a7861752139c1a74ec42cc11
+SHA512:
+  metadata.gz: f63d485dd1d5e57ef7111354ace7930fbc4e0e24e521c9d5334a0d5392043440dc5e10ba009e0696091766ff441096fbcbe7f20cab7f159a76e83b22a0bd212d
+  data.tar.gz: 4e29c8b32cecc1aaa87643779f2240a0e46ef2b06eb4a6e0c9df0981b4ec22d0db9f7cac374333d0eca2061633f47b23b8650c69a6e14a31917c08c0349665d2

data/.rubocop.yml

@@ -0,0 +1,25 @@
+AllCops:
+  TargetRubyVersion: 2.5
+
+# Use double quotes ALL THE TIME!!!
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+# Disable Style/Documentation because...
+Style/Documentation:
+  Enabled: false
+
+# Increase line length to 120
+Metrics/LineLength:
+  Max: 120
+
+# Exclude class and method length for test
+Metrics/BlockLength:
+  Exclude:
+    - "test/**/*"
+Metrics/ClassLength:
+  Exclude:
+    - "test/**/*"
+Metrics/MethodLength:
+  Exclude:
+    - "test/**/*"

data/.ruby-version

@@ -0,0 +1 @@
+2.5.1

data/.travis.yml

@@ -0,0 +1 @@
+language: ruby

data/Gemfile

@@ -1,19 +1,19 @@
-source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
+# frozen_string_literal: true
+
+source "https://rubygems.org"
 
-gem "rack"
 gem "i18n"
+gem "rack"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "bundler"
-  gem 'debugger'
-  gem "jeweler"
-  gem "minitest"
-  gem "rack-test"
-  gem "turn"
-  gem "yard"
+  gem "bundler", "~> 1.16"
+  gem "byebug"
+  gem "jeweler", "~> 2.3"
+  gem "minitest", "~> 5.0"
+  gem "minitest-fail-fast", "~> 0.1"
+  gem "minitest-reporters", "1.3.0" # locking as current issue with 1.3.1
+  gem "rack-test", "~> 1.1"
+  gem "yard", "~> 0.9"
 end

data/Gemfile.lock

@@ -1,44 +1,85 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    ansi (1.4.3)
-    columnize (0.3.6)
-    debugger (1.3.0)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.1.7)
-    debugger-linecache (1.1.2)
-      debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.7)
-    git (1.2.5)
-    i18n (0.6.1)
-    jeweler (1.8.4)
-      bundler (~> 1.0)
+    addressable (2.4.0)
+    ansi (1.5.0)
+    builder (3.2.3)
+    byebug (10.0.2)
+    concurrent-ruby (1.0.5)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    git (1.5.0)
+    github_api (0.16.0)
+      addressable (~> 2.4.0)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.4)
+      mime-types (>= 1.16, < 3.0)
+      oauth2 (~> 1.0)
+    hashie (3.6.0)
+    highline (2.0.0)
+    i18n (1.1.0)
+      concurrent-ruby (~> 1.0)
+    jeweler (2.3.9)
+      builder
+      bundler
       git (>= 1.2.5)
+      github_api (~> 0.16.0)
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
+      psych
       rake
       rdoc
-    json (1.7.6)
-    minitest (4.5.0)
-    rack (1.5.1)
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rake (10.0.3)
-    rdoc (3.12)
-      json (~> 1.4)
-    turn (0.9.6)
+      semver2
+    jwt (1.5.6)
+    mime-types (2.99.3)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
+    minitest-fail-fast (0.1.0)
+      minitest (~> 5)
+    minitest-reporters (1.3.0)
       ansi
-    yard (0.8.3)
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
+    multi_json (1.13.1)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
+    nokogiri (1.8.4)
+      mini_portile2 (~> 2.3.0)
+    oauth2 (1.4.0)
+      faraday (>= 0.8, < 0.13)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    psych (3.0.2)
+    rack (2.0.5)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rake (12.3.1)
+    rdoc (6.0.4)
+    ruby-progressbar (1.10.0)
+    semver2 (3.4.2)
+    thread_safe (0.3.6)
+    yard (0.9.16)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler
-  debugger
+  bundler (~> 1.16)
+  byebug
   i18n
-  jeweler
-  minitest
+  jeweler (~> 2.3)
+  minitest (~> 5.0)
+  minitest-fail-fast (~> 0.1)
+  minitest-reporters (= 1.3.0)
   rack
-  rack-test
-  turn
-  yard
+  rack-test (~> 1.1)
+  yard (~> 0.9)
+
+BUNDLED WITH
+   1.16.3

data/Rakefile

@@ -1,38 +1,38 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
-require 'rubygems'
-require 'bundler'
+require "rubygems"
+require "bundler"
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
+  warn e.message
+  warn "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'rake'
+require "rake"
 
-require 'jeweler'
+require "jeweler"
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "rack-user-locale"
   gem.homepage = "http://github.com/sleepingstu/rack-user-locale"
   gem.license = "MIT"
-  gem.summary = %Q{Rack module for getting and setting a user's locale}
-  gem.description = %Q{A Rack module for getting and setting a user's locale via a cookie or browser default language.}
-  gem.email = "stuart.chinery@headlondon.com"
+  gem.summary = %(Rack module for getting and setting a user's locale)
+  gem.description = %(A Rack module for getting and setting a user's locale via a cookie or browser default language.)
+  gem.email = "stuart.chinery@gmail.com"
   gem.authors = ["Stuart Chinery", "Dave Hrycyszyn"]
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new
 
-require 'rake/testtask'
+require "rake/testtask"
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
+  test.libs << "lib" << "test"
+  test.pattern = "test/**/*_test.rb"
   test.verbose = true
 end
 
-task :default => :test
+task default: :test
 
-require 'yard'
-YARD::Rake::YardocTask.new
+require "yard"
+YARD::Rake::YardocTask.new

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.1.0

data/lib/rack-user-locale.rb

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 require "i18n"
 
 module Rack
   class UserLocale
-
     # TODO: Write notes
     #
     def initialize(app, options = {})
-      @app, @options = app, {
-          :accepted_locales => []
-        }.merge(options)
+      @app = app
+      @options = {
+        accepted_locales: []
+      }.merge(options)
     end
 
     # TODO: Write notes
@@ -18,16 +20,12 @@ module Rack
       @request = Rack::Request.new(@env)
       set_locale
 
-      if @request.post? || @request.put? || @request.delete?
-        @app.call(env)
-      else
-        status, headers, body = @app.call(@env)
-        response = Rack::Response.new(body, status, headers)
-        response.set_cookie("user-locale", {
-          :value => I18n.locale,
-          :path => "/"}) if get_cookie_locale != I18n.locale.to_s
-        response.finish
-      end
+      @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("user-locale", value: I18n.locale, path: "/") if cookie_locale != I18n.locale.to_s
+      response.finish
     end
 
     private
@@ -35,38 +33,40 @@ module Rack
     # TODO: Write notes
     #
     def set_locale
-      new_locale = check_accepted? ? accepted_locale(locale.to_sym, get_default_locale) : locale.to_sym
+      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)
-      locale = @options[:accepted_locales].include?(locale) ? locale : other_locale
+      @options[:accepted_locales].include?(locale) ? locale : other_locale
     end
 
     # TODO: Write notes
     #
     def locale
-      get_cookie_locale || get_browser_locale || get_default_locale
+      cookie_locale || browser_locale || default_locale
     end
 
     # TODO: Write notes
     #
-    def get_cookie_locale
+    def cookie_locale
       @request.cookies["user-locale"]
     end
 
     # TODO: Write notes
     #
-    def get_browser_locale
+    def browser_locale
       accept_lang = @env["HTTP_ACCEPT_LANGUAGE"]
       return if accept_lang.nil?
 
-      langs = accept_lang.split(",").map { |l|
-        l += ';q=1.0' unless l =~ /;q=\d+\.\d+$/
-        l.split(';q=')
-      }.sort { |a, b| b[1] <=> a[1] }
+      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|
@@ -75,25 +75,26 @@ module Rack
         end
       end
 
-      return split_lang(langs.first.first)
+      split_lang(langs.first.first)
     end
 
     # TODO: Write notes
     #
     def split_lang(lang)
-      lang.split("-").first unless lang.nil?
+      return if lang.nil?
+      lang.split("-").first
     end
 
     # TODO: Write notes
     #
-    def get_default_locale
+    def default_locale
       I18n.default_locale
     end
 
     # TODO: Write notes
     #
     def check_accepted?
-      @options[:accepted_locales].count > 0
+      @options[:accepted_locales].count.positive?
     end
   end
 end

data/rack-user-locale.gemspec

@@ -2,22 +2,27 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: rack-user-locale 0.1.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "rack-user-locale"
-  s.version = "0.0.5"
+  s.name = "rack-user-locale".freeze
+  s.version = "0.1.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Stuart Chinery", "Dave Hrycyszyn"]
-  s.date = "2013-09-13"
-  s.description = "A Rack module for getting and setting a user's locale via a cookie or browser default language."
-  s.email = "stuart.chinery@headlondon.com"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Stuart Chinery".freeze, "Dave Hrycyszyn".freeze]
+  s.date = "2018-08-15"
+  s.description = "A Rack module for getting and setting a user's locale via a cookie or browser default language.".freeze
+  s.email = "stuart.chinery@gmail.com".freeze
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
   ]
   s.files = [
     ".document",
+    ".rubocop.yml",
+    ".ruby-version",
+    ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -26,49 +31,52 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/rack-user-locale.rb",
     "rack-user-locale.gemspec",
+    "test/basic_rack_app.rb",
     "test/helper.rb",
-    "test/test_rack-user-locale.rb"
+    "test/rack-user-locale_test.rb"
   ]
-  s.homepage = "http://github.com/sleepingstu/rack-user-locale"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
-  s.summary = "Rack module for getting and setting a user's locale"
+  s.homepage = "http://github.com/sleepingstu/rack-user-locale".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "2.7.6".freeze
+  s.summary = "Rack module for getting and setting a user's locale".freeze
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rack>, [">= 0"])
-      s.add_runtime_dependency(%q<i18n>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<debugger>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<minitest>, [">= 0"])
-      s.add_development_dependency(%q<rack-test>, [">= 0"])
-      s.add_development_dependency(%q<turn>, [">= 0"])
-      s.add_development_dependency(%q<yard>, [">= 0"])
+      s.add_runtime_dependency(%q<i18n>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<rack>.freeze, [">= 0"])
+      s.add_development_dependency(%q<bundler>.freeze, ["~> 1.16"])
+      s.add_development_dependency(%q<byebug>.freeze, [">= 0"])
+      s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.3"])
+      s.add_development_dependency(%q<minitest>.freeze, ["~> 5.0"])
+      s.add_development_dependency(%q<minitest-fail-fast>.freeze, ["~> 0.1"])
+      s.add_development_dependency(%q<minitest-reporters>.freeze, ["= 1.3.0"])
+      s.add_development_dependency(%q<rack-test>.freeze, ["~> 1.1"])
+      s.add_development_dependency(%q<yard>.freeze, ["~> 0.9"])
     else
-      s.add_dependency(%q<rack>, [">= 0"])
-      s.add_dependency(%q<i18n>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<debugger>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<minitest>, [">= 0"])
-      s.add_dependency(%q<rack-test>, [">= 0"])
-      s.add_dependency(%q<turn>, [">= 0"])
-      s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<i18n>.freeze, [">= 0"])
+      s.add_dependency(%q<rack>.freeze, [">= 0"])
+      s.add_dependency(%q<bundler>.freeze, ["~> 1.16"])
+      s.add_dependency(%q<byebug>.freeze, [">= 0"])
+      s.add_dependency(%q<jeweler>.freeze, ["~> 2.3"])
+      s.add_dependency(%q<minitest>.freeze, ["~> 5.0"])
+      s.add_dependency(%q<minitest-fail-fast>.freeze, ["~> 0.1"])
+      s.add_dependency(%q<minitest-reporters>.freeze, ["= 1.3.0"])
+      s.add_dependency(%q<rack-test>.freeze, ["~> 1.1"])
+      s.add_dependency(%q<yard>.freeze, ["~> 0.9"])
     end
   else
-    s.add_dependency(%q<rack>, [">= 0"])
-    s.add_dependency(%q<i18n>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<debugger>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<minitest>, [">= 0"])
-    s.add_dependency(%q<rack-test>, [">= 0"])
-    s.add_dependency(%q<turn>, [">= 0"])
-    s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<i18n>.freeze, [">= 0"])
+    s.add_dependency(%q<rack>.freeze, [">= 0"])
+    s.add_dependency(%q<bundler>.freeze, ["~> 1.16"])
+    s.add_dependency(%q<byebug>.freeze, [">= 0"])
+    s.add_dependency(%q<jeweler>.freeze, ["~> 2.3"])
+    s.add_dependency(%q<minitest>.freeze, ["~> 5.0"])
+    s.add_dependency(%q<minitest-fail-fast>.freeze, ["~> 0.1"])
+    s.add_dependency(%q<minitest-reporters>.freeze, ["= 1.3.0"])
+    s.add_dependency(%q<rack-test>.freeze, ["~> 1.1"])
+    s.add_dependency(%q<yard>.freeze, ["~> 0.9"])
   end
 end
 

data/test/basic_rack_app.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class BasicRackApp
+  def call(_env)
+    [200, { "Content-Type" => "text/plain" }, "Hello World"]
+  end
+end

data/test/helper.rb

@@ -1,30 +1,33 @@
-require 'rubygems'
-require 'bundler'
+# frozen_string_literal: true
+
+require "rubygems"
+require "bundler"
 require "rack/test"
-require "debugger"
 
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
+  warn e.message
+  warn "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'minitest/autorun'
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require "minitest/autorun"
+require "minitest/fail_fast"
+require "minitest/reporters"
+require "minitest/spec"
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'rack-user-locale'
-begin; require 'turn/autorun'; rescue LoadError; end
+require "rack-user-locale"
 
-class MiniTest::Unit::TestCase
+class Minitest::Test
+  extend Minitest::Spec::DSL
   include Rack::Test::Methods
 end
 
-class BasicRackApp
-  def call(env)
-    [200, {'Content-Type' => 'text/plain'}, 'Hello World']
-  end
-end
-
-MiniTest::Unit.autorun
+Minitest::Reporters.use!(
+  Minitest::Reporters::SpecReporter.new,
+  ENV,
+  Minitest.backtrace_filter
+)

data/test/rack-user-locale_test.rb

@@ -0,0 +1,232 @@
+# frozen_string_literal: true
+
+require "helper"
+require "basic_rack_app"
+require "byebug"
+
+class RackUserLocaleTest < Minitest::Test
+  describe Rack::UserLocale do
+    before do
+      I18n.enforce_available_locales = false
+    end
+
+    describe "without accepted_locales set" do
+      before do
+        def app
+          Rack::Builder.new do
+            use Rack::UserLocale
+
+            run BasicRackApp.new
+          end
+        end
+
+        I18n.default_locale = :en
+        I18n.locale = :en
+      end
+
+      it "should have I18n.locale set to :en" do
+        assert_equal :en, I18n.locale
+      end
+
+      describe "when a locale cookie is set" do
+        before do
+          get "http://example.com/", {}, "HTTP_COOKIE" => "user-locale=be"
+        end
+
+        it "should have I18n.locale set to :be" do
+          assert_equal :be, I18n.locale
+        end
+
+        it "should not set a cookie in the response" do
+          assert_equal nil, last_response["Set-Cookie"]
+        end
+      end
+
+      describe "when from HTTP_ACCEPT_LANGUAGE headers" do
+        describe "with a single locale" do
+          before do
+            get "http://example.com/", {}, "HTTP_ACCEPT_LANGUAGE" => "fr-be", "SCRIPT_NAME" => "/"
+          end
+
+          it "should have I18n.locale set to :fr" do
+            assert_equal :fr, I18n.locale
+          end
+
+          it "should set a cookie in the response" do
+            assert_equal "user-locale=fr; path=/", last_response["Set-Cookie"]
+          end
+        end
+
+        describe "with an multiple locales" do
+          before do
+            get "http://example.com/", {},
+                "HTTP_ACCEPT_LANGUAGE" => "de-DE;q=0.8,de;q=0.8,no-NO;q=1.0,no;q=0.7,ru-RU;q=0.7,sv-SE;q=0.4,sv;q=0.3,nl-BE;q=0.9",
+                "SCRIPT_NAME" => "/"
+          end
+
+          it "should have I18n.locale set to :no" do
+            assert_equal :no, I18n.locale
+          end
+
+          it "should set a cookie in the response" do
+            assert_equal "user-locale=no; path=/", last_response["Set-Cookie"]
+          end
+        end
+      end
+
+      describe "when both a cooke and HTTP_ACCEPT_LANGUAGE headers are set" do
+        before do
+          get "http://example.com/", {}, "HTTP_COOKIE" => "user-locale=af",
+                                         "HTTP_ACCEPT_LANGUAGE" => "ar-sa", "SCRIPT_NAME" => "/"
+        end
+
+        it "should have I18n.locale set to :af" do
+          assert_equal :af, I18n.locale
+        end
+
+        it "should not set a cookie in the response" do
+          assert_equal nil, last_response["Set-Cookie"]
+        end
+      end
+
+      describe "when nothing is changed" do
+        before do
+          get "http://example.com/", {}, "SCRIPT_NAME" => "/"
+        end
+
+        it "should have I18n.locale set to :en" do
+          assert_equal :en, I18n.locale
+        end
+
+        it "should set a cookie in the response" do
+          assert_equal "user-locale=en; path=/", last_response["Set-Cookie"]
+        end
+      end
+    end
+
+    describe "with accepted_locales set" do
+      before do
+        def app
+          Rack::Builder.new do
+            use Rack::UserLocale, accepted_locales: %i[en es fr de ja nl]
+
+            run BasicRackApp.new
+          end
+        end
+
+        I18n.default_locale = :en
+        I18n.locale = :en
+      end
+
+      it "should have I18n.locale set to :en" do
+        assert_equal :en, I18n.locale
+      end
+
+      describe "when a locale cookie is set" do
+        before do
+          get "http://example.com/", {}, "HTTP_COOKIE" => "user-locale=es", "SCRIPT_NAME" => "/"
+        end
+
+        it "should have I18n.locale set to :es" do
+          assert_equal :es, I18n.locale
+        end
+
+        it "should not set a cookie in the response" do
+          assert_equal nil, last_response["Set-Cookie"]
+        end
+      end
+
+      describe "when from HTTP_ACCEPT_LANGUAGE headers" do
+        describe "with an accepted locale" do
+          before do
+            get "http://example.com/", {}, "HTTP_ACCEPT_LANGUAGE" => "fr-be", "SCRIPT_NAME" => "/"
+          end
+
+          it "should have I18n.locale set to :fr" do
+            assert_equal :fr, I18n.locale
+          end
+
+          it "should set a cookie in the response" do
+            assert_equal "user-locale=fr; path=/", last_response["Set-Cookie"]
+          end
+        end
+
+        describe "with an multiple locales" do
+          describe "at different weights" do
+            before do
+              get "http://example.com/", {},
+                  "HTTP_ACCEPT_LANGUAGE" => "de-DE;q=0.8,de;q=0.8,no-NO;q=0.7,no;q=0.7,ru-RU;q=0.7,sv-SE;q=0.4,sv;q=0.3,nl-BE;q=0.9",
+                  "SCRIPT_NAME" => "/"
+            end
+
+            it "should have I18n.locale set to :nl" do
+              assert_equal :nl, I18n.locale
+            end
+
+            it "should set a cookie in the response" do
+              assert_equal "user-locale=nl; path=/", last_response["Set-Cookie"]
+            end
+          end
+
+          describe "at the same weight" do
+            before do
+              get "http://example.com/", {},
+                  "HTTP_ACCEPT_LANGUAGE" => "fr,en,ja", "SCRIPT_NAME" => "/"
+            end
+
+            it "should have I18n.locale set to :fr" do
+              assert_equal :fr, I18n.locale
+            end
+
+            it "should set a cookie in the response" do
+              assert_equal "user-locale=fr; path=/", last_response["Set-Cookie"]
+            end
+          end
+        end
+
+        describe "without an accepted locale" do
+          before do
+            get "http://example.com/", {}, "HTTP_ACCEPT_LANGUAGE" => "ar-sa", "SCRIPT_NAME" => "/"
+          end
+
+          it "should have I18n.locale set to :en" do
+            assert_equal :en, I18n.locale
+          end
+
+          it "should set a cookie in the response" do
+            assert_equal "user-locale=en; path=/", last_response["Set-Cookie"]
+          end
+        end
+      end
+
+      describe "when both a cooke and HTTP_ACCEPT_LANGUAGE headers are set" do
+        before do
+          get "http://example.com/", {}, "HTTP_COOKIE" => "user-locale=ja",
+                                         "HTTP_ACCEPT_LANGUAGE" => "fr-be", "SCRIPT_NAME" => "/"
+        end
+
+        it "should have I18n.locale set to :ja" do
+          assert_equal :ja, I18n.locale
+        end
+
+        it "should not set a cookie in the response" do
+          assert_equal nil, last_response["Set-Cookie"]
+        end
+      end
+
+      describe "when nothing is changed" do
+        before do
+          get "http://example.com/", {}, "SCRIPT_NAME" => "/"
+        end
+
+        it "should have I18n.locale set to :en" do
+          assert_equal :en, I18n.locale
+        end
+
+        it "should set a cookie in the response" do
+          assert_equal "user-locale=en; path=/", last_response["Set-Cookie"]
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-user-locale
 version: !ruby/object:Gem::Version
-  version: 0.0.5
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Stuart Chinery
@@ -10,162 +9,161 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-13 00:00:00.000000000 Z
+date: 2018-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: i18n
+  name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: debugger
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: minitest-fail-fast
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: turn
+  name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 description: A Rack module for getting and setting a user's locale via a cookie or
   browser default language.
-email: stuart.chinery@headlondon.com
+email: stuart.chinery@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- .document
+- ".document"
+- ".rubocop.yml"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -174,34 +172,31 @@ files:
 - VERSION
 - lib/rack-user-locale.rb
 - rack-user-locale.gemspec
+- test/basic_rack_app.rb
 - test/helper.rb
-- test/test_rack-user-locale.rb
+- test/rack-user-locale_test.rb
 homepage: http://github.com/sleepingstu/rack-user-locale
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1351284199224301544
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.7.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rack module for getting and setting a user's locale
 test_files: []

data/test/test_rack-user-locale.rb

@@ -1,220 +0,0 @@
-require "helper"
-
-describe "RackUserLocale" do
-  describe "without accepted_locales set" do
-    before do
-      def app
-        app = Rack::Builder.new {
-          use Rack::UserLocale
-
-          run BasicRackApp.new
-        }
-      end
-
-      I18n.default_locale = :en
-    end
-
-    it "should have I18n.locale set to :en initially" do
-      assert_equal :en, I18n.locale
-    end
-
-    describe "when a locale cookie is set" do
-      before do
-        get "http://example.com/", {}, "HTTP_COOKIE" => "user-locale=be"
-      end
-
-      it "should have I18n.locale set to :be" do
-        assert_equal :be, I18n.locale
-      end
-
-      it "should not set a cookie in the response" do
-        assert_equal nil, last_response["Set-Cookie"]
-      end
-    end
-
-    describe "when from HTTP_ACCEPT_LANGUAGE headers" do
-      describe "with a single locale" do
-        before do
-          get "http://example.com/", {}, { "HTTP_ACCEPT_LANGUAGE" => "fr-be", "SCRIPT_NAME" => "/" }
-        end
-
-        it "should have I18n.locale set to :fr" do
-          assert_equal :fr, I18n.locale
-        end
-
-        it "should set a cookie in the response" do
-          assert_equal "user-locale=fr; path=/", last_response["Set-Cookie"]
-        end
-      end
-
-      describe "with an multiple locales" do
-        before do
-          get "http://example.com/", {}, {
-            "HTTP_ACCEPT_LANGUAGE" => "de-DE;q=0.8,de;q=0.8,no-NO;q=1.0,no;q=0.7,ru-RU;q=0.7,sv-SE;q=0.4,sv;q=0.3,nl-BE;q=0.9",
-            "SCRIPT_NAME" => "/" }
-        end
-
-        it "should have I18n.locale set to :no" do
-          assert_equal :no, I18n.locale
-        end
-
-        it "should set a cookie in the response" do
-          assert_equal "user-locale=no; path=/", last_response["Set-Cookie"]
-        end
-      end
-    end
-
-    describe "when both a cooke and HTTP_ACCEPT_LANGUAGE headers are set" do
-      before do
-        get "http://example.com/", {}, { "HTTP_COOKIE" => "user-locale=af",
-          "HTTP_ACCEPT_LANGUAGE" => "ar-sa", "SCRIPT_NAME" => "/" }
-      end
-
-      it "should have I18n.locale set to :af" do
-        assert_equal :af, I18n.locale
-      end
-
-      it "should not set a cookie in the response" do
-        assert_equal nil, last_response["Set-Cookie"]
-      end
-    end
-
-    describe "when nothing is changed" do
-      before do
-        get "http://example.com/", {}, { "SCRIPT_NAME" => "/" }
-      end
-
-      it "should have I18n.locale set to :en" do
-        assert_equal :en, I18n.locale
-      end
-
-      it "should set a cookie in the response" do
-        assert_equal "user-locale=en; path=/", last_response["Set-Cookie"]
-      end
-    end
-  end
-
-  describe "with accepted_locales set" do
-    before do
-      def app
-        app = Rack::Builder.new {
-          use Rack::UserLocale, :accepted_locales => [:en, :es, :fr, :de, :ja, :nl]
-
-          run BasicRackApp.new
-        }
-      end
-
-      I18n.default_locale = :en
-    end
-
-    it "should have I18n.locale set to :en initially" do
-      assert_equal :en, I18n.locale
-    end
-
-    describe "when a locale cookie is set" do
-      before do
-        get "http://example.com/", {}, { "HTTP_COOKIE" => "user-locale=es", "SCRIPT_NAME" => "/" }
-      end
-
-      it "should have I18n.locale set to :es" do
-        assert_equal :es, I18n.locale
-      end
-
-      it "should not set a cookie in the response" do
-        assert_equal nil, last_response["Set-Cookie"]
-      end
-    end
-
-    describe "when from HTTP_ACCEPT_LANGUAGE headers" do
-      describe "with an accepted locale" do
-        before do
-          get "http://example.com/", {}, { "HTTP_ACCEPT_LANGUAGE" => "fr-be", "SCRIPT_NAME" => "/" }
-        end
-
-        it "should have I18n.locale set to :fr" do
-          assert_equal :fr, I18n.locale
-        end
-
-        it "should set a cookie in the response" do
-          assert_equal "user-locale=fr; path=/", last_response["Set-Cookie"]
-        end
-      end
-
-      describe "with an multiple locales" do
-        describe "at different weights" do
-          before do
-            get "http://example.com/", {}, {
-              "HTTP_ACCEPT_LANGUAGE" => "de-DE;q=0.8,de;q=0.8,no-NO;q=0.7,no;q=0.7,ru-RU;q=0.7,sv-SE;q=0.4,sv;q=0.3,nl-BE;q=0.9",
-              "SCRIPT_NAME" => "/" }
-          end
-
-          it "should have I18n.locale set to :nl" do
-            assert_equal :nl, I18n.locale
-          end
-
-          it "should set a cookie in the response" do
-            assert_equal "user-locale=nl; path=/", last_response["Set-Cookie"]
-          end
-        end
-
-        describe "at the same weight" do
-          before do
-            get "http://example.com/", {}, {
-              "HTTP_ACCEPT_LANGUAGE" => "fr,en,ja", "SCRIPT_NAME" => "/" }
-          end
-
-          it "should have I18n.locale set to :fr" do
-            assert_equal :fr, I18n.locale
-          end
-
-          it "should set a cookie in the response" do
-            assert_equal "user-locale=fr; path=/", last_response["Set-Cookie"]
-          end
-        end
-      end
-
-      describe "without an accepted locale" do
-        before do
-          get "http://example.com/", {}, { "HTTP_ACCEPT_LANGUAGE" => "ar-sa", "SCRIPT_NAME" => "/" }
-        end
-
-        it "should have I18n.locale set to :en" do
-          assert_equal :en, I18n.locale
-        end
-
-        it "should set a cookie in the response" do
-          assert_equal "user-locale=en; path=/", last_response["Set-Cookie"]
-        end
-      end
-    end
-
-    describe "when both a cooke and HTTP_ACCEPT_LANGUAGE headers are set" do
-      before do
-        get "http://example.com/", {}, { "HTTP_COOKIE" => "user-locale=ja",
-          "HTTP_ACCEPT_LANGUAGE" => "fr-be", "SCRIPT_NAME" => "/" }
-      end
-
-      it "should have I18n.locale set to :ja" do
-        assert_equal :ja, I18n.locale
-      end
-
-      it "should not set a cookie in the response" do
-        assert_equal nil, last_response["Set-Cookie"]
-      end
-    end
-
-    describe "when nothing is changed" do
-      before do
-        get "http://example.com/", {}, { "SCRIPT_NAME" => "/" }
-      end
-
-      it "should have I18n.locale set to :en" do
-        assert_equal :en, I18n.locale
-      end
-
-      it "should set a cookie in the response" do
-        assert_equal "user-locale=en; path=/", last_response["Set-Cookie"]
-      end
-    end
-  end
-end