locale 2.0.5 → 2.0.6

data/lib/locale/driver/env.rb

@@ -1,18 +1,28 @@
-=begin
-  locale/env.rb 
-
-  Copyright (C) 2008  Masao Mutoh
-
-  You may redistribute it and/or modify it under the same
-  license terms as Ruby.
-
-  Original: Ruby-GetText-Package-1.92.0.
-
-  $Id: env.rb 27 2008-12-03 15:06:50Z mutoh $
-=end
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012  Hleb Valoshka
+# Copyright (C) 2008  Masao Mutoh
+#
+# Original: Ruby-GetText-Package-1.92.0.
+# License: Ruby's or LGPL
+#
+# This library is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'locale/tag'
 require 'locale/taglist'
+require "locale/driver"
 
 module Locale 
   module Driver
@@ -24,11 +34,11 @@ module Locale
     module Env
       module_function
 
-      # Gets the locale from environment variable. (LC_ALL > LC_MESSAGES > LANG)
+      # Gets the locale from environment variable. (LC_ALL > LC_CTYPES > LANG)
       # Returns: the locale as Locale::Tag::Posix.
       def locale
         # At least one environment valiables should be set on *nix system.
-        [ENV["LC_ALL"], ENV["LC_MESSAGES"], ENV["LANG"]].each do |loc|
+        [ENV["LC_ALL"], ENV["LC_CTYPES"], ENV["LANG"]].each do |loc|
           if loc != nil and loc.size > 0
             return Locale::Tag::Posix.parse(loc)
           end
@@ -36,16 +46,19 @@ module Locale
         nil
       end
 
-      # Gets the locales from environment variables. (LANGUAGE > LC_ALL > LC_MESSAGES > LANG)
+      # Gets the locales from environment variables. (LANGUAGE > LC_ALL > LC_CTYPES > LANG)
       # * Returns: an Array of the locale as Locale::Tag::Posix or nil.
       def locales
-        if (locales = ENV["LANGUAGE"])
-          Locale::TagList.new(locales.split(/:/).collect{|v| Locale::Tag::Posix.parse(v)})
+        locales = ENV["LANGUAGE"]
+        if (locales != nil and locales.size > 0)
+          locs = locales.split(/:/).collect{|v| Locale::Tag::Posix.parse(v)}.compact
+          if locs.size > 0
+            return Locale::TagList.new(locs)
+          end
         elsif (loc = locale)
-          Locale::TagList.new([loc])
-        else
-          nil
+          return Locale::TagList.new([loc])
         end
+        nil
       end
 
       # Gets the charset from environment variable or return nil.
@@ -59,6 +72,8 @@ module Locale
       end
       
     end
+
+    MODULES[:env] = Env
   end
 end
 

data/lib/locale/driver/jruby.rb

@@ -1,19 +1,28 @@
-=begin
-  locale/driver/jruby.rb
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2007-2008 Masao Mutoh
+#
+# Original: Ruby-GetText-Package-1.92.0.
+# License: Ruby's or LGPL
+#
+# This library is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-  Copyright (C) 2007,2008 Masao Mutoh
-
-  You may redistribute it and/or modify it under the same
-  license terms as Ruby.
-
-  Original: Ruby-GetText-Package-1.92.0.
-
-  $Id: jruby.rb 27 2008-12-03 15:06:50Z mutoh $
-=end
-
-require File.join(File.dirname(__FILE__), 'env')
 require 'java'
 
+require "locale/driver/env"
+
 module Locale
   module Driver
     # Locale::Driver::JRuby module for JRuby
@@ -47,6 +56,7 @@ module Locale
         charset
       end
     end
+
+    MODULES[:jruby] = JRuby
   end
-  @@locale_driver_module = Driver::JRuby
 end

data/lib/locale/driver/posix.rb

@@ -1,17 +1,25 @@
-=begin
-  locale/posix.rb 
-
-  Copyright (C) 2002-2008  Masao Mutoh
-
-  You may redistribute it and/or modify it under the same
-  license terms as Ruby.
-
-  Original: Ruby-GetText-Package-1.92.0.
-
-  $Id: posix.rb 27 2008-12-03 15:06:50Z mutoh $
-=end
-
-require File.join(File.dirname(__FILE__), 'env')
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2002-2008  Masao Mutoh
+#
+# Original: Ruby-GetText-Package-1.92.0.
+# License: Ruby's or LGPL
+#
+# This library is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require "locale/driver/env"
 
 module Locale 
   # Locale::Driver::Posix module for Posix OS (Unix)
