locale 2.0.8 → 2.0.9

data/doc/text/news.md

@@ -1,5 +1,27 @@
 # News
 
+## <a id="2-0-9">2.0.9</a>: 2013-09-20
+
+Locale handling fix release.
+
+### Improvements
+
+  * Added license metadata to gem package.
+    [GitHub#1] [Suggested by jordimassaguerpla]
+
+### Fixes
+
+  * Added missing .yardopts file.
+  * Fixed a bug that wrong environment value is used.
+    [Debian:#520181][Debian:#690572][GitHub#2]
+    [Reported by Stefano Zacchiroli][Reported by Hleb Valoshka]
+
+### Thanks
+
+  * jordimassaguerpla
+  * Stefano Zacchiroli
+  * Hleb Valoshka
+
 ## <a id="2-0-8">2.0.8</a>: 2012-08-29
 
 Package fix release.

data/lib/locale/driver/env.rb

@@ -24,29 +24,37 @@ require 'locale/tag'
 require 'locale/taglist'
 require "locale/driver"
 
-module Locale 
+module Locale
   module Driver
     # Locale::Driver::Env module.
     # Detect the user locales and the charset.
-    # All drivers(except CGI) refer environment variables first and use it 
+    # All drivers(except CGI) refer environment variables first and use it
     # as the locale if it's defined.
     # This is a low-level module. Application shouldn't use this directly.
     module Env
       module_function
 
-      # Gets the locale from environment variable. (LC_ALL > LC_CTYPES > LANG)
+      # Gets the locale from environment variable.
+      # Priority order except charset is LC_ALL > LC_MESSAGES > LANG.
+      # Priority order for charset is LC_ALL > LC_CTYPE > 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_CTYPES"], ENV["LANG"]].each do |loc|
-          if loc != nil and loc.size > 0
-            return Locale::Tag::Posix.parse(loc)
-          end
-        end
-        nil
+        lc_all = Private.parse(ENV["LC_ALL"])
+        return lc_all if lc_all
+
+        lc_messages = Private.parse(ENV["LC_MESSAGES"])
+        lang = Private.parse(ENV["LANG"])
+
+        tag = lc_messages || lang
+        return nil if tag.nil?
+
+        lc_ctype = Private.parse(ENV["LC_CTYPE"])
+        tag.charset = lc_ctype.charset if lc_ctype
+
+        tag
       end
 
-      # Gets the locales from environment variables. (LANGUAGE > LC_ALL > LC_CTYPES > LANG)
+      # Gets the locales from environment variables. (LANGUAGE > LC_ALL > LC_MESSAGES > LANG)
       # * Returns: an Array of the locale as Locale::Tag::Posix or nil.
       def locales
         locales = ENV["LANGUAGE"]
@@ -61,16 +69,26 @@ module Locale
         nil
       end
 
-      # Gets the charset from environment variable or return nil.
+      # Gets the charset from environment variables
+      # (LC_ALL > LC_CTYPE > LANG) or return nil.
       # * Returns: the system charset.
       def charset  # :nodoc:
-        if loc = locale
-          loc.charset
-        else
-          nil
+        [ENV["LC_ALL"], ENV["LC_CTYPE"], ENV["LANG"]].each do |env|
+          tag = Private.parse(env)
+          next if tag.nil?
+          return tag.charset
+        end
+        nil
+      end
+
+      module Private
+        module_function
+        def parse(env_value)
+          return nil if env_value.nil?
+          return nil if env_value.empty?
+          Locale::Tag::Posix.parse(env_value)
         end
       end
-      
     end
 
     MODULES[:env] = Env

data/lib/locale/driver/posix.rb

@@ -30,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_CTYPES > LANG)
+      # Gets the locales from environment variables. (LANGUAGE > LC_ALL > LC_MESSAGES > LANG)
       # Only LANGUAGE accept plural languages such as "nl_BE;
       # * Returns: an Array of the locale as Locale::Tag::Posix or nil.
       def locales

data/lib/locale/taglist.rb

@@ -46,11 +46,13 @@ module Locale
     end
     # Returns the top priority charset. (posix)
     def charset
-      if self[0].respond_to? :charset
-        self[0].charset
-      else
-        ::Locale.driver_module.charset
+      top_priority_charset = nil
+      first_tag = self[0]
+      if first_tag.respond_to?(:charset)
+        top_priority_charset = first_tag.charset
       end
+      top_priority_charset ||= ::Locale.driver_module.charset
+      top_priority_charset
     end
     memoize :charset
 

data/lib/locale/version.rb

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

data/locale.gemspec

@@ -1,6 +1,6 @@
 # -*- mode: ruby; coding: utf-8 -*-
 #
-# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2013  Kouhei Sutou <kou@clear-code.com>
 # Copyright (C) 2009  Masao Mutoh
 #
 # License: Ruby's or LGPL
@@ -32,6 +32,7 @@ Ruby-Locale is the pure ruby library which provides basic APIs for localization.
   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.licenses = ["Ruby", "LGPLv3+"]
   s.require_paths = ["lib"]
   Dir.chdir(base_dir) do
     s.files = Dir.glob("{lib,samples}/**/*").find_all do |path|

data/test/test_detect_general.rb

@@ -28,14 +28,16 @@ class TestDetectGeneral < Test::Unit::TestCase
     Locale.init
     Locale.clear_all
     ENV["LC_ALL"] = nil
-    ENV["LC_CTYPES"] = nil
+    ENV["LC_CTYPE"] = nil
+    ENV["LC_MESSAGES"] = nil
     ENV["LANG"] = nil
     ENV["LANGUAGE"] = nil
   end
 
   def test_lc_all
     ENV["LC_ALL"] = "ja_JP.eucJP"
-    ENV["LC_CTYPES"] = "zh_CN.UTF-8"  #Ignored.
+    ENV["LC_CTYPE"] = "fr_FR.ISO-8859-1"  #Ignored.
+    ENV["LC_MESSAGES"] = "zh_CN.UTF-8"  #Ignored.
     ENV["LANG"] = "ko_KR.UTF-8"  #Ignored.
     ENV["LANGUAGE"] = nil
 
@@ -51,8 +53,9 @@ class TestDetectGeneral < Test::Unit::TestCase
 
   def test_lc_messages
     ENV["LC_ALL"] = nil
-    ENV["LC_CTYPES"] = "ja_JP.eucJP"
-    ENV["LANG"] = "ko_KR.UTF-8"  #Ignored.
+    ENV["LC_CTYPE"] = nil
+    ENV["LC_MESSAGES"] = "ja_JP.eucJP"
+    ENV["LANG"] = "ko_KR.UTF-8"  #Ignored except charset.
     ENV["LANGUAGE"] = nil
 
     lang = Locale.current[0]
@@ -62,12 +65,30 @@ class TestDetectGeneral < Test::Unit::TestCase
     assert_equal "eucJP", lang.charset
     assert_equal Locale::Tag::Posix.new("ja", "JP", "eucJP"), lang
 
-    assert_equal "eucJP", Locale.charset
+    assert_equal "UTF-8", Locale.charset
+  end
+
+  def test_lc_messages_with_lc_ctype
+    ENV["LC_ALL"] = nil
+    ENV["LC_CTYPE"] = "fr_FR.ISO-8859-1"
+    ENV["LC_MESSAGES"] = "ja_JP.eucJP"
+    ENV["LANG"] = "ko_KR.UTF-8"  #Ignored.
+    ENV["LANGUAGE"] = nil
+
+    lang = Locale.current[0]
+    assert_equal Locale::Tag::Posix, lang.class
+    assert_equal "ja", lang.language
+    assert_equal "JP", lang.region
+    assert_equal "ISO-8859-1", lang.charset
+    assert_equal Locale::Tag::Posix.new("ja", "JP", "ISO-8859-1"), lang
+
+    assert_equal "ISO-8859-1", Locale.charset
   end
 
   def test_lang
     ENV["LC_ALL"] = nil
-    ENV["LC_CTYPES"] = nil
+    ENV["LC_CTYPE"] = nil
+    ENV["LC_MESSAGES"] = nil
     ENV["LANG"] = "ja_JP.eucJP"
     ENV["LANGUAGE"] = nil
 
@@ -81,9 +102,27 @@ class TestDetectGeneral < Test::Unit::TestCase
     assert_equal "eucJP", Locale.charset
   end
 
+  def test_lang_with_ctype
+    ENV["LC_ALL"] = nil
+    ENV["LC_CTYPE"] = "fr_FR.ISO-8859-1"
+    ENV["LC_MESSAGES"] = nil
+    ENV["LANG"] = "ja_JP.eucJP"
+    ENV["LANGUAGE"] = nil
+
+    lang = Locale.current[0]
+    assert_equal Locale::Tag::Posix, lang.class
+    assert_equal "ja", lang.language
+    assert_equal "JP", lang.region
+    assert_equal "ISO-8859-1", lang.charset
+    assert_equal Locale::Tag::Posix.new("ja", "JP", "ISO-8859-1"), lang
+
+    assert_equal "ISO-8859-1", Locale.charset
+  end
+
   def test_lang_complex
     ENV["LC_ALL"] = "zh_CN.UTF-8"  # Ignored.
-    ENV["LC_CTYPES"] = "ko_KR.UTF-8" #Ingored.
+    ENV["LC_CTYPE"] = "fr_FR.ISO-8859-1" #Ingored.
+    ENV["LC_MESSAGES"] = "ko_KR.UTF-8" #Ingored.
     ENV["LANG"] = "en_US.UTF-8"  # Ignored.
     ENV["LANGUAGE"] ="ja_JP.eucJP:zh_CN.UTF-8"
 
@@ -232,6 +271,40 @@ class TestDetectGeneral < Test::Unit::TestCase
     
   end
 
+  class TestCharset < self
+    def test_lc_all
+      ENV["LC_ALL"] = "ja_JP.eucJP"
+      ENV["LC_CTYPE"] = "ko_KR.eucKR" # Ignored.
+      ENV["LANG"] = "fr_FR.ISO-8859-1" # Ignored.
+
+      assert_equal("eucJP", Locale.charset)
+    end
+
+    def test_lc_ctype
+      ENV["LC_ALL"] = nil
+      ENV["LC_CTYPE"] = "ko_KR.eucKR"
+      ENV["LANG"] = "fr_FR.ISO-8859-1" # Ignored.
+
+      assert_equal("eucKR", Locale.charset)
+    end
+
+    def test_lc_messages
+      ENV["LC_ALL"] = nil
+      ENV["LC_MESSAGES"] = "ko_KR.eucKR" # Ignored.
+      ENV["LANG"] = "fr_FR.ISO-8859-1"
+
+      assert_equal("ISO-8859-1", Locale.charset)
+    end
+
+    def test_lang
+      ENV["LC_ALL"] = nil
+      ENV["LC_CTYPE"] = nil
+      ENV["LANG"] = "fr_FR.ISO-8859-1"
+
+      assert_equal("ISO-8859-1", Locale.charset)
+    end
+  end
+
   private
   def jruby?
     RUBY_PLATFORM == "java"

data/test/test_driver_jruby.rb

@@ -26,7 +26,7 @@ begin
 
     def setup
       ENV["LC_ALL"] = nil
-      ENV["LC_CTYPES"] = nil
+      ENV["LC_CTYPE"] = nil
       ENV["LANG"] = nil
       ENV["LANGUAGE"] = nil
     end

data/test/test_driver_win32.rb

@@ -6,7 +6,7 @@ begin
 
     def setup
       ENV["LC_ALL"] = nil
-      ENV["LC_CTYPES"] = nil
+      ENV["LC_CTYPE"] = nil
       ENV["LANG"] = nil
       ENV["LANGUAGE"] = nil
       Locale::Driver::Win32.set_thread_locale_id(nil)

data/test/test_taglist.rb

@@ -31,4 +31,31 @@ class TestTagList < Test::Unit::TestCase
     assert_equal ["y-aaa"], list.extensions
     assert_equal "x-bbb", list.privateuse
   end
+
+  class TestCharset < self
+    def setup
+      ENV["LC_ALL"] = nil
+      ENV["LC_CTYPE"] = nil
+      ENV["LANG"] = nil
+      ENV["LANGUAGE"] = nil
+    end
+
+    def test_empty
+      list = Locale::TagList.new
+      ENV["LC_ALL"] = "en_US.UTF-8"
+      assert_equal("UTF-8", list.charset)
+    end
+
+    def test_have_charset_tag
+      list = Locale::TagList.new([Locale::Tag.parse("en_US.ISO-8859-1")])
+      ENV["LC_ALL"] = "en_US.UTF-8"
+      assert_equal("ISO-8859-1", list.charset)
+    end
+
+    def test_no_charset_tag
+      list = Locale::TagList.new([Locale::Tag.parse("en_US")])
+      ENV["LC_ALL"] = "en_US.UTF-8"
+      assert_equal("UTF-8", list.charset)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locale
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-29 00:00:00.000000000 Z
+date: 2013-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -135,41 +135,41 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/locale/tag/simple.rb
+- lib/locale/version.rb
+- lib/locale/tag.rb
+- lib/locale/tag/cldr.rb
 - lib/locale/tag/posix.rb
 - lib/locale/tag/common.rb
-- lib/locale/tag/cldr.rb
-- lib/locale/tag/rfc.rb
+- lib/locale/tag/simple.rb
 - lib/locale/tag/irregular.rb
-- lib/locale/info.rb
-- lib/locale/data/languages.tab.gz
-- lib/locale/data/regions.tab.gz
-- lib/locale/middleware.rb
-- lib/locale/version.rb
-- lib/locale/info/region.rb
+- lib/locale/tag/rfc.rb
 - lib/locale/info/language.rb
-- lib/locale/driver/env.rb
-- lib/locale/driver/posix.rb
-- lib/locale/driver/jruby.rb
+- lib/locale/info/region.rb
+- lib/locale/driver.rb
 - lib/locale/driver/cgi.rb
-- lib/locale/driver/win32_table.rb
+- lib/locale/driver/posix.rb
+- lib/locale/driver/env.rb
 - lib/locale/driver/win32.rb
-- lib/locale/taglist.rb
-- lib/locale/driver.rb
-- lib/locale/tag.rb
+- lib/locale/driver/win32_table.rb
+- lib/locale/driver/jruby.rb
+- lib/locale/info.rb
+- lib/locale/middleware.rb
+- lib/locale/data/languages.tab.gz
+- lib/locale/data/regions.tab.gz
 - lib/locale/util/memoizable.rb
+- lib/locale/taglist.rb
 - lib/locale.rb
-- samples/rack/hello_rack.rb
-- samples/rack/README
-- samples/rack/locale_rack.rb
-- samples/rack/hello_rack.ru
 - samples/cgi/README
-- samples/cgi/cookie.cgi
-- samples/cgi/locale.css
 - samples/cgi/index.cgi
+- samples/cgi/locale.css
 - samples/cgi/http.rb
-- samples/sample_info.rb
+- samples/cgi/cookie.cgi
+- samples/rack/README
+- samples/rack/locale_rack.rb
+- samples/rack/hello_rack.rb
+- samples/rack/hello_rack.ru
 - samples/sample_1.rb
+- samples/sample_info.rb
 - COPYING
 - ChangeLog
 - README.rdoc
@@ -178,18 +178,20 @@ files:
 - locale.gemspec
 - .yardopts
 - doc/text/news.md
-- test/test_driver_jruby.rb
-- test/test_taglist.rb
-- test/test_detect_general.rb
-- test/test_driver_win32.rb
-- test/test_thread.rb
-- test/test_memoizable.rb
+- test/test_tag.rb
 - test/test_detect_cgi.rb
+- test/test_taglist.rb
 - test/test_locale.rb
+- test/test_thread.rb
 - test/test_info.rb
-- test/test_tag.rb
+- test/test_memoizable.rb
+- test/test_driver_jruby.rb
+- test/test_driver_win32.rb
+- test/test_detect_general.rb
 homepage: https://github.com/ruby-gettext/locale
-licenses: []
+licenses:
+- Ruby
+- LGPLv3+
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -213,14 +215,14 @@ signing_key:
 specification_version: 3
 summary: Ruby-Locale is the pure ruby library which provides basic APIs for localization.
 test_files:
-- test/test_driver_jruby.rb
-- test/test_taglist.rb
-- test/test_detect_general.rb
-- test/test_driver_win32.rb
-- test/test_thread.rb
-- test/test_memoizable.rb
+- test/test_tag.rb
 - test/test_detect_cgi.rb
+- test/test_taglist.rb
 - test/test_locale.rb
+- test/test_thread.rb
 - test/test_info.rb
-- test/test_tag.rb
+- test/test_memoizable.rb
+- test/test_driver_jruby.rb
+- test/test_driver_win32.rb
+- test/test_detect_general.rb
 has_rdoc: