gettext 1.10.0 → 1.90.0

data/lib/gettext.rb

@@ -10,13 +10,13 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: gettext.rb,v 1.27 2007/07/05 05:29:28 mutoh Exp $
+  $Id: gettext.rb,v 1.37 2008/01/29 16:30:29 mutoh Exp $
 =end
 
 require 'rbconfig'
 require 'gettext/version'
 require 'gettext/mo'
-require 'gettext/locale'
+require 'locale'
 require 'gettext/textdomainmanager'
 require 'gettext/string'
 
@@ -29,7 +29,7 @@ module GetText
     mod.extend self
   end
 
-  @@__cached = true
+  @@__cached = ! $DEBUG
 
   # Set the value whether cache messages or not. 
   # true to cache messages, otherwise false.
@@ -45,11 +45,14 @@ module GetText
   def cached?
     @@__cached
   end
-
+  
   # Clear the cached messages.
   def clear_cache
     @@__cache_msgids = {}
     @@__cache_nmsgids = {}
+    @@__cache_target_classes = {}
+    @@__cache_bound_target = {}
+    @@__cache_bound_targets = {}
   end
 
   @@__textdomainmanagers = Hash.new
@@ -85,15 +88,16 @@ module GetText
       opt = options
     end
     opt[:locale] = opt[:locale] ? Locale::Object.new(opt[:locale]) : Locale.get
-    opt[:charset] = output_charset if output_charset
-    locale.charset = opt[:charset] if opt[:charset]
+    opt[:charset] = TextDomainManager.output_charset if TextDomainManager.output_charset
+    opt[:locale].charset = opt[:charset] if opt[:charset]
     Locale.set_current(opt[:locale])
-    manager = @@__textdomainmanagers[bound_target]
+    target_key = bound_target
+    manager = @@__textdomainmanagers[target_key]
     if manager
       manager.set_locale(opt[:locale]) 
     else
-      manager = TextDomainManager.new(bound_target, opt[:locale])
-      @@__textdomainmanagers[bound_target] = manager
+      manager = TextDomainManager.new(target_key, opt[:locale])
+      @@__textdomainmanagers[target_key] = manager
     end
     manager.add_textdomain(domainname, opt)
     manager
@@ -121,10 +125,11 @@ module GetText
   def textdomain(domainname)
     domain = TextDomainManager.textdomain(domainname)
     raise NoboundTextDomainError, "#{domainname} is not bound." unless domain
-    manager = @@__textdomainmanagers[bound_target]
+    target_key = bound_target
+    manager = @@__textdomainmanagers[target_key]
     unless manager
-      manager = TextDomainManager.new(bound_target, Locale.get)
-      @@__textdomainmanagers[bound_target] = manager
+      manager = TextDomainManager.new(target_key, Locale.get)
+      @@__textdomainmanagers[target_key] = manager
     end
     manager.set_locale(Locale.get)
     manager.add_textdomain(domainname)
@@ -148,7 +153,7 @@ module GetText
   # * klass: a class/module to find. Default is the class of self.
   # * ignore_targets: Ignore tragets.
   # * Returns: a bound GetText::TextDomain or nil.
-  def each_textdomain(klass = bound_target, ignore_targets = []) #:nodoc:
+  def each_textdomain(klass = self, ignore_targets = []) #:nodoc:
     bound_targets(klass).each do |target|
       unless ignore_targets.include? target
 	manager = @@__textdomainmanagers[target]
@@ -162,23 +167,70 @@ module GetText
     self
   end
 
-  def bound_target # :nodoc:
-    if self.kind_of? Class or self.kind_of? Module
-      self
+  @@__cache_target_classes = {}
+
+  def find_targets(klass)  #:nodoc:
+    if cached?
+      return @@__cache_target_classes[klass] if @@__cache_target_classes[klass]
+    end
+    unless (klass.kind_of? Class or klass.kind_of? Module)
+      klass = klass.class
+    end
+    ret = []
+    ary = klass.name.split(/::/)
+    while(v = ary.shift)
+      if ret.size == 0
+        if v.kind_of? Class
+          target = v
+        else
+          target = eval(v)
+          return [GetText] unless (target = eval(v)) # For anonymous module
+        end
+      else
+        target = ret[0].const_get(v)
+      end
+      ret.unshift(target) if target
+    end
+    @@__cache_target_classes[klass] = ret.size > 0 ? ret : [klass]
+  end
+
+  @@__cache_bound_target = {}
+
+  def bound_target(klass = self) # :nodoc:
+    if cached?
+      if @@__cache_bound_target[klass]
+        return @@__cache_bound_target[klass]
+      end
+    end
+
+    ret = nil
+    if klass.kind_of? Class or klass.kind_of? Module
+      ret = klass
     else