@@ -22,7 +30,7 @@ module Locale
       $stderr.puts self.name + " is loaded." if $DEBUG
 
       module_function
-      # Gets the locales from environment variables. (LANGUAGE > LC_ALL > LC_MESSAGES > LANG)
+      # Gets the locales from environment variables. (LANGUAGE > LC_ALL > LC_CTYPES > LANG)
       # Only LANGUAGE accept plural languages such as "nl_BE;
       # * Returns: an Array of the locale as Locale::Tag::Posix or nil.
       def locales
@@ -43,7 +51,8 @@ module Locale
         charset
       end
     end
+
+    MODULES[:posix] = Posix
   end
-  @@locale_driver_module = Driver::Posix
 end
 

data/lib/locale/driver/win32.rb

@@ -1,20 +1,28 @@
-=begin
-  locale/win32.rb
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2002-2010  Masao Mutoh
+#
+# Original: Ruby-GetText-Package-1.92.0.
+# License: Ruby's or LGPL
+#
+# This library is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-  Copyright (C) 2002-2008  Masao Mutoh
-
-  You may redistribute it and/or modify it under the same
-  license terms as Ruby.
-
-  Original: Ruby-GetText-Package-1.92.0.
-
-  $Id: win32.rb 27 2008-12-03 15:06:50Z mutoh $
-=end
-
-require File.join(File.dirname(__FILE__), 'env')
-require File.join(File.dirname(__FILE__), 'win32_table')
-require 'dl/win32'
+require "locale/driver/env"
+require "locale/driver/win32_table"
 
+require "dl/import"
 
 module Locale
   # Locale::Driver::Win32 module for win32.
@@ -22,11 +30,16 @@ module Locale
   # This is a low-level class. Application shouldn't use this directly.
   module Driver
     module Win32
+      module Kernel32
+        extend DL::Importer
+        dlload "kernel32.dll"
+        extern "int GetThreadLocale()"
+      end
+
       include Win32Table
 
       $stderr.puts self.name + " is loaded." if $DEBUG
-      
-      @@win32 = nil
+
       @@current_locale_id = nil
 
       module_function
@@ -51,8 +64,7 @@ module Locale
         if @@current_locale_id
           @@current_locale_id
         else
-          @@win32 ||= Win32API.new("kernel32.dll", "GetThreadLocale", nil, "i")
-          @@win32.call
+          Kernel32.GetThreadLocale
         end
       end
 
@@ -75,7 +87,8 @@ module Locale
         locales
       end
     end
+
+    MODULES[:win32] = Win32
   end
-  @@locale_driver_module = Driver::Win32
 end
 

data/lib/locale/info/language.rb

@@ -74,7 +74,11 @@ module Locale
 
       # Returns the two or three code.
       def to_s
-        two_code || tree_code
+        if two_code and two_code.size > 0
+          two_code
+        else
+          three_code
+        end
       end
 
       # Returns this object is valid as ISO 639 data.

data/lib/locale/middleware.rb

@@ -0,0 +1,38 @@
+# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+#
+# License: Ruby's or LGPL
+#
+# This library is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require "locale"
+
+module Locale
+  class Middleware
+    def initialize(application, options={})
+      @application = application
+      @options = options
+      Locale.init(:driver => :cgi)
+    end
+
+    def call(environment)
+      request = Rack::Request.new(environment)
+      Locale.set_request([request["lang"]],
+                         [request.cookies["lang"]],
+                         environment["HTTP_ACCEPT_LANGUAGE"],
+                         environment["HTTP_ACCEPT_CHARSET"])
+      @application.call(environment)
+    end
+  end
+end
+

data/lib/locale/version.rb

@@ -7,6 +7,6 @@
   license terms as Ruby.
 =end
 module Locale
-  VERSION = "2.0.5"
+  VERSION = "2.0.6"
 end
 

data/locale.gemspec

