locale 2.0.3 → 2.0.4

data/ChangeLog

@@ -1,3 +1,9 @@
+= locale-2.0.4 (2009-05-22)
+ * Enhance Win32 support. [Reported by Dice]
+ * Enhance JRuby support
+ * Fixed a waring with ruby -d option.
+ * Update version.
+
 = locale-2.0.3 (2009-05-09)
  * Update version.
 

data/Rakefile

@@ -1,80 +1,82 @@
-$:.unshift "./lib"
-
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rake/packagetask'
-require 'rake/gempackagetask'
-
-require 'locale/version'
-
-#desc "Default Task"
-#task :default => [ :test ]
-
-PKG_VERSION = Locale::VERSION
-
-# Run the unit tests
-task :test do 
-  Dir.glob("test/test_*.rb").each do |v|
-    ruby "-Ilib #{v}"
-  end
-end
-
-Rake::RDocTask.new { |rdoc|
-  begin
-    allison = `allison --path`.chop
-  rescue Exception
-    allison = ""
-  end
-  rdoc.rdoc_dir = 'doc'
-  rdoc.title    = "Ruby-Locale library"
-  rdoc.options << "--line-numbers" << "--inline-source" <<
-      "--accessor" << "cattr_accessor=object" << "--charset" << "utf-8"
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('ChangeLog')
-  rdoc.rdoc_files.add('lib')
-  rdoc.template = allison if allison.size > 0
-}
-
-desc "Create gem and tar.gz"
-spec = Gem::Specification.new do |s|
-  s.name = 'locale'
-  s.version = PKG_VERSION
-  s.summary = 'Ruby-Locale is the pure ruby library which provides basic APIs for localization.'
-  s.author = 'Masao Mutoh'
-  s.email = 'mutomasa at gmail.com'
-  s.homepage = 'http://locale.rubyforge.org/'
-  s.rubyforge_project = "locale"
-  s.files = FileList['**/*'].to_a.select{|v| v !~ /pkg|CVS/}
-  s.require_path = 'lib'
-  s.bindir = 'bin'
-  s.has_rdoc = true
-  s.description = <<-EOF
-    Ruby-Locale is the pure ruby library which provides basic APIs for localization.
-  EOF
-end
-
-Rake::PackageTask.new("ruby-locale", PKG_VERSION) do |o|
-  o.package_files = FileList['**/*'].to_a.select{|v| v !~ /pkg|CVS/}
-  o.need_tar_gz = true
-  o.need_zip = false
-end
-
-Rake::GemPackageTask.new(spec) do |p|
-  p.gem_spec = spec
-  p.need_tar_gz = false
-  p.need_zip = false
-end
-
-desc "Publish the release files to RubyForge."
-task :release => [ :package ] do
-  require 'rubyforge'
-
-  rubyforge = RubyForge.new
-  rubyforge.configure
-  rubyforge.login
-  rubyforge.add_release("locale", "locale",
-                        PKG_VERSION,
-                        "pkg/locale-#{PKG_VERSION}.gem",
-                        "pkg/ruby-locale-#{PKG_VERSION}.tar.gz")
-end
+$:.unshift "./lib"
+
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+require 'rake/packagetask'
+require 'rake/gempackagetask'
+
+require 'locale/version'
+
+#desc "Default Task"
+#task :default => [ :test ]
+
+PKG_VERSION = Locale::VERSION
+
+# Run the unit tests
+task :test do 
+  Dir.glob("test/test_*.rb").each do |v|
+    ruby "-Ilib #{v}"
+  end
+end
+
+Rake::RDocTask.new { |rdoc|
+  begin
+    allison = `allison --path`.chop
+  rescue Exception
+    allison = ""
+  end
+  rdoc.rdoc_dir = 'doc'
+  rdoc.title    = "Ruby-Locale library"
+  rdoc.options << "--line-numbers" << "--inline-source" <<
+      "--accessor" << "cattr_accessor=object" << "--charset" << "utf-8"
+  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('ChangeLog')
+  rdoc.rdoc_files.add('lib')
+  rdoc.template = allison if allison.size > 0
+}
+
+desc "Create gem and tar.gz"
+spec = Gem::Specification.new do |s|
+  s.name = 'locale'
+  s.version = PKG_VERSION
+  s.summary = 'Ruby-Locale is the pure ruby library which provides basic APIs for localization.'
+  s.author = 'Masao Mutoh'
+  s.email = 'mutomasa at gmail.com'
+  s.homepage = 'http://locale.rubyforge.org/'
+  s.rubyforge_project = "locale"
+  s.files = FileList['**/*'].to_a.select{|v| v !~ /pkg|CVS/}
+  s.require_path = 'lib'
+  s.bindir = 'bin'
+  s.has_rdoc = true
+  s.description = <<-EOF
+    Ruby-Locale is the pure ruby library which provides basic APIs for localization.
+  EOF
+end
+
+unless RUBY_PLATFORM =~ /win32/
+  Rake::PackageTask.new("ruby-locale", PKG_VERSION) do |o|
+    o.package_files = FileList['**/*'].to_a.select{|v| v !~ /pkg|CVS/}
+    o.need_tar_gz = true
+    o.need_zip = false
+  end
+end
+
+Rake::GemPackageTask.new(spec) do |p|
+  p.gem_spec = spec
+  p.need_tar_gz = false
+  p.need_zip = false
+end
+
+desc "Publish the release files to RubyForge."
+task :release => [ :package ] do
+  require 'rubyforge'
+
+  rubyforge = RubyForge.new
+  rubyforge.configure
+  rubyforge.login
+  rubyforge.add_release("locale", "locale",
+                        PKG_VERSION,
+                        "pkg/locale-#{PKG_VERSION}.gem",
+                        "pkg/ruby-locale-#{PKG_VERSION}.tar.gz")
+end

data/lib/locale/driver/jruby.rb

@@ -22,21 +22,15 @@ module Locale
     module JRuby
       $stderr.puts self.name + " is loaded." if $DEBUG
 
-      if java.lang.System.getProperties['os.name'].downcase =~ /windows/
-        require 'locale/driver/win32_table'
-        
-        extend ::Locale::Driver::Win32Table
-      end
-      
       module_function
       def locales  #:nodoc:
         locales = ::Locale::Driver::Env.locales
         unless locales
           locale = java.util.Locale.getDefault