-      self.class
+      ret = klass.class
     end
+    ret = GetText if ret.name =~ /^\#<|^$/
+    @@__cache_bound_target[klass] = ret
+    ret
   end
 
+  @@__cache_bound_targets = {}
+
   def bound_targets(klass)  # :nodoc:
+    if cached?
+      if @@__cache_bound_targets[klass]
+        return @@__cache_bound_targets[klass]
+      end
+    end
     ret = []
+    klass = bound_target(klass)
     ary = klass.name.split(/::/)
     while(v = ary.shift)
       ret.unshift(((ret.size == 0) ? eval(v) : ret[0].const_get(v)))
     end
-    ((ret + klass.ancestors + [GetText]) & @@__textdomainmanagers.keys).uniq
+    @@__cache_bound_targets[klass] = ((ret + klass.ancestors + [GetText]) & @@__textdomainmanagers.keys).uniq
   end
-
+ 
   @@__cache_msgids = {}
 
   # call-seq:
@@ -206,16 +258,23 @@ module GetText
   # See: http://www.gnu.org/software/gettext/manual/html_mono/gettext.html#SEC151
   def sgettext(msgid, div = '|')
     cached_key = [bound_target, Locale.current, msgid]
-    if (@@__cached or ! $DEBUG)
-      if @@__cache_msgids.keys.include?(cached_key)
+    if cached?
+      if @@__cache_msgids[cached_key]
         return @@__cache_msgids[cached_key]
       end
     end
     msg = nil
-    each_textdomain {|textdomain|
-      msg = textdomain.gettext(msgid)
+
+    # Use "for"(not "each") to support JRuby 1.1.0.
+    for target in bound_targets(self)
+      manager = @@__textdomainmanagers[target]
+      for textdomain in manager.textdomains
+        msg = textdomain[1].gettext(msgid)
+        break if msg
+      end
       break if msg
-    }
+    end
+
     msg ||= msgid
     if div and msg == msgid
       if index = msg.rindex(div)
@@ -294,16 +353,21 @@ module GetText
 
     cached_key = [bound_target, Locale.current, msgid + "\000" + msgid_plural]
     msgs = nil
-    if (@@__cached or ! $DEBUG)
-      if @@__cache_nmsgids.keys.include?(cached_key)
+    if @@__cached
+      if @@__cache_nmsgids.has_key?(cached_key)
         msgs = @@__cache_nmsgids[cached_key]  # [msgstr, cond_as_string]
       end
     end
     unless msgs
-      each_textdomain {|textdomain|
-        msgs = textdomain.ngettext_data(msgid, msgid_plural)
+      # Use "for"(not "each") to support JRuby 1.1.0.
+      for target in bound_targets(self)
+        manager = @@__textdomainmanagers[target]
+        for textdomain in manager.textdomains
+          msgs = textdomain[1].ngettext_data(msgid, msgid_plural)
+          break if msgs
+        end
         break if msgs
-      }
+      end
       msgs = [[msgid, msgid_plural], "n != 1"] unless msgs
       @@__cache_nmsgids[cached_key] = msgs
     end
@@ -338,7 +402,7 @@ module GetText
       else
 	ret = Locale::Object.new(locale.to_s)
       end
-      ret.charset = output_charset if output_charset
+      ret.charset = TextDomainManager.output_charset if TextDomainManager.output_charset
       Locale.set(ret)
     else
       Locale.set(nil)
@@ -347,11 +411,11 @@ module GetText
     if this_target_only
       manager = @@__textdomainmanagers[bound_target]
       if manager
-	manager.set_locale(ret)
+	manager.set_locale(ret, ! cached?)
       end
     else
       each_textdomain {|textdomain|
-	textdomain.set_locale(ret)
+        textdomain.set_locale(ret, ! cached?)
       }
     end
     self
@@ -373,10 +437,10 @@ module GetText
     else
       ret = Locale.default
     end
-    ret.charset = output_charset if output_charset
+    ret.charset = TextDomainManager.output_charset if TextDomainManager.output_charset
     Locale.set_current(ret)
     TextDomainManager.each_all {|textdomain|
-      textdomain.set_locale(ret)
+      textdomain.set_locale(ret, ! cached?)
     }
     self
   end
@@ -412,7 +476,7 @@ module GetText
   # Gets the current output_charset which is set using GetText.set_output_charset.
   # * Returns: output_charset.
   def output_charset
-    TextDomainManager.output_charset
+    TextDomainManager.output_charset || locale.charset
   end
 
   # Gets the current locale.
@@ -421,17 +485,6 @@ module GetText
     Locale.current
   end
 