@@ -0,0 +1,52 @@
+# -*- mode: ruby; coding: utf-8 -*-
+#
+# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009  Masao Mutoh
+#
+# License: Ruby's or LGPL
+#
+# This library is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+base_dir = File.dirname(__FILE__)
+$LOAD_PATH.unshift(File.join(base_dir, "lib"))
+require "locale/version"
+
+Gem::Specification.new do |s|
+  s.name = "locale"
+  s.version = Locale::VERSION
+  s.summary = 'Ruby-Locale is the pure ruby library which provides basic APIs for localization.'
+  s.description = <<-EOD
+Ruby-Locale is the pure ruby library which provides basic APIs for localization.
+  EOD
+  s.authors = ["Kouhei Sutou", "Masao Mutoh"]
+  s.email = ["kou@clear-code.com", "mutomasa at gmail.com"]
+  s.homepage = "https://github.com/ruby-gettext/locale"
+  s.require_paths = ["lib"]
+  Dir.chdir(base_dir) do
+    s.files = Dir.glob("{lib,samples}/**/*").find_all do |path|
+      File.file?(path)
+    end
+    s.files += ["COPYING", "ChangeLog", "README.rdoc", "Rakefile"]
+    s.files += ["Gemfile", "#{s.name}.gemspec"]
+    s.test_files = Dir.glob("test/test_*.rb")
+  end
+
+  s.add_development_dependency("rake")
+  s.add_development_dependency("bundler")
+  s.add_development_dependency("yard")
+  s.add_development_dependency("redcarpet")
+  s.add_development_dependency("test-unit")
+  s.add_development_dependency("test-unit-notify")
+  s.add_development_dependency("test-unit-rr")
+end

data/samples/rack/hello_rack.rb

@@ -1,14 +1,13 @@
 require 'rubygems'
 require 'rack'
-require 'locale'
+require 'locale_rack'
  
-Locale.init(:driver => :cgi)
-
 class HelloRackApp
+  include Locale::Rack
+
   def call(env)
     req = Rack::Request.new(env)
-    Locale.set_request(req["lang"], req.cookies["lang"],
-                       env["HTTP_ACCEPT_LANGUAGE"], env["HTTP_ACCEPT_CHARSET"])
+    init_locale(env, req)
     str = "Language tag candidates of your request order by the priority:\n\n"
     str += Locale.candidates(:type => :rfc).map{|v| v.inspect + "\n"}.join
     [200, {"Content-Type" => "text/plain", "Content-Length" => str.length.to_s}, [str]]

data/samples/rack/locale_rack.rb

@@ -0,0 +1,11 @@
+ require 'locale'
+ Locale.init(:driver => :cgi)
+ 
+ module Locale::Rack 
+    def init_locale(env, req)
+      Locale.set_request([req["lang"]], [req.cookies["lang"]],
+                         env["HTTP_ACCEPT_LANGUAGE"], 
+                         env["HTTP_ACCEPT_CHARSET"])     
+    end
+ end
+

data/test/test_detect_cgi.rb

@@ -1,55 +1,61 @@
+# -*- mode: ruby; coding: utf-8 -*-
+#
+# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2010  Masao Mutoh
+#
+# License: Ruby's or LGPL
+#
+# This library is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 require 'cgi'
 require 'locale'
 require 'test/unit'
 
-class CGI
-  module QueryExtension
-    # Override this method to avoid to put warning messages.
-    module_function
-    def readlines=(str)
-      @@lines = [str]
-    end
-    def readlines
-      @@lines
-    end
-    def read_from_cmdline
-      require "shellwords"
-      string = readlines.join(' ').gsub(/\n/n, '').gsub(/\\=/n, '%3D').gsub(/\\&/n, '%26')
-      
-      words = Shellwords.shellwords(string)
-      
-      if words.find{|x| /=/n.match(x) }
-        words.join('&')
-      else
-        words.join('+')
-      end
-    end
-    private :read_from_cmdline
+class CustomizableCGI < CGI
+  def initialize(options={})
+    yield(self)
+    super(options)
   end
 end
 
 class TestDetectCGI < Test::Unit::TestCase
-  def setup_cgi(str)
-    CGI::QueryExtension.readlines = str
+  def setup_cgi(env={})
     Locale.init(:driver => :cgi)
