http_accept_language 2.0.5 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08549bc678f764b0ee83c4520257c29165e16cab
-  data.tar.gz: 840fc4179bd28f157fd4eaf2d5feb4b0da2a2789
+  metadata.gz: 64deaf476a87d9192739905f051cd546124d358e
+  data.tar.gz: 5afdaecd6f46c4df2240ae700c0bd66bc131eba1
 SHA512:
-  metadata.gz: 53ce0048473fcee968b6fca1f832b7422281a0cfabdedacfdab8abb081674049e17c9c04f784e649bc78bc4d93f72a26dc5362d78379367b61e7937e9208358d
-  data.tar.gz: 2cc635241d1980aee9ef20e6997a6a235c9f674470e5b2c6f2b93a585fb9cd1e360e1fedc072fd1183fb40d5e72f31cc3adc2989f3dbc2e92cf1d12789b70720
+  metadata.gz: 077e921e1398f9925a8498c6bf0c77f54b65c8d7cf6082e77613da8f7599c07d732ef3610f965a276a6529c586e659542ba2c16dd28b04d8d42a9abd5df4fcc8
+  data.tar.gz: 99a4e05c30bc9102686dc890ac5acd63af862eeecfe679e96514aecdbdc6d7380a328c384eba2f8ecb00c32803cbba62d511e384b1b3b4df70f9629815790a48

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+cache: bundler
+sudo: false
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1
+  - 2.2
+script: bundle exec rspec spec

data/README.md

@@ -1,4 +1,4 @@
-# HttpAcceptLanguage
+# HttpAcceptLanguage [![Build Status](https://travis-ci.org/iain/http_accept_language.svg?branch=master)](https://travis-ci.org/iain/http_accept_language)
 
 A gem which helps you detect the users preferred language, as sent by the "Accept-Language" HTTP header.
 
@@ -53,6 +53,12 @@ class ApplicationController < ActionController::Base
 end
 ```
 
+Then set available locales in `config/application.rb`:
+
+```ruby
+config.i18n.available_locales = %w(en nl de fr)
+```
+
 To use the middleware in any Rack application, simply add the middleware:
 
 ``` ruby

data/lib/http_accept_language/auto_locale.rb

@@ -11,7 +11,7 @@ module HttpAcceptLanguage
     private
 
     def set_locale
-      I18n.locale = http_accept_language.compatible_language_from(I18n.available_locales)
+      I18n.locale = http_accept_language.compatible_language_from(I18n.available_locales) || I18n.default_locale
     end
   end
 end

data/lib/http_accept_language/version.rb

@@ -1,3 +1,3 @@
 module HttpAcceptLanguage
-  VERSION = '2.0.5'
+  VERSION = '2.1.0'
 end

data/spec/auto_locale_spec.rb

@@ -6,19 +6,24 @@ require 'http_accept_language/middleware'
 describe HttpAcceptLanguage::AutoLocale do
   let(:controller_class) do
     Class.new do
+      def initialize(header = nil)
+        super()
+        @header = header
+      end
+
       def self.before_filter(dummy)
         # dummy method
       end
 
       def http_accept_language
-        HttpAcceptLanguage::Parser.new("ja,en-us;q=0.7,en;q=0.3")
+        @http_accept_language ||= HttpAcceptLanguage::Parser.new(@header)
       end
 
       include HttpAcceptLanguage::AutoLocale
     end
   end
 
-  let(:controller) { controller_class.new }
+  let(:controller) { controller_class.new("ja,en-us;q=0.7,en;q=0.3") }
 
   context "available languages includes accept_languages" do
     before do
@@ -31,4 +36,32 @@ describe HttpAcceptLanguage::AutoLocale do
       expect(I18n.locale).to eq(:ja)
     end
   end
+
+  context "available languages do not include accept_languages" do
+    before do
+      I18n.available_locales = [:es]
+      I18n.default_locale = :es
+    end
+
+    it "set the locale to default" do
+      no_accept_language_controller.send(:set_locale)
+
+      expect(I18n.locale).to eq(:es)
+    end
+  end
+
+  let(:no_accept_language_controller) { controller_class.new() }
+
+  context "default locale is ja" do
+    before do
+      I18n.available_locales = [:en, :ja]
+      I18n.default_locale = :ja
+    end
+
+    it "set the locale to default" do
+      no_accept_language_controller.send(:set_locale)
+
+      expect(I18n.locale).to eq(:ja)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: http_accept_language
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.1.0
 platform: ruby
 authors:
 - iain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-25 00:00:00.000000000 Z
+date: 2016-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -118,6 +118,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - README.md
@@ -156,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: http_accept_language
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Find out which locale the user preferes by reading the languages they specified
@@ -168,4 +169,3 @@ test_files:
 - spec/auto_locale_spec.rb
 - spec/middleware_spec.rb
 - spec/parser_spec.rb
-has_rdoc: