samples/rack/README samples/rack/hello_rack.rb samples/rack/hello_rack.ru @@ -29,14 +29,13 @@ module Locale # (QUERY_STRING "lang" > COOKIE "lang" > HTTP_ACCEPT_LANGUAGE > "en") # def locales - cgi_ = cgi - return Locale::TagList.new([@@default_locale]) unless cgi_ + req = Thread.current[:current_request] + return Locale::TagList.new([@@default_locale]) unless req locales = Locale::TagList.new # QUERY_STRING "lang" - langs = cgi_.params["lang"] - if langs + if langs = req[:query_langs] langs.each do |lang| locales << Locale::Tag.parse(lang) end @@ -44,8 +43,7 @@ module Locale unless locales.size > 0 # COOKIE "lang" - langs = cgi_.cookies["lang"] - if langs + if langs = req[:cookie_langs] langs.each do |lang| locales << Locale::Tag.parse(lang) if lang.size > 0 end @@ -54,7 +52,7 @@ module Locale unless locales.size > 0 # HTTP_ACCEPT_LANGUAGE - if lang = cgi_.accept_language and lang.size > 0 + if lang = req[:accept_language] and lang.size > 0 locales += lang.gsub(/\s/, "").split(/,/).map{|v| v.split(";q=")}.map{|j| [j[0], j[1] ? j[1].to_f : 1.0]}.sort{|a,b| -(a[1] <=> b[1])}.map{|v| Locale::Tag.parse(v[0])} end end @@ -68,10 +66,10 @@ module Locale # Gets the charset from CGI parameters. (Based on RFC2616) # * Returns: the charset (HTTP_ACCEPT_CHARSET > "UTF-8"). def charset - cgi_ = cgi - return @@default_charset unless cgi_ + req = Thread.current[:current_request] + return @@default_charset unless req - charsets = cgi_.accept_charset + charsets = req[:accept_charset] if charsets and charsets.size > 0 num = charsets.index(',') charset = num ? charsets[0, num] : charsets @@ -82,51 +80,63 @@ module Locale charset end - # Sets a CGI object. - # * cgi_: CGI object - # * Returns: self - def set_cgi(cgi_) - Thread.current[:current_cgi] = cgi_ - self - end - - def cgi #:nodoc: - Thread.current[:current_cgi] - end + # Set a request. + # + # * query_langs: An Array of QUERY_STRING value "lang". + # * cookie_langs: An Array of cookie value "lang". + # * accept_language: The value of HTTP_ACCEPT_LANGUAGE + # * accept_charset: The value of HTTP_ACCEPT_CHARSET + def set_request(query_langs, cookie_langs, accept_language, accept_charset) + Thread.current[:current_request] = { + :query_langs => query_langs, + :cookie_langs => cookie_langs, + :accept_language => accept_language, + :accept_charset => accept_charset + } + self + end + + # Clear the current request. + def clear_current_request + Thread.current[:current_request] = nil + end end end @@locale_driver_module = Driver::CGI module_function - # Sets a CGI object. - # - # Call Locale.init(:driver => :cgi) first. + # Sets a request values for lang/charset. # - # * cgi_: CGI object - # * Returns: self - def set_cgi(cgi_) - @@locale_driver_module.set_cgi(cgi_) + # * query_langs: An Array of QUERY_STRING value "lang". + # * cookie_langs: An Array of cookie value "lang". + # * accept_language: The value of HTTP_ACCEPT_LANGUAGE + # * accept_charset: The value of HTTP_ACCEPT_CHARSET + def set_request(query_langs, cookie_langs, accept_language, accept_charset) + @@locale_driver_module.set_request(query_langs, cookie_langs, accept_language, accept_charset) self end - - # Sets a CGI object. + + # Sets a CGI object. This is the convenient function of set_request(). # # Call Locale.init(:driver => :cgi) first. # - # * cgi_: CGI object - # * Returns: cgi_ - def cgi=(cgi_) - set_cgi(cgi_) - cgi_ + # * cgi: CGI object + # * Returns: self + def set_cgi(cgi) + set_request(cgi.params["lang"], cgi.cookies["lang"], + cgi.accept_language, cgi.accept_charset) + self end - # Gets the CGI object. If it is nil, returns new CGI object. + # Sets a CGI object. # # Call Locale.init(:driver => :cgi) first. # - # * Returns: the CGI object - def cgi - @@locale_driver_module.cgi + # * cgi: CGI object + # * Returns: cgi + def cgi=(cgi) + set_cgi(cgi) + cgi end end lib/locale/driver/cgi.rb @@ -62,59 +62,59 @@ class TestDetectCGI < Test::Unit::TestCase end def test_accept_language - setup_cgi("") ENV["HTTP_ACCEPT_LANGUAGE"] = "" ENV["HTTP_ACCEPT_CHARSET"] = "" + setup_cgi("") 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) - setup_cgi("") ENV["HTTP_ACCEPT_LANGUAGE"] = "ja,en-us;q=0.7,en;q=0.3" + setup_cgi("") 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) - setup_cgi("") ENV["HTTP_ACCEPT_LANGUAGE"] = "en-us,ja;q=0.7,en;q=0.3" + setup_cgi("") 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) - setup_cgi("") ENV["HTTP_ACCEPT_LANGUAGE"] = "en" + setup_cgi("") lang = Locale.current[0] assert_equal("en", lang.to_rfc.to_s) end def test_accept_charset #accept charset - setup_cgi("") ENV["HTTP_ACCEPT_CHARSET"] = "Shift_JIS" + setup_cgi("") assert_equal("Shift_JIS", Locale.charset) - setup_cgi("") ENV["HTTP_ACCEPT_CHARSET"] = "EUC-JP,*,utf-8" + setup_cgi("") assert_equal("EUC-JP", Locale.charset) - setup_cgi("") ENV["HTTP_ACCEPT_CHARSET"] = "*" + setup_cgi("") assert_equal("UTF-8", Locale.charset) - setup_cgi("") ENV["HTTP_ACCEPT_CHARSET"] = "" + setup_cgi("") assert_equal("UTF-8", Locale.charset) end def test_default Locale.set_default(nil) Locale.set_default("ja-JP") - setup_cgi("") ENV["HTTP_ACCEPT_LANGUAGE"] = "" ENV["HTTP_ACCEPT_CHARSET"] = "" + setup_cgi("") assert_equal("ja-JP", Locale.default.to_rfc.to_s) assert_equal("ja-JP", Locale.current.to_rfc.to_s) Locale.set_default(nil) @@ -137,9 +137,9 @@ class TestDetectCGI < Test::Unit::TestCase end def test_candidates - setup_cgi("") ENV["HTTP_ACCEPT_LANGUAGE"] = "fr-fr,zh_CN;q=0.7,zh_TW;q=0.2,ja_JP;q=0.1" + setup_cgi("") assert_equal common("fr-FR", "zh-CN", "zh-TW", "ja-JP", "fr", "zh", "ja", "en"), Locale.candidates test/test_detect_cgi.rb 4bf15162cd378180c509a9bfb17a1cce933e39c6 Masao Mutoh mutoh@highway.ne.jp http://github.com/mutoh/locale/commit/703f1f370ae833241d0a727fef86b0bf91854025 703f1f370ae833241d0a727fef86b0bf91854025 2009-04-25T12:07:46-07:00 2009-04-25T12:07:46-07:00 * locale/driver/cgi.rb: Add Locale.set_request. * sample/rack/: Add a sample for rack. 27a8a242e456e1f996d509109d3d8821162d5ca8 Masao Mutoh mutoh@highway.ne.jp