-  # Deprecated. Now this function do nothing. Use GetText.output_charset= instead.
-  def set_charset(cs) #:nodoc:
-    $stderr.puts "Deprecated. Now this function do nothing. Use GetText.output_charset= instead." if $DEBUG
-    self
-  end
-
-  def charset=(cs) #:nodoc:
-    set_charset(cs)
-    cs
-  end
-  
   # Add default locale path.
   # * path: a new locale path. (e.g.) "/usr/share/locale/%{locale}/LC_MESSAGES/%{name}.mo"
   #   ('locale' => "ja_JP", 'name' => "textdomain")
@@ -445,7 +498,6 @@ module GetText
   #   * :with_messages - show informations with messages of the current mo file. Default is false.
   #   * :out - An output target. Default is STDOUT.
   #   * :with_paths - show the load paths for mo-files.
-  # * Returns: localized text by msgid. If there are not binded mo-file, it will return msgid.
   def current_textdomain_info(options = {})
     opts = {:with_messages => false, :with_paths => false, :out => STDOUT}.merge(options)
     ret = nil
@@ -475,7 +527,7 @@ module GetText
   alias :ns_ :nsgettext #:nodoc:
 
   module_function :bindtextdomain, :textdomain, :each_textdomain, :cached=, :cached?, :clear_cache,
-    :N_, :gettext, :_, :ngettext, :n_, :sgettext, :s_, :nsgettext, :ns_, :bound_target, :bound_targets,
-    :setlocale, :set_locale, :locale=, :set_locale_all, :locale, :charset=, :set_charset,
-    :set_output_charset, :output_charset=, :output_charset, :current_textdomain_info
+  :N_, :gettext, :_, :ngettext, :n_, :sgettext, :s_, :nsgettext, :ns_, :bound_target, :bound_targets, :find_targets,
+  :setlocale, :set_locale, :locale=, :set_locale_all, :locale, 
+  :set_output_charset, :output_charset=, :output_charset, :current_textdomain_info
 end

data/lib/gettext/cgi.rb

@@ -6,37 +6,12 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: cgi.rb,v 1.6 2006/02/20 12:35:06 mutoh Exp $
+  $Id: cgi.rb,v 1.7 2007/10/29 15:32:39 mutoh Exp $
 =end
 
 require 'cgi'
 require 'gettext'
-require 'gettext/locale_cgi'
-
-module Locale
-  module_function
-  # Sets a CGI object.
-  # * cgi_: CGI object
-  # * Returns: self
-  def set_cgi(cgi_)
-    @@locale_system_module.set_cgi(cgi_)
-    self
-  end
-
-  # Sets a CGI object.
-  # * cgi_: CGI object
-  # * Returns: cgi_ 
-  def cgi=(cgi_)
-    set_cgi(cgi_)
-    cgi_
-  end
-
-  # Gets the CGI object. If it is nil, returns new CGI object.
-  # * Returns: the CGI object
-  def cgi
-    @@locale_system_module.cgi
-  end
-end
+require 'locale/cgi'
 
 module GetText
   module_function

data/lib/gettext/iconv.rb

@@ -1,85 +1,99 @@
 =begin
-  iconv.rb - Pseudo Iconv module
+  iconv.rb - Pseudo Iconv class. Supports Iconv.iconv, Iconv.conv.
 
-  If you don't have iconv but glib2, this library behaves
-  as Iconv.iconv.
+  For Matz Ruby:
+  If you don't have iconv but glib2, this library uses glib2 iconv functions.
 
-  Copyright (C) 2004  Masao Mutoh <mutoh@highway.ne.jp>
+  For JRuby:
+  Use Java String class to convert strings.
+
+  Copyright (C) 2004-2007  Masao Mutoh
 
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: iconv.rb,v 1.3 2006/06/11 15:36:20 mutoh Exp $
+  $Id: iconv.rb,v 1.6 2007/11/08 14:21:22 mutoh Exp $
 =end
 
 begin
   require 'iconv.so'
 rescue LoadError
