Merge branch '14-set-available-locales' of git://github.com/pacoguzman/rack-contrib into GH118

Author: mpalmer

lib/rack/contrib/locale.rb

@@ -34,7 +34,13 @@ def accept_locale(env)
 
       lang = languages_and_qvalues.sort_by { |(locale, qvalue)|
         qvalue.to_f
-      }.last.first
+      }.reverse.detect { |(locale, qvalue)|
+        if I18n.enforce_available_locales
+          locale == '*' || I18n.available_locales.include?(locale.to_sym)
+        else
+          true
+        end
+      }.first
 
       lang == '*' ? nil : lang
     end

test/gemfiles/minimum_versions

@@ -7,7 +7,7 @@ source 'https://rubygems.org'
 #
 gem 'rack',                '= 1.4.0'
 gem 'git-version-bump',    '= 0.15.0'
-gem 'i18n',                '= 0.4.0'
+gem 'i18n',                '= 0.5.2'
 gem 'json',                '= 1.8.5'
 gem 'minitest',            '= 5.6.0'
 gem 'minitest-hooks',      '= 1.0.0'

test/spec_rack_locale.rb

@@ -24,6 +24,14 @@ def response_with_languages(accept_languages)
       Rack::MockRequest.new(app).get('/', { 'HTTP_ACCEPT_LANGUAGE' => accept_languages } )
     end
 
+    def enforce_available_locales(enforce)
+      default_enforce = I18n.enforce_available_locales
+      I18n.enforce_available_locales = enforce
+      yield
+    ensure
+      I18n.enforce_available_locales = default_enforce
+    end
+
     specify 'should use I18n.default_locale if no languages are requested' do
       I18n.default_locale = :zh
       response_with_languages(nil).body.must_equal('zh')
@@ -47,14 +55,26 @@ def response_with_languages(accept_languages)
     end
 
     specify 'should treat a * as "all other languages"' do
-      response_with_languages('*,en;q=0.5').body.must_equal( I18n.default_locale.to_s )
+      response_with_languages('*,en;q=0.5').body.must_equal(I18n.default_locale.to_s)
     end
 
     specify 'should reset the I18n locale after the response' do
       I18n.locale = :es
       response_with_languages('en,de;q=0.8')
       I18n.locale.must_equal(:es)
     end
+
+    specify 'should pick the available language' do
+      enforce_available_locales(true) do
+        response_with_languages('ch,en;q=0.9,es;q=0.95').body.must_equal('es')
+      end
+    end
+
+    specify 'when not enforce should pick the language with the highest qvalue' do
+      enforce_available_locales(false) do
+        response_with_languages('ch,en;q=0.9').body.must_equal('ch')
+      end
+    end
   end
 rescue LoadError
   STDERR.puts "WARN: Skipping Rack::Locale tests (i18n not installed)"