-    cgi = CGI.new
+    cgi = CustomizableCGI.new do |_cgi|
+      default_env = {
+        "REQUEST_METHOD" => "GET",
+      }
+      env = default_env.merge(env)
+      stub(_cgi).env_table {env}
+    end
     Locale.cgi = cgi
     Locale.clear_all
   end
 
   def test_query_string
     #query string
-    setup_cgi("lang=ja_JP")
+    setup_cgi("QUERY_STRING" => "lang=ja_JP")
     lang = Locale.current[0]
     assert_equal(Locale::Tag::Simple, lang.class)
     assert_equal("ja_JP", lang.to_s)
 
-    setup_cgi("lang=ja-jp")
+    setup_cgi("QUERY_STRING" => "lang=ja-jp")
     lang = Locale.current[0]
     assert_equal(Locale::Tag::Simple, lang.class)
     assert_equal("ja_JP", lang.to_s)
     assert_equal("ja-JP", lang.to_rfc.to_s)
-    setup_cgi("lang=ja-jp")
+    setup_cgi("QUERY_STRING" => "lang=ja-jp")
     assert_equal("ja_JP", lang.to_s)
     assert_equal("ja-JP", lang.to_rfc.to_s)
 
@@ -57,64 +63,55 @@ class TestDetectCGI < Test::Unit::TestCase
 
   def test_cookie
     #cockie
-    setup_cgi("Set-Cookie: lang=en-us")
+    setup_cgi("HTTP_COOKIE" => "lang=en-us")
     assert_equal("en_US", Locale.current.to_s)
   end
 
   def test_accept_language
-    ENV["HTTP_ACCEPT_LANGUAGE"] = ""
-    ENV["HTTP_ACCEPT_CHARSET"] = ""
-    setup_cgi("")
+    setup_cgi("HTTP_ACCEPT_LANGUAGE" => "",
+              "HTTP_ACCEPT_CHARSET" => "")
     lang = Locale.current[0]
     assert_equal(Locale::Tag::Simple, lang.class)
     assert_equal("en", lang.to_s)
     assert_equal("en", lang.to_rfc.to_s)
 
-    ENV["HTTP_ACCEPT_LANGUAGE"] = "ja,en-us;q=0.7,en;q=0.3"
-    setup_cgi("")
+    setup_cgi("HTTP_ACCEPT_LANGUAGE" => "ja,en-us;q=0.7,en;q=0.3")
     lang1, lang2, lang3 = Locale.current
     assert_equal("ja", lang1.to_rfc.to_s)
     assert_equal("en-US", lang2.to_rfc.to_s)
     assert_equal("en", lang3.to_rfc.to_s)
 
-    ENV["HTTP_ACCEPT_LANGUAGE"] = "en-us,ja;q=0.7,en;q=0.3"
-    setup_cgi("")
+    setup_cgi("HTTP_ACCEPT_LANGUAGE" => "en-us,ja;q=0.7,en;q=0.3")
     lang1, lang2, lang3 = Locale.current
     assert_equal("en-US", lang1.to_rfc.to_s)
     assert_equal("ja", lang2.to_rfc.to_s)
     assert_equal("en", lang3.to_rfc.to_s)
 
-    ENV["HTTP_ACCEPT_LANGUAGE"] = "en"
-    setup_cgi("")
+    setup_cgi("HTTP_ACCEPT_LANGUAGE" => "en")
     lang = Locale.current[0]
     assert_equal("en", lang.to_rfc.to_s)
   end
 
   def test_accept_charset
     #accept charset
-    ENV["HTTP_ACCEPT_CHARSET"] = "Shift_JIS"
-    setup_cgi("")
+    setup_cgi("HTTP_ACCEPT_CHARSET" => "Shift_JIS")
     assert_equal("Shift_JIS", Locale.charset)
 
-    ENV["HTTP_ACCEPT_CHARSET"] = "EUC-JP,*,utf-8"
-    setup_cgi("")
+    setup_cgi("HTTP_ACCEPT_CHARSET" => "EUC-JP,*,utf-8")
     assert_equal("EUC-JP", Locale.charset)
 