-  begin
-    require 'glib2'
-    # Pseudo Iconv module
-    # 
-    # Provides Iconv.iconv which uses Ruby/GLib(1) functions. This library also required from 'gettext'.
-    # If you require 'gettext/iconv', Iconv.iconv try to call Ruby/GLib function 
-    # when it doesn't find original Iconv module(iconv.so).
-    #
-    # (1) Ruby/GLib is a module which is provided from Ruby-GNOME2 Project. 
-    # You can get binaries for Win32(One-Click Ruby Installer).
-    # <URL: http://ruby-gnome2.sourceforge.jp/>
-    module Iconv
-      module Failure; end
-      class InvalidEncoding < ArgumentError;  include Failure; end
-      class IllegalSequence < ArgumentError;  include Failure; end
-      class InvalidCharacter < ArgumentError; include Failure; end
+  # Pseudo Iconv class
+  # 
+  # Provides Iconv.iconv which uses Ruby/GLib(1) functions. This library also required from 'gettext'.
+  # If you require 'gettext/iconv', Iconv.iconv try to call Ruby/GLib function 
+  # when it doesn't find original Iconv class(iconv.so).
+  #
+  # (1) Ruby/GLib is a module which is provided from Ruby-GNOME2 Project. 
+  # You can get binaries for Win32(One-Click Ruby Installer).
+  # <URL: http://ruby-gnome2.sourceforge.jp/>
+  class Iconv
+    module Failure; end
+    class InvalidEncoding < ArgumentError;  include Failure; end
+    class IllegalSequence < ArgumentError;  include Failure; end
+    class InvalidCharacter < ArgumentError; include Failure; end
 
-      def check_glib_version?(major, minor, micro) # :nodoc:
-        (GLib::BINDING_VERSION[0] > major ||
-         (GLib::BINDING_VERSION[0] == major && 
-          GLib::BINDING_VERSION[1] > minor) ||
-         (GLib::BINDING_VERSION[0] == major && 
-          GLib::BINDING_VERSION[1] == minor &&
-          GLib::BINDING_VERSION[2] >= micro))
+    if RUBY_PLATFORM =~ /java/
+      def self.conv(to, from, str)
+        raise InvalidCharacter, "the 3rd argument is nil" unless str
+        begin
+          str = java.lang.String.new(str.unpack("C*").to_java(:byte), from)
+          str.getBytes(to).to_ary.pack("C*")
+        rescue java.io.UnsupportedEncodingException
+          raise InvalidEncoding
+        end
       end
-      module_function :check_glib_version?
-
-      if check_glib_version?(0, 11, 0)
-	# This is a function equivalent of Iconv.iconv.
-	# * to: encoding name for destination
-	# * from: encoding name for source
-	# * str: strings to be converted
-	# * Returns: Returns an Array of converted strings.
-        def iconv(to, from, str)
-          begin
-            GLib.convert(str, to, from).split(//)
-          rescue GLib::ConvertError => e
-            case e.code
-            when GLib::ConvertError::NO_CONVERSION
-              raise InvalidEncoding.new(str)
-            when GLib::ConvertError::ILLEGAL_SEQUENCE
+    else
+      begin
+        require 'glib2'
+      
+        def self.check_glib_version?(major, minor, micro) # :nodoc:
+          (GLib::BINDING_VERSION[0] > major ||
+           (GLib::BINDING_VERSION[0] == major && 
+            GLib::BINDING_VERSION[1] > minor) ||
+           (GLib::BINDING_VERSION[0] == major && 
+            GLib::BINDING_VERSION[1] == minor &&
+            GLib::BINDING_VERSION[2] >= micro))
+        end
+        
+        if check_glib_version?(0, 11, 0)
+          # This is a function equivalent of Iconv.iconv.
+          # * to: encoding name for destination
+          # * from: encoding name for source
+          # * str: strings to be converted
+          # * Returns: Returns an Array of converted strings.
+          def self.conv(to, from, str)
+            begin
+              GLib.convert(str, to, from)
+            rescue GLib::ConvertError => e
+              case e.code
+              when GLib::ConvertError::NO_CONVERSION
+                raise InvalidEncoding.new(str)
+              when GLib::ConvertError::ILLEGAL_SEQUENCE
+                raise IllegalSequence.new(str)
+              else
+                raise InvalidCharacter.new(str)
+              end
+            end
+          end
+        else
+          def self.conv(to, from, str) # :nodoc:
+            begin
+              GLib.convert(str, to, from)
+            rescue
               raise IllegalSequence.new(str)
-            else
-              raise InvalidCharacter.new(str)
             end
           end
         end
-      else
-       def iconv(to, from, str) # :nodoc:
-         begin
-           GLib.convert(str, to, from).split(//)
-         rescue
-           raise IllegalSequence.new(str)
-         end
-       end
+      rescue LoadError
+        def self.conv(to, from, str) # :nodoc:
+          warn "Iconv was not found." if $DEBUG
+          str
+        end
       end
-      module_function :iconv
     end
-  rescue LoadError
-    module Iconv
-      module_function
-      def iconv(to, from, str) # :nodoc:
-        warn "Iconv was not found." if $DEBUG
-        str.split(//)
-      end
+    def self.iconv(to, from, str)
+      conv(to, from, str).split(//)
     end
   end
 end