locale 2.0.5 → 2.0.6

data/ChangeLog

@@ -1,6 +1,7 @@
-= locale-2.0.5 (2009-11-11)
+= locale-2.0.5 (2009-11-14)
  * Update license information(obiviously Ruby's and LGPL).
    [Pointed out by Masateru Yoshikawa]
+ * Fixed bugs [Bug #26995 by Thomas Nichols][Bug #26998 by Patrick Guiran]
 
 = locale-2.0.4 (2009-05-22)
  * Enhance Win32 support. [Reported by Dice]

data/Gemfile

@@ -0,0 +1,22 @@
+# -*- mode: ruby; coding: utf-8 -*-
+#
+# 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/>.
+
+source :rubygems
+
+gemspec

data/README.rdoc

@@ -1,17 +1,22 @@
-= Ruby-Locale
+= locale - locale for Ruby
 
-Ruby-Locale is the pure ruby library which provides basic and general purpose
-APIs for localization.
-It aims to support all environments which ruby works and all kind of programs
-(GUI, WWW, library, etc), and becomes the hub of other i18n/l10n libs/apps to 
-handle major locale ID standards. 
+Locale gem is the pure ruby library which provides basic and general
+purpose APIs for localization.
+
+This library was called as "Ruby-Locale". Since 2.0.6, this library is
+called just "locale". You can call this library as "locale gem" or
+"Ruby Locale" to distinguish from other "locale"s.
+
+This library aims to support all environments which Ruby works and all
+kind of programs (GUI, WWW, library, etc), and becomes the hub of
+other i18n/l10n libs/apps to handle major locale ID standards.
 
 * Manage Locale ID(Language Tag)
   * Each thread has a Locale ID.
   * POSIX, CLDR, IETF(RFC4646, 3066(BCP47)), Win32 and Java language tags 
     and convert the tag string to each other.
   * Auto detect Locale ID.
-    POSIX(Unix/Linux/*BSD), Win32, JRuby, CGI.
+    POSIX(Unix/Linux/*BSD), Win32, JRuby, CGI(CGI, Rack, others).
 
 * Resources
   * ISO 639-3 languages
@@ -20,24 +25,15 @@ handle major locale ID standards.
 * Support Ruby 1.8.7, Ruby 1.9.1, JRuby 1.1.4. Tested on Win32 and Linux.
 
 == Website
-* http://www.yotabanana.com/hiki/ruby-locale.html
-* http://locale.rubyforge.org/
+* https://github.com/ruby-gettext/locale
 
 == Requirements
 * Ruby-1.8.7 or later <http://www.ruby-lang.org/ja/>
 * JRuby-1.1.4 or later <http://jruby.codehaus.org/>
 
 == Install
-* gem:
-  ($ su)
-   # gem install locale
 
-* tar-ball:
-  Download tar-ball from http://rubyforge.org/projects/locale/
-  De-Compress archive and enter its top directory.
-  Then type:
-   ($ su)
-   # ruby setup.rb
+  % gem install locale
 
 == The simplest usage
 
@@ -63,10 +59,6 @@ LGPL(Lesser General Public License: http://www.gnu.org/licenses/lgpl-3.0.txt).
   * Copyright (C) 2006 Brian Pontarelli, Antonio Terceiro
   * Copyright (C) 2008,2009 Masao Mutoh <mutomasa at gmail.com>
 
-* setup.rb version 3.4.1
-  * Copyright (C) 2000-2005 Minero Aoki <aamine at loveruby.net>
-  * This file is released under LGPL. See the top of the setup.rb.
-
 * Others(Some files are separated from Ruby-GetText-Package-1.92.0)
   * Copyright (C) 2008,2009 Masao Mutoh <mutoh at highwhay.ne.jp>
 
@@ -78,8 +70,8 @@ LGPL(Lesser General Public License: http://www.gnu.org/licenses/lgpl-3.0.txt).
 * memoizable.rb
   * from ActiveSupport-2.2.0 <http://rubyforge.org/projects/activesupport/>
 
-* Ruby-GetText-Package-1.92.0
-  * by Masao Mutoh <http://www.yotabanana.com/hiki/ruby-gettext.html>
+* gettext gem
+  * by The ruby-gettext project <https://ruby-gettext.github.com/>
 
 === Documents
 * The Open Group Base Specifications Issue 6 IEEE Std 1003.1, 2004 Edition 
@@ -108,4 +100,11 @@ LGPL(Lesser General Public License: http://www.gnu.org/licenses/lgpl-3.0.txt).
 * ISO 3166
 
 == Maintainer
+
+=== Active
+
+Kouhei Sutou <kou@clear-code.com>
+
+=== Inactive
+
 Masao Mutoh <mutomasa at gmail.com>

data/Rakefile

@@ -1,82 +1,44 @@
-$:.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
+# -*- mode: ruby; coding: utf-8 -*-
+#
+# 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 'rake'
+require 'rake/testtask'
+require "bundler/gem_helper"
+
+base_dir = File.expand_path(File.dirname(__FILE__))
+
+desc "Run tests"
+task :default => :test
+
+class Bundler::GemHelper
+  undef_method :version_tag
+  def version_tag
+    version
+  end
+end
+
+helper = Bundler::GemHelper.new(base_dir)
+helper.install
+spec = helper.gemspec
+
+desc "Run tests"
+task :test do
+  options = ARGV - Rake.application.top_level_tasks
+  ruby("test/run-test.rb", *options)
+end

data/lib/locale.rb

@@ -1,6 +1,7 @@
 =begin
   locale.rb - Locale module
 
+  Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
   Copyright (C) 2002-2009  Masao Mutoh
 
   You may redistribute it and/or modify it under the same
@@ -14,6 +15,7 @@
 require 'locale/util/memoizable'
 require 'locale/tag'
 require 'locale/taglist'
+require 'locale/driver'
 require 'locale/version'
 
 # Locale module manages the locale informations of the application.
@@ -21,26 +23,25 @@ require 'locale/version'
 # Almost of all i18n/l10n programs use this APIs only.
 module Locale
   @@default_tag = nil
-  @@locale_driver_module = nil
-
-  ROOT = File.dirname(__FILE__)
+  @@driver_name = nil
 
   include Locale::Util::Memoizable
 
   module_function
   def require_driver(name)  #:nodoc:
-    require File.join(ROOT, "locale/driver", name.to_s)
+    require "locale/driver/#{name}"
+    @@driver_name = name.to_sym
   end
 
   def create_language_tag(tag)  #:nodoc:
-    if tag
-      if tag.kind_of? Locale::Tag::Simple
-        tag
-      else
-        Locale::Tag.parse(tag)
-      end
+    case tag
+    when nil
+    when Locale::Tag::Simple
+      tag
+    when Locale::TagList
+      tag[0]
     else
-      nil
+      Locale::Tag.parse(tag)
     end
   end
 
@@ -86,10 +87,8 @@ module Locale
   #
   # * Returns: the driver module.
   def driver_module 
-    unless @@locale_driver_module
-      Locale.init
-    end
-    @@locale_driver_module
+    Locale.init if @@driver_name.nil?
+    Driver::MODULES[@@driver_name]
   end
 
   DEFAULT_LANGUAGE_TAG = Locale::Tag::Simple.new("en") #:nodoc:
@@ -145,7 +144,12 @@ module Locale
     if tags[0]
       languages = Locale::TagList.new
       tags.each do |tag|
-        languages << create_language_tag(tag)
+        case tag
+        when Locale::TagList
+          languages.concat(tag)
+        else
+          languages << create_language_tag(tag)
+        end
       end
     end
     Thread.current[:current_languages] = languages
@@ -236,9 +240,11 @@ module Locale
     end
 
     tags = []
-    (0...candidate_tags[0].size).each {|i|
-      tags += candidate_tags.collect{|v| v[i]}
-    }
+    unless candidate_tags.empty?
+      (0...candidate_tags[0].size).each {|i|
+        tags += candidate_tags.collect{|v| v[i]}
+      }
+    end
     tags += default_tags
     tags.uniq!
 

data/lib/locale/driver.rb

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+#
+# 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/>.
+
+module Locale
+  module Driver
+    MODULES = {}
+  end
+end

data/lib/locale/driver/cgi.rb

@@ -1,15 +1,25 @@
-=begin
-  locale/driver/cgi.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: cgi.rb 27 2008-12-03 15:06:50Z mutoh $
-=end
+# -*- 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"
 
 module Locale
   # Locale::Driver module for CGI.
@@ -50,7 +60,9 @@ module Locale
         unless locales.size > 0
           # HTTP_ACCEPT_LANGUAGE
           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])}
+            # 10.0 is for ruby-1.8.6 which have the bug of str.to_f. 
+            # Normally, this should be 1.0.
+            locales += lang.gsub(/\s/, "").split(/,/).map{|v| v.split(";q=")}.map{|j| [j[0], j[1] ? j[1].to_f : 10.0]}.sort{|a,b| -(a[1] <=> b[1])}.map{|v| Locale::Tag.parse(v[0])}
           end
         end
 
@@ -59,45 +71,47 @@ module Locale
 
       # Gets the charset from CGI parameters. (Based on RFC2616)
       #  * Returns: the charset (HTTP_ACCEPT_CHARSET or nil).
-     def charset
-       req = Thread.current[:current_request]
-       return nil unless req
+      def charset
+        req = Thread.current[:current_request]
+        return nil unless req
 
-       charsets = req[:accept_charset]
-       if charsets and charsets.size > 0
-         num = charsets.index(',')
-         charset = num ? charsets[0, num] : charsets
-         charset = nil if charset == "*"
-       else
-         charset = nil
-       end
-       charset
-     end
+        charsets = req[:accept_charset]
+        if charsets and charsets.size > 0
+          num = charsets.index(',')
+          charset = num ? charsets[0, num] : charsets
+          charset = nil if charset == "*"
+        else
+          charset = nil
+        end
+        charset
+      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
+      # 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)
+        Locale.clear
+        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
+      # Clear the current request.
+      def clear_current_request
+        Thread.current[:current_request] = nil
+      end
     end
+
+    MODULES[:cgi] = CGI
   end
 
-  @@locale_driver_module = Driver::CGI
   
   module_function
   # Sets a request values for lang/charset.
@@ -107,7 +121,7 @@ module Locale
   # * 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)
+    driver_module.set_request(query_langs, cookie_langs, accept_language, accept_charset)
     self
   end