-    ENV["HTTP_ACCEPT_CHARSET"] = "*"
-    setup_cgi("")
+    setup_cgi("HTTP_ACCEPT_CHARSET" => "*")
     assert_equal("UTF-8", Locale.charset)
 
-    ENV["HTTP_ACCEPT_CHARSET"] = ""
-    setup_cgi("")
+    setup_cgi("HTTP_ACCEPT_CHARSET" => "")
     assert_equal("UTF-8", Locale.charset)
   end
 
   def test_default
     Locale.set_default(nil)
     Locale.set_default("ja-JP")
-    ENV["HTTP_ACCEPT_LANGUAGE"] = ""
-    ENV["HTTP_ACCEPT_CHARSET"] = ""
-    setup_cgi("")
+    setup_cgi("HTTP_ACCEPT_LANGUAGE" => "",
+              "HTTP_ACCEPT_CHARSET" => "")
     assert_equal("ja-JP", Locale.default.to_rfc.to_s)
     assert_equal("ja-JP", Locale.current.to_rfc.to_s)
     Locale.set_default(nil)
@@ -138,8 +135,7 @@ class TestDetectCGI < Test::Unit::TestCase
 
   def test_candidates
 
-    ENV["HTTP_ACCEPT_LANGUAGE"] = "fr-fr,zh_CN;q=0.7,zh_TW;q=0.2,ja_JP;q=0.1"
-    setup_cgi("")
+    setup_cgi("HTTP_ACCEPT_LANGUAGE" => "fr-fr,zh_CN;q=0.7,zh_TW;q=0.2,ja_JP;q=0.1")
 
     assert_equal common("fr-FR", "zh-CN", "zh-TW", "ja-JP", 
                         "fr", "zh", "ja", "en"), Locale.candidates
@@ -161,8 +157,7 @@ class TestDetectCGI < Test::Unit::TestCase
   end
 
   def test_candidates_with_supported_language_tags
-    ENV["HTTP_ACCEPT_LANGUAGE"] = "fr-fr,zh_CN;q=0.7,zh_TW;q=0.2,ja_JP;q=0.1"
-    setup_cgi("")
+    setup_cgi("HTTP_ACCEPT_LANGUAGE" => "fr-fr,zh_CN;q=0.7,zh_TW;q=0.2,ja_JP;q=0.1")
 
     assert_equal common("fr_FR", "zh", "ja"), Locale.candidates(:type => :common, 
                                                                 :supported_language_tags => ["fr_FR", "ja", "zh"])
@@ -177,8 +172,7 @@ class TestDetectCGI < Test::Unit::TestCase
   end
 
   def test_candidates_with_default
-    ENV["HTTP_ACCEPT_LANGUAGE"] = "fr-fr,zh_CN;q=0.7,zh_TW;q=0.2,ja_JP;q=0.1"
-    setup_cgi("")
+    setup_cgi("HTTP_ACCEPT_LANGUAGE" => "fr-fr,zh_CN;q=0.7,zh_TW;q=0.2,ja_JP;q=0.1")
 
     Locale.default = "zh_TW"
     assert_equal simple("fr-FR", "zh", "ja"), 
@@ -200,8 +194,7 @@ class TestDetectCGI < Test::Unit::TestCase
   def test_candidates_with_app_language_tags
     Locale.set_app_language_tags("fr-FR", "ja")
 
-    ENV["HTTP_ACCEPT_LANGUAGE"] = "fr-fr,zh_CN;q=0.7,zh_TW;q=0.2,ja_JP;q=0.1"
-    setup_cgi("")
+    setup_cgi("HTTP_ACCEPT_LANGUAGE" => "fr-fr,zh_CN;q=0.7,zh_TW;q=0.2,ja_JP;q=0.1")
 
     assert_equal common("fr-FR", "ja"), Locale.candidates
 
@@ -213,4 +206,12 @@ class TestDetectCGI < Test::Unit::TestCase
     Locale.default = "en"
     Locale.set_app_language_tags(nil)
   end
+
+  def test_request
+    Locale.set_request(["ja"], [""], "", "")
+    assert_equal common("ja", "en"), Locale.candidates
+
+    Locale.set_request(["en"], [""], "", "")
+    assert_equal common("en"), Locale.candidates #Cache should be cleared.
+  end
 end