-          variant = Locale.getVariant 
+          variant = locale.getVariant 
           variants = []
-          if valiant != nil and variant.size > 0
-            valiants = [valiant]
+          if variant != nil and variant.size > 0
+            variants = [variant]
           end
           locales = TagList.new([Locale::Tag::Common.new(locale.getLanguage, nil,
                                                          locale.getCountry, 
@@ -45,7 +39,7 @@ module Locale
         locales
       end
 
-      def charset
+      def charset #:nodoc:
         charset = ::Locale::Driver::Env.charset
         unless charset
           charset = java.nio.charset.Charset.defaultCharset.name

data/lib/locale/driver/win32.rb

@@ -26,7 +26,8 @@ module Locale
 
       $stderr.puts self.name + " is loaded." if $DEBUG
       
-      @@win32 = Win32API.new("kernel32.dll", "GetUserDefaultLangID", nil, "i")
+      @@win32 = nil
+      @@current_locale_id = nil
 
       module_function
 
@@ -34,18 +35,36 @@ module Locale
       def charset
         charset = ::Locale::Driver::Env.charset
         unless charset
-          locale = locales[0]
-          loc = LocaleTable.find{|v| v[1] =locale.to_rfc}
-          loc = LocaleTable.find{|v| v[1] =~ /^#{locale.language}-/} unless loc
-          charset = loc ? loc[2] : nil
+          if locales
+            tag = locales[0].to_rfc.to_s
+            loc = LocaleTable.find{|v| v[1] == tag}
+            loc = LocaleTable.find{|v| v[1] =~ /^#{locales[0].language}/} unless loc
+            charset = loc ? loc[2] : nil
+          else
+            charset = "CP1252"
+          end
         end
         charset
       end
 
+      def thread_locale_id  #:nodoc:
+        if @@current_locale_id
+          @@current_locale_id
+        else
+          @@win32 ||= Win32API.new("kernel32.dll", "GetThreadLocale", nil, "i")
+          @@win32.call
+        end
+      end
+
+      def set_thread_locale_id(lcid)  #:nodoc:
+        # for testing.
+        @@current_locale_id = lcid
+      end
+
       def locales  #:nodoc:
         locales = ::Locale::Driver::Env.locales
         unless locales
-          lang = LocaleTable.assoc(@@win32.call)
+          lang = LocaleTable.assoc(thread_locale_id)
           if lang
             ret = Locale::Tag::Common.parse(lang[1])
             locales = Locale::TagList.new([ret])

data/lib/locale/tag/irregular.rb

@@ -19,7 +19,7 @@ module Locale
 
       def initialize(tag)
         tag = "en" if tag == nil or tag == ""
-        @language = tag
+        super(tag.to_s)
         @tag = tag
       end
 

data/lib/locale/version.rb

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

data/test/test_driver_jruby.rb

@@ -0,0 +1,43 @@
+
+begin
+  require 'locale/driver/jruby'
+  require 'test/unit'
+  class TestDiverJRuby < Test::Unit::TestCase
+
+    def setup
+      ENV["LC_ALL"] = nil
+      ENV["LC_MESSAGES"] = nil
+      ENV["LANG"] = nil
+      ENV["LANGUAGE"] = nil
+    end
+
+    def set_locale(tag)
+      java.util.Locale.setDefault(java.util.Locale.new(tag.language, tag.region, tag.variants.to_s))
+    end
+
+    def test_charset
+      # Depends on system value when jvm is started.
+    end
+
+    def test_locales
+      tag = Locale::Tag::Common.parse("ja-JP")
+      set_locale(tag)
+      assert_equal [tag], Locale::Driver::JRuby.locales
+    end
+
+    def test_locales_with_env
+      ENV["LC_ALL"] = "ja_JP.EUC-JP"
+      assert_equal Locale::Tag::Posix.parse("ja_JP.EUC-JP"), Locale::Driver::JRuby.locales[0]
+      assert_equal "EUC-JP", Locale::Driver::JRuby.charset
+
+      ENV["LC_ALL"] = "ja_JP"
+      assert_equal Locale::Tag::Posix.parse("ja_JP"), Locale::Driver::JRuby.locales[0]
+  
+      ENV["LC_ALL"] = "C"
+      assert_equal Locale::Tag::Posix.parse("C"), Locale::Driver::JRuby.locales[0]
+    end
+  end
+
+rescue LoadError
+  puts "jruby test was skipped."
+end

data/test/test_driver_win32.rb

@@ -0,0 +1,65 @@
+begin
+  require 'locale/driver/win32'
+  require 'test/unit'
+
+  class TestDiverWin32 < Test::Unit::TestCase
+
+    def setup
+      ENV["LC_ALL"] = nil
+      ENV["LC_MESSAGES"] = nil
+      ENV["LANG"] = nil
+      ENV["LANGUAGE"] = nil
+      Locale::Driver::Win32.set_thread_locale_id(nil)
+    end
+
+    def test_charset
+      Locale::Driver::Win32.set_thread_locale_id(0x0404)
+      assert_equal "CP950", Locale::Driver::Win32.charset
+
+      Locale::Driver::Win32.set_thread_locale_id(0x0411)
+      assert_equal "CP932", Locale::Driver::Win32.charset
+
+      Locale::Driver::Win32.set_thread_locale_id(0x201A)
+      assert_equal "CP1251", Locale::Driver::Win32.charset
+
+      Locale::Driver::Win32.set_thread_locale_id(0x0465)
+      assert_equal "UNICODE", Locale::Driver::Win32.charset
+
+      Locale::Driver::Win32.set_thread_locale_id(0x2222) # invalid
+      assert_equal "CP1252", Locale::Driver::Win32.charset
+    end
+
+    def test_locales
+      Locale::Driver::Win32.set_thread_locale_id(0x0404)
+      assert_equal Locale::Tag::Common.parse("zh-TW"), Locale::Driver::Win32.locales[0]
+
+      Locale::Driver::Win32.set_thread_locale_id(0x0411)
+      assert_equal Locale::Tag::Common.parse("ja-JP"), Locale::Driver::Win32.locales[0]
+
+      Locale::Driver::Win32.set_thread_locale_id(0x201A)
+      assert_equal Locale::Tag::Common.parse("bs-Cyrl-BA"), Locale::Driver::Win32.locales[0]
+
+      Locale::Driver::Win32.set_thread_locale_id(0x0465)
+      assert_equal Locale::Tag::Common.parse("div-MV"), Locale::Driver::Win32.locales[0]
+
+      Locale::Driver::Win32.set_thread_locale_id(0x2222) # invalid
+      assert_equal nil, Locale::Driver::Win32.locales
+    end
+
+    def test_locales_with_env
+      ENV["LC_ALL"] = "ja_JP.UTF-8"
+      assert_equal Locale::Tag::Posix.parse("ja_JP.UTF-8"), Locale::Driver::Win32.locales[0]
+      assert_equal "UTF-8", Locale::Driver::Win32.charset
+
+      ENV["LC_ALL"] = "ja_JP"
+      assert_equal Locale::Tag::Posix.parse("ja_JP"), Locale::Driver::Win32.locales[0]
+      assert_equal "CP932", Locale::Driver::Win32.charset
+
+      ENV["LC_ALL"] = "C"
+      assert_equal Locale::Tag::Posix.parse("C"), Locale::Driver::Win32.locales[0]
+      assert_equal "CP1252", Locale::Driver::Win32.charset
+    end
+  end
+rescue LoadError
+  puts "win32 test was skipped."
+end

data/test/test_tag.rb

@@ -3,7 +3,7 @@ require 'test/unit'
 
 class TagTest < Test::Unit::TestCase
 
-  def test_simple
+  def test_simple_lang
     #ja-JP, ja-392
     lang = Locale::Tag.parse("ja")
     assert_equal Locale::Tag::Simple, lang.class
@@ -23,14 +23,16 @@ class TagTest < Test::Unit::TestCase
     assert_equal "kok", lang.language
     assert_equal nil, lang.region
     assert_equal [Locale::Tag::Simple.parse("kok"),
-                 Locale::Tag::Simple.parse("kok")], lang.candidates
- 
+                  Locale::Tag::Simple.parse("kok")], lang.candidates
+    
     assert_equal Locale::Tag::Simple.parse("kok"), lang.to_simple
     assert_equal Locale::Tag::Common.parse("kok"), lang.to_common
     assert_equal Locale::Tag::Rfc.parse("kok"), lang.to_rfc
     assert_equal Locale::Tag::Cldr.parse("kok"), lang.to_cldr
     assert_equal Locale::Tag::Posix.parse("kok"), lang.to_posix
+  end
 
+  def test_simple_lang_region
     lang = Locale::Tag.parse("ja-JP")
     assert_equal Locale::Tag::Simple, lang.class
     assert_equal "ja", lang.language
@@ -56,7 +58,9 @@ class TagTest < Test::Unit::TestCase
     assert_equal Locale::Tag::Rfc.parse("ja-JP"), lang.to_rfc
     assert_equal Locale::Tag::Cldr.parse("ja-JP"), lang.to_cldr
     assert_equal Locale::Tag::Posix.parse("ja_JP"), lang.to_posix
+  end
 
+  def test_simple_unm49
     # UN_M.49(Country code)
     lang = Locale::Tag.parse("ja-392")
     assert_equal Locale::Tag::Simple, lang.class
@@ -70,7 +74,7 @@ class TagTest < Test::Unit::TestCase
     assert_equal Locale::Tag::Rfc.parse("ja-392"), lang.to_rfc
     assert_equal Locale::Tag::Cldr.parse("ja-392"), lang.to_cldr
     assert_equal Locale::Tag::Posix.parse("ja_392"), lang.to_posix
-  
+    
     lang = Locale::Tag.parse("jpn-392")
     assert_equal Locale::Tag::Simple, lang.class
     assert_equal "jpn", lang.language
@@ -119,9 +123,8 @@ class TagTest < Test::Unit::TestCase
 
   end
 
-  def test_common
-    #lang, region, script, variants
-
+  #lang, region, script, variants
+  def test_common_lang_script
     lang = Locale::Tag.parse("az_Arab")
     assert_equal Locale::Tag::Common, lang.class
     assert_equal "az", lang.language
@@ -143,26 +146,6 @@ class TagTest < Test::Unit::TestCase
     assert_equal Locale::Tag::Cldr.parse("az_Arab"), lang.to_cldr
     assert_equal Locale::Tag::Posix.parse("az"), lang.to_posix
 
-    lang = Locale::Tag.parse("en_Latn_US_NYNORSK")
-    assert_equal Locale::Tag::Common, lang.class
-    assert_equal "en", lang.language
-    assert_equal "US", lang.region
-    assert_equal ["NYNORSK"], lang.variants
-    assert_equal [Locale::Tag::Common.parse("en_Latn_US_NYNORSK"),
-                  Locale::Tag::Common.parse("en_Latn_US"),
-                  Locale::Tag::Common.parse("en_US_NYNORSK"),
-                  Locale::Tag::Common.parse("en_US"),
-                  Locale::Tag::Common.parse("en_Latn_NYNORSK"),
-                  Locale::Tag::Common.parse("en_Latn"),
-                  Locale::Tag::Common.parse("en_NYNORSK"),
-                  Locale::Tag::Common.parse("en")], lang.candidates
-
-
-    assert_equal Locale::Tag::Simple.parse("en-US"), lang.to_simple
-    assert_equal Locale::Tag::Common.parse("en_Latn_US_NYNORSK"), lang.to_common
-    assert_equal Locale::Tag::Rfc.parse("en-Latn-US-NYNORSK"), lang.to_rfc
-    assert_equal Locale::Tag::Cldr.parse("en_Latn_US_NYNORSK"), lang.to_cldr
-    assert_equal Locale::Tag::Posix.parse("en_US@NYNORSK"), lang.to_posix
 
     lang = Locale::Tag.parse("uz-Cyrl")
     assert_equal Locale::Tag::Common, lang.class
@@ -184,7 +167,9 @@ class TagTest < Test::Unit::TestCase
     assert_equal Locale::Tag::Rfc.parse("uz-Cyrl"), lang.to_rfc
     assert_equal Locale::Tag::Cldr.parse("uz_Cyrl"), lang.to_cldr
     assert_equal Locale::Tag::Posix.parse("uz"), lang.to_posix
+  end
 
+  def test_common_lang_script_region
     lang = Locale::Tag.parse("ja-Kana-JP")
     assert_equal Locale::Tag::Common, lang.class
     assert_equal "ja", lang.language
@@ -205,7 +190,7 @@ class TagTest < Test::Unit::TestCase
     assert_equal Locale::Tag::Cldr.parse("ja_Kana_JP"), lang.to_cldr
     assert_equal Locale::Tag::Posix.parse("ja_JP"), lang.to_posix
 
-
+    # 3 char language
     lang = Locale::Tag.parse("jpn-Hira-JP")
     assert_equal Locale::Tag::Common, lang.class
     assert_equal "jpn", lang.language
@@ -225,7 +210,9 @@ class TagTest < Test::Unit::TestCase
     assert_equal Locale::Tag::Rfc.parse("jpn-Hira-JP"), lang.to_rfc
     assert_equal Locale::Tag::Cldr.parse("jpn_Hira_JP"), lang.to_cldr
     assert_equal Locale::Tag::Posix.parse("jpn_JP"), lang.to_posix
+  end
 
+  def test_common_lang_script_unm49
     lang = Locale::Tag.parse("jpn-Hira-392")
     assert_equal Locale::Tag::Common, lang.class
     assert_equal "jpn", lang.language
@@ -246,8 +233,33 @@ class TagTest < Test::Unit::TestCase
     assert_equal Locale::Tag::Rfc.parse("jpn-Hira-392"), lang.to_rfc
     assert_equal Locale::Tag::Cldr.parse("jpn_Hira_392"), lang.to_cldr
     assert_equal Locale::Tag::Posix.parse("jpn_392"), lang.to_posix
+  end
+
+  def test_common_lang_script_region_variants
+    lang = Locale::Tag.parse("en_Latn_US_NYNORSK")
+    assert_equal Locale::Tag::Common, lang.class
+    assert_equal "en", lang.language
+    assert_equal "US", lang.region
+    assert_equal ["NYNORSK"], lang.variants
+    assert_equal [Locale::Tag::Common.parse("en_Latn_US_NYNORSK"),
+                  Locale::Tag::Common.parse("en_Latn_US"),
+                  Locale::Tag::Common.parse("en_US_NYNORSK"),
+                  Locale::Tag::Common.parse("en_US"),
+                  Locale::Tag::Common.parse("en_Latn_NYNORSK"),
+                  Locale::Tag::Common.parse("en_Latn"),
+                  Locale::Tag::Common.parse("en_NYNORSK"),
+                  Locale::Tag::Common.parse("en")], lang.candidates
 
-    # Variants
+
+    assert_equal Locale::Tag::Simple.parse("en-US"), lang.to_simple
+    assert_equal Locale::Tag::Common.parse("en_Latn_US_NYNORSK"), lang.to_common
+    assert_equal Locale::Tag::Rfc.parse("en-Latn-US-NYNORSK"), lang.to_rfc
+    assert_equal Locale::Tag::Cldr.parse("en_Latn_US_NYNORSK"), lang.to_cldr
+    assert_equal Locale::Tag::Posix.parse("en_US@NYNORSK"), lang.to_posix
+  end
+
+
+  def test_common_lang_variants
     lang = Locale::Tag.parse("ja-osaka")
     assert_equal Locale::Tag::Common, lang.class
     assert_equal "ja", lang.language
@@ -270,8 +282,9 @@ class TagTest < Test::Unit::TestCase
     assert_equal Locale::Tag::Rfc.parse("ja-osaka"), lang.to_rfc
     assert_equal Locale::Tag::Cldr.parse("ja_OSAKA"), lang.to_cldr
     assert_equal Locale::Tag::Posix.parse("ja@osaka"), lang.to_posix
+  end
 
-
+  def test_common_lang_region_variants
     lang = Locale::Tag.parse("ja-JP-osaka")
     assert_equal Locale::Tag::Common, lang.class
     assert_equal "ja", lang.language
@@ -294,8 +307,9 @@ class TagTest < Test::Unit::TestCase
     assert_equal Locale::Tag::Rfc.parse("ja-JP-osaka"), lang.to_rfc
     assert_equal Locale::Tag::Cldr.parse("ja_JP_OSAKA"), lang.to_cldr
     assert_equal Locale::Tag::Posix.parse("ja_JP@osaka"), lang.to_posix
+  end
 
-    #5 length
+  def test_common_lang_script_region_5length_variants
     lang = Locale::Tag.parse("ja-Kana-JP-osaka")
     assert_equal Locale::Tag::Common, lang.class
     assert_equal "ja", lang.language
@@ -318,7 +332,9 @@ class TagTest < Test::Unit::TestCase
     assert_equal Locale::Tag::Rfc.parse("ja-Kana-JP-osaka"), lang.to_rfc
     assert_equal Locale::Tag::Cldr.parse("ja_Kana_JP_OSAKA"), lang.to_cldr
     assert_equal Locale::Tag::Posix.parse("ja_JP@osaka"), lang.to_posix
+  end
 
+  def test_common_lang_script_region_mid_length_variants
     #middle length
     lang = Locale::Tag.parse("ja-Kana-JP-aomori")
     assert_equal Locale::Tag::Common, lang.class
@@ -343,6 +359,9 @@ class TagTest < Test::Unit::TestCase
     assert_equal Locale::Tag::Cldr.parse("ja_Kana_JP_AOMORI"), lang.to_cldr
     assert_equal Locale::Tag::Posix.parse("ja_JP@aomori"), lang.to_posix
 
+  end
+
+  def test_common_lang_script_region_8length_variants
     #8 length
     lang = Locale::Tag.parse("ja-Kana-JP-hokuriku")
     assert_equal Locale::Tag::Common, lang.class
@@ -366,7 +385,9 @@ class TagTest < Test::Unit::TestCase
     assert_equal Locale::Tag::Rfc.parse("ja-Kana-JP-hokuriku"), lang.to_rfc
     assert_equal Locale::Tag::Cldr.parse("ja_Kana_JP_HOKURIKU"), lang.to_cldr
     assert_equal Locale::Tag::Posix.parse("ja_JP@hokuriku"), lang.to_posix
+  end
 
+  def test_common_lang_script_region_special_variants
     #1 digit and 3 alpha
     lang = Locale::Tag.parse("ja-Kana-JP-0abc")
     assert_equal Locale::Tag::Common, lang.class
@@ -390,7 +411,9 @@ class TagTest < Test::Unit::TestCase
     assert_equal Locale::Tag::Rfc.parse("ja-Kana-JP-0abc"), lang.to_rfc
     assert_equal Locale::Tag::Cldr.parse("ja_Kana_JP_0ABC"), lang.to_cldr
     assert_equal Locale::Tag::Posix.parse("ja_JP@0abc"), lang.to_posix
+  end
 
+  def test_common_lang_region_4digits_variants
     #4 digits
     lang = Locale::Tag.parse("de-CH-1996")
     assert_equal Locale::Tag::Common, lang.class
@@ -413,7 +436,9 @@ class TagTest < Test::Unit::TestCase
     assert_equal Locale::Tag::Rfc.parse("de-CH-1996"), lang.to_rfc
     assert_equal Locale::Tag::Cldr.parse("de_CH_1996"), lang.to_cldr
     assert_equal Locale::Tag::Posix.parse("de_CH@1996"), lang.to_posix
+  end
 
+  def test_common_lang_region_plural_variants
     #Plural
     lang = Locale::Tag.parse("ja-Kana-JP-hokuriku-aomori")
     assert_equal Locale::Tag::Common, lang.class
@@ -437,7 +462,9 @@ class TagTest < Test::Unit::TestCase
     assert_equal Locale::Tag::Rfc.parse("ja-Kana-JP-hokuriku-aomori"), lang.to_rfc
     assert_equal Locale::Tag::Cldr.parse("ja-Kana-JP_HOKURIKU_AOMORI"), lang.to_cldr
     assert_equal Locale::Tag::Posix.parse("ja_JP@hokuriku-aomori"), lang.to_posix
+  end
 
+  def test_common_cases
     #cases
     lang = Locale::Tag.parse("mn-Cyrl-MN")
     assert_equal Locale::Tag::Common, lang.class
@@ -507,12 +534,15 @@ class TagTest < Test::Unit::TestCase
     assert_equal Locale::Tag::Rfc.parse("zh-Latn-CN-variant1"), lang.to_rfc
     assert_equal Locale::Tag::Cldr.parse("zh-Latn-CN_VARIANT1"), lang.to_cldr
     assert_equal Locale::Tag::Posix.parse("zh_CN@variant1"), lang.to_posix
+  end
 
+  def test_common_lang_region_variants_rfc3066
     # RFC3066 compatible
     lang = Locale::Tag.parse("ja-jp-mac")
     assert_equal Locale::Tag::Common, lang.class
     assert_equal "ja", lang.language
     assert_equal "JP", lang.region
+    assert_equal ["mac"], lang.variants
     assert_equal nil, lang.script
     assert_equal [Locale::Tag::Common.parse("ja_JP_mac"),
                   Locale::Tag::Common.parse("ja_JP"),
@@ -549,8 +579,34 @@ class TagTest < Test::Unit::TestCase
 
   end
 
-  def test_rfc
-    # extension
+  def test_rfc_lang_script_region_variant_extension
+    lang = Locale::Tag.parse("zh-Latn-CN-variant1-a-extend1")
+    assert_equal Locale::Tag::Rfc, lang.class
+    assert_equal "zh", lang.language
+    assert_equal "CN", lang.region
+    assert_equal "Latn", lang.script
+    assert_equal ["variant1"], lang.variants
+    assert_equal ["a-extend1"], lang.extensions
+    assert_equal nil, lang.privateuse
+
+    assert_equal [Locale::Tag::Rfc.parse("zh-Latn-CN-variant1"),
+                  Locale::Tag::Rfc.parse("zh-Latn-CN"),
+                  Locale::Tag::Rfc.parse("zh-CN-variant1"),
+                  Locale::Tag::Rfc.parse("zh-CN"),
+                  Locale::Tag::Rfc.parse("zh-Latn-variant1"),
+                  Locale::Tag::Rfc.parse("zh-Latn"),
+                  Locale::Tag::Rfc.parse("zh-variant1"),
+                  Locale::Tag::Rfc.parse("zh"),
+                 ], lang.candidates
+
+    assert_equal Locale::Tag::Simple.parse("zh_CN"), lang.to_simple
+    assert_equal Locale::Tag::Common.parse("zh-Latn-CN_variant1"), lang.to_common
+    assert_equal Locale::Tag::Rfc.parse("zh-Latn-CN-variant1-a-extend1"), lang.to_rfc
+    assert_equal Locale::Tag::Cldr.parse("zh_Latn_CN_VARIANT1"), lang.to_cldr
+    assert_equal Locale::Tag::Posix.parse("zh_CN@variant1"), lang.to_posix
+  end
+
+  def test_rfc_lang_script_region_extensions
     lang = Locale::Tag.parse("ja-Kana-JP-0abc-y-aa-z-bbccdd-b-nnnnnnnn")
     assert_equal Locale::Tag::Rfc, lang.class
     assert_equal "ja", lang.language
@@ -574,7 +630,9 @@ class TagTest < Test::Unit::TestCase
     assert_equal Locale::Tag::Rfc.parse("ja-Kana-JP-0abc-y-aa-z-bbccdd-b-nnnnnnnn"), lang.to_rfc
     assert_equal Locale::Tag::Cldr.parse("ja_Kana_JP_0abc"), lang.to_cldr
     assert_equal Locale::Tag::Posix.parse("ja_JP@0abc"), lang.to_posix
+  end
 
+  def test_rfc_lang_region_variants_extensions
     lang = Locale::Tag.parse("ja-JP-0abc-y-aa-z-bbccdd-b-xxxnnnnn")
     assert_equal Locale::Tag::Rfc, lang.class
     assert_equal "ja", lang.language
@@ -599,6 +657,9 @@ class TagTest < Test::Unit::TestCase
     assert_equal Locale::Tag::Cldr.parse("ja_JP_0abc"), lang.to_cldr
     assert_equal Locale::Tag::Posix.parse("ja_JP@0abc"), lang.to_posix
 
+  end
+
+  def test_rfc_lang_extensions
     lang = Locale::Tag.parse("ja-y-aa-z-bbccdd-b-xxnnnnn")
     assert_equal Locale::Tag::Rfc, lang.class
     assert_equal "ja", lang.language
@@ -622,33 +683,10 @@ class TagTest < Test::Unit::TestCase
     assert_equal Locale::Tag::Rfc.parse("ja-y-aa-z-bbccdd-b-xxnnnnn"), lang.to_rfc
     assert_equal Locale::Tag::Cldr.parse("ja"), lang.to_cldr
     assert_equal Locale::Tag::Posix.parse("ja"), lang.to_posix
+  end
 
-    lang = Locale::Tag.parse("zh-Latn-CN-variant1-a-extend1")
-    assert_equal Locale::Tag::Rfc, lang.class
-    assert_equal "zh", lang.language
-    assert_equal "CN", lang.region
-    assert_equal "Latn", lang.script
-    assert_equal ["variant1"], lang.variants
-    assert_equal ["a-extend1"], lang.extensions
-    assert_equal nil, lang.privateuse
-
-    assert_equal [Locale::Tag::Rfc.parse("zh-Latn-CN-variant1"),
-                  Locale::Tag::Rfc.parse("zh-Latn-CN"),
-                  Locale::Tag::Rfc.parse("zh-CN-variant1"),
-                  Locale::Tag::Rfc.parse("zh-CN"),
-                  Locale::Tag::Rfc.parse("zh-Latn-variant1"),
-                  Locale::Tag::Rfc.parse("zh-Latn"),
-                  Locale::Tag::Rfc.parse("zh-variant1"),
-                  Locale::Tag::Rfc.parse("zh"),
-                 ], lang.candidates
-
-    assert_equal Locale::Tag::Simple.parse("zh_CN"), lang.to_simple
-    assert_equal Locale::Tag::Common.parse("zh-Latn-CN_variant1"), lang.to_common
-    assert_equal Locale::Tag::Rfc.parse("zh-Latn-CN-variant1-a-extend1"), lang.to_rfc
-    assert_equal Locale::Tag::Cldr.parse("zh_Latn_CN_VARIANT1"), lang.to_cldr
-    assert_equal Locale::Tag::Posix.parse("zh_CN@variant1"), lang.to_posix
-
-     #Privateuse
+  def test_rfc_privateuse
+    #Privateuse
     lang = Locale::Tag.parse("zh-Latn-CN-variant1-a-extend1-x-wadegile-private1")
     assert_equal Locale::Tag::Rfc, lang.class
     assert_equal "zh", lang.language
@@ -673,7 +711,9 @@ class TagTest < Test::Unit::TestCase
     assert_equal Locale::Tag::Rfc.parse("zh-Latn-CN-variant1-a-extend1-x-wadegile-private1"), lang.to_rfc
     assert_equal Locale::Tag::Cldr.parse("zh_Latn_CN_VARIANT1"), lang.to_cldr
     assert_equal Locale::Tag::Posix.parse("zh_CN@variant1"), lang.to_posix
+  end
 
+  def test_rfc_cldr_conversion
     #Privateuse with x-ldml (CLDR conversion)
     lang = Locale::Tag.parse("en-US-x-ldml-POSIX-k-calendar-islamic-k-collatio-traditio-k-colStren-secondar")
     assert_equal Locale::Tag::Rfc, lang.class
@@ -739,7 +779,7 @@ class TagTest < Test::Unit::TestCase
     lang.privateuse = "x-foooo"
     assert_equal "ja-Hira-JP-variant2-b-extend2-x-foooo", lang.to_s
 
-     assert_equal [Locale::Tag::Rfc.parse("ja-Hira-JP-variant2"),
+    assert_equal [Locale::Tag::Rfc.parse("ja-Hira-JP-variant2"),
                   Locale::Tag::Rfc.parse("ja-Hira-JP"),
                   Locale::Tag::Rfc.parse("ja-JP-variant2"),
                   Locale::Tag::Rfc.parse("ja-JP"),
@@ -750,7 +790,7 @@ class TagTest < Test::Unit::TestCase
                  ], lang.candidates
   end
 
-  def test_cldr
+  def test_cldr_lang_extensions
     lang = Locale::Tag.parse("de@collation=phonebook")
     assert_equal Locale::Tag::Cldr, lang.class
     assert_equal "de", lang.language
@@ -772,7 +812,9 @@ class TagTest < Test::Unit::TestCase
     assert_equal Locale::Tag::Rfc.parse("de-k-collatio-phoneboo"), lang.to_rfc
     assert_equal Locale::Tag::Cldr.parse("de@collation=phonebook"), lang.to_cldr
     assert_equal Locale::Tag::Posix.parse("de"), lang.to_posix
+  end
 
+  def test_cldr_lang_script_extension
     lang = Locale::Tag.parse("az_Arab@collation=phonebook")
     assert_equal Locale::Tag::Cldr, lang.class
     assert_equal "az", lang.language
@@ -796,6 +838,9 @@ class TagTest < Test::Unit::TestCase
     assert_equal Locale::Tag::Cldr.parse("az_Arab@collation=phonebook"), lang.to_cldr
     assert_equal Locale::Tag::Posix.parse("az"), lang.to_posix
 
+  end
+
+  def test_cldr_lang_region_extensions
     lang = Locale::Tag.parse("de_DE@collation=phonebook;currency=DDM")
     assert_equal Locale::Tag::Cldr, lang.class
     assert_equal "de", lang.language
@@ -819,56 +864,58 @@ class TagTest < Test::Unit::TestCase
     assert_equal Locale::Tag::Cldr.parse("de_DE@collation=phonebook;currency=DDM"), lang.to_cldr
     assert_equal Locale::Tag::Posix.parse("de_DE"), lang.to_posix
 
-    lang = Locale::Tag.parse("en_US_POSIX@calendar=islamic;collation=traditional;colStrength=secondary")
+    lang = Locale::Tag.parse("en_US@calendar=islamic;collation=traditional;colStrength=secondary")
     assert_equal Locale::Tag::Cldr, lang.class
     assert_equal "en", lang.language
     assert_equal "US", lang.region
-    assert_equal ["POSIX"], lang.variants
+    assert_equal [], lang.variants
     assert_equal "islamic", lang.extensions["calendar"]
     assert_equal "traditional", lang.extensions["collation"]
     assert_equal "secondary", lang.extensions["colStrength"]
 
-    assert_equal [Locale::Tag::Cldr.parse("en_US_POSIX"),
+    assert_equal [Locale::Tag::Cldr.parse("en_US"),
+                  Locale::Tag::Cldr.parse("en_US"),
                   Locale::Tag::Cldr.parse("en_US"),
-                  Locale::Tag::Cldr.parse("en_US_POSIX"),
                   Locale::Tag::Cldr.parse("en_US"),
-                  Locale::Tag::Cldr.parse("en_POSIX"),
                   Locale::Tag::Cldr.parse("en"),
-                  Locale::Tag::Cldr.parse("en_POSIX"),
+                  Locale::Tag::Cldr.parse("en"),
+                  Locale::Tag::Cldr.parse("en"),
                   Locale::Tag::Cldr.parse("en"),
                  ], lang.candidates
 
     assert_equal Locale::Tag::Simple.parse("en_US"), lang.to_simple
-    assert_equal Locale::Tag::Common.parse("en_US_POSIX"), lang.to_common
-    assert_equal Locale::Tag::Rfc.parse("en-US-POSIX-k-calendar-islamic-k-collatio-traditio-k-colStren-secondar"), lang.to_rfc
-    assert_equal Locale::Tag::Cldr.parse("en_US_POSIX@calendar=islamic;collation=traditional;colStrength=secondary"), lang.to_cldr
-    assert_equal Locale::Tag::Posix.parse("en_US@POSIX"), lang.to_posix
+    assert_equal Locale::Tag::Common.parse("en_US"), lang.to_common
+    assert_equal Locale::Tag::Rfc.parse("en-US-k-calendar-islamic-k-collatio-traditio-k-colStren-secondar"), lang.to_rfc
+    assert_equal Locale::Tag::Cldr.parse("en_US@calendar=islamic;collation=traditional;colStrength=secondary"), lang.to_cldr
+    assert_equal Locale::Tag::Posix.parse("en_US"), lang.to_posix
 
-    lang = Locale::Tag.parse("en_US@calendar=islamic;collation=traditional;colStrength=secondary")
+  end
+
+  def test_cldr_lang_region_variants_extensions
+    lang = Locale::Tag.parse("en_US_POSIX@calendar=islamic;collation=traditional;colStrength=secondary")
     assert_equal Locale::Tag::Cldr, lang.class
     assert_equal "en", lang.language
     assert_equal "US", lang.region
-    assert_equal [], lang.variants
+    assert_equal ["POSIX"], lang.variants
     assert_equal "islamic", lang.extensions["calendar"]
     assert_equal "traditional", lang.extensions["collation"]
     assert_equal "secondary", lang.extensions["colStrength"]
 
-    assert_equal [Locale::Tag::Cldr.parse("en_US"),
-                  Locale::Tag::Cldr.parse("en_US"),
+    assert_equal [Locale::Tag::Cldr.parse("en_US_POSIX"),
                   Locale::Tag::Cldr.parse("en_US"),
+                  Locale::Tag::Cldr.parse("en_US_POSIX"),
                   Locale::Tag::Cldr.parse("en_US"),
+                  Locale::Tag::Cldr.parse("en_POSIX"),
                   Locale::Tag::Cldr.parse("en"),
-                  Locale::Tag::Cldr.parse("en"),
-                  Locale::Tag::Cldr.parse("en"),
+                  Locale::Tag::Cldr.parse("en_POSIX"),
                   Locale::Tag::Cldr.parse("en"),
                  ], lang.candidates
 
     assert_equal Locale::Tag::Simple.parse("en_US"), lang.to_simple
-    assert_equal Locale::Tag::Common.parse("en_US"), lang.to_common
-    assert_equal Locale::Tag::Rfc.parse("en-US-k-calendar-islamic-k-collatio-traditio-k-colStren-secondar"), lang.to_rfc
-    assert_equal Locale::Tag::Cldr.parse("en_US@calendar=islamic;collation=traditional;colStrength=secondary"), lang.to_cldr
-    assert_equal Locale::Tag::Posix.parse("en_US"), lang.to_posix
-
+    assert_equal Locale::Tag::Common.parse("en_US_POSIX"), lang.to_common
+    assert_equal Locale::Tag::Rfc.parse("en-US-POSIX-k-calendar-islamic-k-collatio-traditio-k-colStren-secondar"), lang.to_rfc
+    assert_equal Locale::Tag::Cldr.parse("en_US_POSIX@calendar=islamic;collation=traditional;colStrength=secondary"), lang.to_cldr
+    assert_equal Locale::Tag::Posix.parse("en_US@POSIX"), lang.to_posix
   end
 
   def test_cldr_writer
@@ -895,7 +942,7 @@ class TagTest < Test::Unit::TestCase
                  ], lang.candidates
   end
 
-  def test_posix
+  def test_posix_c_and_posix
     lang = Locale::Tag.parse("C")
     assert_equal Locale::Tag::Posix, lang.class
     assert_equal "en", lang.language
@@ -939,7 +986,9 @@ class TagTest < Test::Unit::TestCase
     assert_equal Locale::Tag::Rfc.parse("en-US"), lang.to_rfc
     assert_equal Locale::Tag::Cldr.parse("en_US"), lang.to_cldr
     assert_equal Locale::Tag::Posix.parse("en_US"), lang.to_posix
+  end
 
+  def test_posix_irregular_format
     lang = Locale::Tag.parse("japanese.euc")
     assert_equal Locale::Tag::Posix, lang.class
     assert_equal "japanese", lang.language
@@ -956,6 +1005,24 @@ class TagTest < Test::Unit::TestCase
                   Locale::Tag::Posix.parse("japanese"),
                  ], lang.candidates
 
+    lang = Locale::Tag.parse("univ.utf8")
+    assert_equal Locale::Tag::Posix, lang.class
+    assert_equal "univ", lang.language
+    assert_equal nil, lang.region
+    assert_equal "utf8", lang.charset
+
+    assert_equal [Locale::Tag::Posix.parse("univ.utf8"),
+                  Locale::Tag::Posix.parse("univ.utf8"),
+                  Locale::Tag::Posix.parse("univ"),
+                  Locale::Tag::Posix.parse("univ"),
+                  Locale::Tag::Posix.parse("univ.utf8"),
+                  Locale::Tag::Posix.parse("univ.utf8"),
+                  Locale::Tag::Posix.parse("univ"),
+                  Locale::Tag::Posix.parse("univ"),
+                 ], lang.candidates
+  end
+
+  def test_posix_lang_charset
     lang = Locale::Tag.parse("es.iso885915")
     assert_equal Locale::Tag::Posix, lang.class
     assert_equal "es", lang.language
@@ -978,7 +1045,9 @@ class TagTest < Test::Unit::TestCase
     assert_equal Locale::Tag::Rfc.parse("es"), lang.to_rfc
     assert_equal Locale::Tag::Cldr.parse("es"), lang.to_cldr
     assert_equal Locale::Tag::Posix.parse("es.iso885915"), lang.to_posix
+  end
 
+  def test_posix_lang_region_charset
     lang = Locale::Tag.parse("es_ES.iso885915")
     assert_equal Locale::Tag::Posix, lang.class
     assert_equal "es", lang.language
@@ -1002,6 +1071,30 @@ class TagTest < Test::Unit::TestCase
     assert_equal Locale::Tag::Cldr.parse("es_ES"), lang.to_cldr
     assert_equal Locale::Tag::Posix.parse("es_ES.iso885915"), lang.to_posix
 
+    lang = Locale::Tag.parse("ja_JP.UTF-8")
+    assert_equal Locale::Tag::Posix, lang.class
+    assert_equal "ja", lang.language
+    assert_equal "JP", lang.region
+    assert_equal "UTF-8", lang.charset
+
+    assert_equal [Locale::Tag::Posix.parse("ja_JP.UTF-8"),
+                  Locale::Tag::Posix.parse("ja_JP.UTF-8"),
+                  Locale::Tag::Posix.parse("ja_JP"),
+                  Locale::Tag::Posix.parse("ja_JP"),
+                  Locale::Tag::Posix.parse("ja.UTF-8"),
+                  Locale::Tag::Posix.parse("ja.UTF-8"),
+                  Locale::Tag::Posix.parse("ja"),
+                  Locale::Tag::Posix.parse("ja"),
+                 ], lang.candidates
+
+    assert_equal Locale::Tag::Simple.parse("ja_JP"), lang.to_simple
+    assert_equal Locale::Tag::Common.parse("ja_JP"), lang.to_common
+    assert_equal Locale::Tag::Rfc.parse("ja-JP"), lang.to_rfc
+    assert_equal Locale::Tag::Cldr.parse("ja_JP"), lang.to_cldr 
+    assert_equal Locale::Tag::Posix.parse("ja_JP.UTF-8"), lang.to_posix
+  end
+
+  def test_posix_lang_modifier
     lang = Locale::Tag.parse("es@euro")
     assert_equal Locale::Tag::Posix, lang.class
     assert_equal "es", lang.language
@@ -1026,7 +1119,9 @@ class TagTest < Test::Unit::TestCase
     assert_equal Locale::Tag::Rfc.new("es", nil, nil, ["euro"]), lang.to_rfc
     assert_equal Locale::Tag::Cldr.new("es", nil, nil, ["euro"]), lang.to_cldr 
     assert_equal Locale::Tag::Posix.parse("es@euro"), lang.to_posix
+  end
 
+  def test_posix_lang_region_modifier
     lang = Locale::Tag.parse("es_ES@euro")
     assert_equal Locale::Tag::Posix, lang.class
     assert_equal "es", lang.language
@@ -1050,6 +1145,9 @@ class TagTest < Test::Unit::TestCase
     assert_equal Locale::Tag::Cldr.new("es", nil, "ES", ["EURO"]), lang.to_cldr 
     assert_equal Locale::Tag::Posix.parse("es_ES@euro"), lang.to_posix
 
+  end
+
+  def test_posix_lang_region_charset_modifier
     lang = Locale::Tag.parse("es_ES.iso885915@euro")
     assert_equal Locale::Tag::Posix, lang.class
     assert_equal "es", lang.language
@@ -1073,43 +1171,6 @@ class TagTest < Test::Unit::TestCase
     assert_equal Locale::Tag::Cldr.new("es", nil, "ES", ["EURO"]), lang.to_cldr 
     assert_equal Locale::Tag::Posix.parse("es_ES.iso885915@euro"), lang.to_posix
 
-    lang = Locale::Tag.parse("univ.utf8")
-    assert_equal Locale::Tag::Posix, lang.class
-    assert_equal "univ", lang.language
-    assert_equal nil, lang.region
-    assert_equal "utf8", lang.charset
-
-    assert_equal [Locale::Tag::Posix.parse("univ.utf8"),
-                  Locale::Tag::Posix.parse("univ.utf8"),
-                  Locale::Tag::Posix.parse("univ"),
-                  Locale::Tag::Posix.parse("univ"),
-                  Locale::Tag::Posix.parse("univ.utf8"),
-                  Locale::Tag::Posix.parse("univ.utf8"),
-                  Locale::Tag::Posix.parse("univ"),
-                  Locale::Tag::Posix.parse("univ"),
-                 ], lang.candidates
-
-    lang = Locale::Tag.parse("ja_JP.UTF-8")
-    assert_equal Locale::Tag::Posix, lang.class
-    assert_equal "ja", lang.language
-    assert_equal "JP", lang.region
-    assert_equal "UTF-8", lang.charset
-
-    assert_equal [Locale::Tag::Posix.parse("ja_JP.UTF-8"),
-                  Locale::Tag::Posix.parse("ja_JP.UTF-8"),
-                  Locale::Tag::Posix.parse("ja_JP"),
-                  Locale::Tag::Posix.parse("ja_JP"),
-                  Locale::Tag::Posix.parse("ja.UTF-8"),
-                  Locale::Tag::Posix.parse("ja.UTF-8"),
-                  Locale::Tag::Posix.parse("ja"),
-                  Locale::Tag::Posix.parse("ja"),
-                 ], lang.candidates
-
-    assert_equal Locale::Tag::Simple.parse("ja_JP"), lang.to_simple
-    assert_equal Locale::Tag::Common.parse("ja_JP"), lang.to_common
-    assert_equal Locale::Tag::Rfc.parse("ja-JP"), lang.to_rfc
-    assert_equal Locale::Tag::Cldr.parse("ja_JP"), lang.to_cldr 
-    assert_equal Locale::Tag::Posix.parse("ja_JP.UTF-8"), lang.to_posix
   end
 
   def test_posix_writer