locale 2.0.0 → 2.0.1

data/ChangeLog

@@ -1,3 +1,13 @@
+= locale-2.0.1 (2009-04-18)
+ * Locale::Tag::Common#extensions are shown order by the keys.[reported by
+ Dan Coutu]
+ * Enhance to support ruby-1.9.x [by OZAWA Sakuro]
+ * Reimplement memoize to be able to freeze or dup the object.
+ * Improve Locale.candidates.
+
+ Thanks to:
+   Dan Coutu, OZAWA Sakuro
+
 = locale-2.0.0 (2009-03-21)
  * Support Rack.
  * move to github from svn.

data/Rakefile

@@ -29,7 +29,7 @@ Rake::RDocTask.new { |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title    = "Ruby-Locale library"
   rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README', 'ChangeLog')
+  rdoc.rdoc_files.include('README.rdoc', 'ChangeLog')
   rdoc.rdoc_files.include('lib/**/*.rb')
   rdoc.template = allison if allison.size > 0
 }

data/lib/locale.rb

@@ -184,18 +184,25 @@ module Locale
     opts = {:supported_language_tags => nil, :type => :common, 
       :default_language_tags => ["en"]}.merge(options)
 
-    cache_key = opts.hash
     if Thread.current[:candidates_caches]
-      cache = Thread.current[:candidates_caches][cache_key]
+      cache = Thread.current[:candidates_caches][opts.hash]
       return cache if cache
     else
       Thread.current[:candidates_caches] = {} 
     end
+    Thread.current[:candidates_caches][opts.hash] =
+      collect_candidates(opts[:type], current, 
+                         opts[:default_language_tags], 
+                         opts[:supported_language_tags])
+  end
 
-    default_language_tags = opts[:default_language_tags].collect{|v| 
-      Locale::Tag.parse(v).send("to_#{opts[:type]}")}.flatten.uniq
+  # collect tag candidates and memoize it. 
+  # The result is shared from all threads.
+  def collect_candidates(type, tags, default_tags, supported_tags) # :nodoc:
+    default_language_tags = default_tags.collect{|v| 
+      Locale::Tag.parse(v).send("to_#{type}")}.flatten.uniq
 
-    candidate_tags = current.collect{|v| v.send("to_#{opts[:type]}").candidates}
+    candidate_tags = tags.collect{|v| v.send("to_#{type}").candidates}
 
     tags = []
     (0...candidate_tags[0].size).each {|i|
@@ -204,16 +211,14 @@ module Locale
     tags += default_language_tags
     tags.uniq!
 
-    if opts[:supported_language_tags]
-      tags &= opts[:supported_language_tags].collect{|v| 
-        Locale::Tag.parse(v).send("to_#{opts[:type]}")}.flatten
-      tags += default_language_tags if tags.size == 0
+    if supported_tags
+      tags &= supported_tags.collect{|v| 
+        Locale::Tag.parse(v).send("to_#{type}")}.flatten
+      tags = default_language_tags if tags.size == 0
     end
-    tags = Locale::TagList.new(tags)
-    Thread.current[:candidates_caches][cache_key] = tags
-    tags
+    Locale::TagList.new(tags)
   end
-
+  memoize :collect_candidates
 
   # Gets the current charset.
   #
@@ -226,7 +231,7 @@ module Locale
   end
   memoize :charset
 
-  # Clear current locale and current charset. 
+  # Clear current locale.
   # * Returns: self
   def clear
     Thread.current[:current_languages] = nil

data/lib/locale/info/language.rb

@@ -88,6 +88,7 @@ module Locale
 
     Zlib::GzipReader.open(File.dirname(__FILE__) + "/../data/languages.tab.gz") do |gz|
       gz.readlines.each do |l|
+        l.force_encoding('UTF-8') if l.respond_to?(:force_encoding)
         unless l =~ /^\s*$/
           parts = l.split(/\t/)
           lang = Language.new(parts[2], parts[0], parts[3], parts[4], parts[5].strip)

data/lib/locale/info/region.rb

@@ -39,6 +39,7 @@ module Locale
     @@regions = Hash.new
     Zlib::GzipReader.open(File.dirname(__FILE__) + "/../data/regions.tab.gz") do |gz|
       gz.readlines.each do |l|
+        l.force_encoding('UTF-8') if l.respond_to?(:force_encoding)
         unless l =~ /^\s*$/
           parts = l.split(/\t/)
           region = Region.new(parts[0], parts[1].strip)

data/lib/locale/tag.rb

@@ -1,10 +1,10 @@
 =begin
+  tag.rb - Locale::Tag module
 
- tag.rb - Locale::Tag module
-
- Copyright (C) 2008  Masao Mutoh
+  Copyright (C) 2008,2009  Masao Mutoh
  
- $Id: tag.rb 27 2008-12-03 15:06:50Z mutoh $
+  You may redistribute it and/or modify it under the same
+  license terms as Ruby.
 =end
 
 require 'locale/tag/simple'
@@ -13,11 +13,13 @@ require 'locale/tag/common'
 require 'locale/tag/rfc'
 require 'locale/tag/cldr'
 require 'locale/tag/posix'
+require 'locale/util/memoizable'
 
 module Locale
 
   # Language tag / locale identifiers.
   module Tag
+    include Util::Memoizable
     module_function
     # Parse a language tag/locale name and return Locale::Tag
     # object.
@@ -31,6 +33,7 @@ module Locale
       end
       Locale::Tag::Illegular.new(tag)
     end
+    memoize :parse
   end
 end
 

data/lib/locale/tag/cldr.rb

@@ -1,14 +1,14 @@
 =begin
   locale/tag/cldr.rb - Locale::Tag::CLDR
 
-  Copyright (C) 2008  Masao Mutoh
+  Copyright (C) 2008,2009  Masao Mutoh
 
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
-
-  $Id: cldr.rb 27 2008-12-03 15:06:50Z mutoh $
 =end
 
+require 'locale/tag/common'
+
 module Locale #:nodoc:
   module Tag #:nodoc:
 
@@ -24,7 +24,34 @@ module Locale #:nodoc:
                   (?:@(#{EXTENSION};?)+)*)\Z/ix
 
       attr_reader :extensions
- 
+
+      class << self
+        include Util::Memoizable
+        # Parse the language tag and return the new Locale::Tag::CLDR. 
+        def parse(tag)
+          if tag =~ /\APOSIX\Z/  # This is the special case of POSIX locale but match this regexp.
+            nil
+          elsif tag =~ TAG_RE
+            lang, script, region, subtag = $1, $2, $3, $4
+            
+            extensions = {}
+            subtag.scan(/#{EXTENSION}/i).each{|v| 
+              subtag.sub!(v, "")
+              key, type = v.split("=")
+              extensions[key] = type
+            }
+            variants = subtag.scan(/#{VARIANT}/i).collect{|v| v[0].upcase}
+            
+            ret = self.new(lang, script, region, variants, extensions)
+            ret.tag = tag
+            ret
+          else
+            nil
+          end
+        end
+        memoize_dup :parse
+      end
+
       # Create Locale::Tag::Cldr.
       #
       # variants should be upcase.
@@ -34,39 +61,6 @@ module Locale #:nodoc:
         super(language, script, region, variants.map{|v| v.upcase})
       end
 
-      # Parse the language tag and return the new Locale::Tag::CLDR. 
-      def self.parse(tag)
-        if tag =~ /\APOSIX\Z/  # This is the special case of POSIX locale but match this regexp.
-          nil
-        elsif tag =~ TAG_RE
-          lang, script, region, subtag = $1, $2, $3, $4
-
-          extensions = {}
-          subtag.scan(/#{EXTENSION}/i).each{|v| 
-            subtag.sub!(v, "")
-            key, type = v.split("=")
-            extensions[key] = type
-          }
-          variants = subtag.scan(/#{VARIANT}/i).collect{|v| v[0].upcase}
-
-          ret = self.new(lang, script, region, variants, extensions)
-          ret.tag = tag
-          ret
-        else
-          nil
-        end
-      end
-
-      # Returns the language tag. 
-      # (e.g.) "ja_Hira_JP_VARIANT1_VARIANT2@foo1=var1;foo2=var2"
-      def to_s
-        s = super
-        if @extensions.size > 0
-          s << "@" << @extensions.to_a.sort.map{|k, v| "#{k}=#{v}"}.join(";")
-        end
-        s
-      end
-
       # Sets the extensions.
       def extensions=(val)
         clear
@@ -74,12 +68,12 @@ module Locale #:nodoc:
       end
 
       private
-      def convert_to(klass)
+      def convert_to(klass) # :nodoc:
         if klass == Cldr
           klass.new(language, script, region, variants, extensions)
         elsif klass == Rfc
           exts = []
-          @extensions.each do |k, v|
+          @extensions.to_a.sort.each do |k, v|
             exts << "k-#{k[0,8]}-#{v[0,8]}"
           end
 
@@ -88,6 +82,18 @@ module Locale #:nodoc:
           super
         end
       end
+
+      # Returns the language tag. 
+      # (e.g.) "ja_Hira_JP_VARIANT1_VARIANT2@foo1=var1;foo2=var2"
+      #
+      # This is used in internal only. Use to_s instead.
+      def to_string
+        s = super
+        if @extensions.size > 0
+          s << "@" << @extensions.to_a.sort.map{|k, v| "#{k}=#{v}"}.join(";")
+        end
+        s 
+      end
     end
   end
 end

data/lib/locale/tag/common.rb

@@ -1,14 +1,14 @@
 =begin
   locale/tag/common.rb - Locale::Tag::Common
 
-  Copyright (C) 2008  Masao Mutoh
+  Copyright (C) 2008,2009  Masao Mutoh
 
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
-
-  $Id: common.rb 27 2008-12-03 15:06:50Z mutoh $
 =end
 
+require 'locale/tag/simple'
+
 module Locale
   module Tag
     # Common Language tag class for Ruby.
@@ -32,34 +32,38 @@ module Locale
 
       attr_reader :script, :variants
 
+      class << self
+        include Util::Memoizable
+        # Parse the language tag and return the new Locale::Tag::Common. 
+        def parse(tag)
+          if tag =~ /\APOSIX\Z/  # This is the special case of POSIX locale but match this regexp.
+            nil
+          elsif tag =~ TAG_RE
+            lang, script, region, subtag = $1, $2, $3, $4
+            variants = subtag.scan(/(^|[-_])#{VARIANT}(?=([-_]|$))/i).collect{|v| v[1]}
+            
+            ret = self.new(lang, script, region, variants)
+            ret.tag = tag
+            ret
+          else
+            nil
+          end
+        end
+        memoize_dup :parse
+      end
+
       # Create a Locale::Tag::Common.
       def initialize(language, script = nil, region = nil, variants = [])
         @script, @variants = script, variants
-        @script.capitalize!  if @script
+        @script = @script.capitalize  if @script
         super(language, region)
       end
-
-      # Parse the language tag and return the new Locale::Tag::Common. 
-      def self.parse(tag)
-        if tag =~ /\APOSIX\Z/  # This is the special case of POSIX locale but match this regexp.
-          nil
-        elsif tag =~ TAG_RE
-          lang, script, region, subtag = $1, $2, $3, $4
-          variants = subtag.scan(/(^|[-_])#{VARIANT}(?=([-_]|$))/i).collect{|v| v[1]}
-
-          ret = self.new(lang, script, region, variants)
-          ret.tag = tag
-          ret
-        else
-          nil
-        end
-      end
-
+      
       # Set the script (with capitalize)
       def script=(val)
         clear
         @script = val
-        @script.capitalize! if @script
+        @script = @script.capitalize if @script
         @script
       end
 
@@ -69,21 +73,6 @@ module Locale
         @variants = val
       end
 
-      # Returns the common language tag with "_".
-      #   <language>_<Script>_<REGION>_VARIANTS1_VARIANTS2
-      #   (e.g.) "ja_Hira_JP_VARIANTS1_VARIANTS2"
-      def to_s
-        s = @language.dup
-    
-        s << "_" << @script if @script
-        s << "_" << @region if @region
-
-        @variants.each do |v|
-          s << "_#{v}"
-        end
-        s
-      end
-
       # Returns an Array of tag-candidates order by priority.
       # Use Locale.candidates instead of this method.
       #
@@ -99,9 +88,10 @@ module Locale
          self.class.new(language, nil, nil, variants),         #ja-FOO
          self.class.new(language)]                             #ja
       end
+      memoize_dup :candidates
 
       private
-      def convert_to(klass)
+      def convert_to(klass)  #:nodoc:
         if klass == Simple
           super
         elsif klass == Posix
@@ -117,6 +107,23 @@ module Locale
           klass.new(language, script, region, variants)
         end
       end
+
+      # Returns the common language tag with "_". 
+      #   <language>_<Script>_<REGION>_VARIANTS1_VARIANTS2
+      #   (e.g.) "ja_Hira_JP_VARIANTS1_VARIANTS2"
+      #
+      # This is used in internal only. Use to_s instead.
+      def to_string
+        s = @language.dup
+    
+        s << "_" << @script if @script
+        s << "_" << @region if @region
+
+        @variants.each do |v|
+          s << "_#{v}"
+        end
+        s
+      end
     end
   end
 end

data/lib/locale/tag/illegular.rb

@@ -27,12 +27,14 @@ module Locale
       def candidates
         [Illegular.new(tag)]
       end
+      memoize :candidates
 
       # Conver to the klass(the class of Language::Tag)
       private
       def convert_to(klass)
         klass.new(tag)
       end
+      memoize :convert_to
     end
   end
 end

data/lib/locale/tag/rfc.rb

@@ -1,14 +1,14 @@
 =begin
   locale/tag/rfc.rb - Locale::Tag::Rfc
 
-  Copyright (C) 2008  Masao Mutoh
+  Copyright (C) 2008,2009  Masao Mutoh
 
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
-
-  $Id: rfc.rb 27 2008-12-03 15:06:50Z mutoh $
 =end
 
+require 'locale/tag/common'
+
 module Locale #:nodoc:
   module Tag #:nodoc:
 
@@ -26,50 +26,42 @@ module Locale #:nodoc:
 
       attr_reader :extensions, :privateuse
 
-      def initialize(language, script = nil, region = nil, variants = [],
-                     extensions = [], privateuse = nil)
-        @extensions, @privateuse = extensions, privateuse
-        super(language, script, region, variants)
-      end
-
-      # Parse the language tag and return the new Locale::Tag::Common. 
-      def self.parse(tag)
-        if tag =~ /\APOSIX\Z/  # This is the special case of POSIX locale but match this regexp.
-          nil
-        elsif tag =~ TAG_RE
-          lang, script, region, subtag = $1, $2, $3, $4
-          extensions = []
-          variants = []
-          if subtag =~ /#{PRIVATEUSE}/
-            subtag, privateuse = $`, $1
-            # Private use for CLDR.
-            if /x-ldml(.*)/ =~ privateuse
-              p_subtag = $1 
-              extensions = p_subtag.scan(/(^|-)#{EXTENSION}/i).collect{|v| p_subtag.sub!(v[1], ""); v[1]}
-              variants = p_subtag.scan(/(^|-)#{VARIANT}(?=(-|$))/i).collect{|v| v[1]}
+      class << self
+        include Util::Memoizable
+        # Parse the language tag and return the new Locale::Tag::Rfc. 
+        def parse(tag)
+          if tag =~ /\APOSIX\Z/  # This is the special case of POSIX locale but match this regexp.
+            nil
+          elsif tag =~ TAG_RE
+            lang, script, region, subtag = $1, $2, $3, $4
+            extensions = []
+            variants = []
+            if subtag =~ /#{PRIVATEUSE}/
+                subtag, privateuse = $`, $1
+              # Private use for CLDR.
+              if /x-ldml(.*)/ =~ privateuse
+                p_subtag = $1 
+                extensions = p_subtag.scan(/(^|-)#{EXTENSION}/i).collect{|v| p_subtag.sub!(v[1], ""); v[1]}
+                variants = p_subtag.scan(/(^|-)#{VARIANT}(?=(-|$))/i).collect{|v| v[1]}
+              end
             end
+            extensions += subtag.scan(/(^|-)#{EXTENSION}/i).collect{|v| subtag.sub!(v[1], ""); v[1]}
+            variants += subtag.scan(/(^|-)#{VARIANT}(?=(-|$))/i).collect{|v| v[1]}
+            
+            ret = self.new(lang, script, region, variants, extensions, privateuse)
+            ret.tag = tag
+            ret
+          else
+            nil
           end
-          extensions += subtag.scan(/(^|-)#{EXTENSION}/i).collect{|v| subtag.sub!(v[1], ""); v[1]}
-          variants += subtag.scan(/(^|-)#{VARIANT}(?=(-|$))/i).collect{|v| v[1]}
-          
-          ret = self.new(lang, script, region, variants, extensions, privateuse)
-          ret.tag = tag
-          ret
-        else
-          nil
         end
+        memoize_dup :parse
       end
 
-      # Returns the language tag 
-      #   <language>-<Script>-<REGION>-<variants>-<extensions>-<PRIVATEUSE>
-      #   (e.g.) "ja-Hira-JP-variant"
-      def to_s
-        s = super.to_s.gsub(/_/, "-")
-        @extensions.each do |v|
-          s << "-#{v}"
-        end
-        s << "-#{@privateuse}" if @privateuse
-        s
+      def initialize(language, script = nil, region = nil, variants = [],
+                   extensions = [], privateuse = nil)
+        @extensions, @privateuse = extensions, privateuse
+        super(language, script, region, variants)
       end
 
       # Sets the extensions.
@@ -90,7 +82,7 @@ module Locale #:nodoc:
           klass.new(language, script, region, variants, extensions, privateuse)
         elsif klass == Cldr
           exts = {}
-          extensions.each do |v|
+          extensions.sort.each do |v|
             if v =~ /^k-(#{ALPHANUM}{2,})-(.*)$/i
               exts[$1] = $2
             end
@@ -100,7 +92,21 @@ module Locale #:nodoc:
           super
         end
       end
-      
+
+      # Returns the language tag 
+      #   <language>-<Script>-<REGION>-<variants>-<extensions>-<PRIVATEUSE>
+      #   (e.g.) "ja-Hira-JP-variant"
+      #
+      # This is used in internal only. Use to_s instead.
+      def to_string
+        s = super.gsub(/_/, "-")
+        @extensions.sort.each do |v|
+          s << "-#{v}"
+        end
+        s << "-#{@privateuse}" if @privateuse
+        s
+      end
+
     end
   end
 end

data/lib/locale/tag/simple.rb

@@ -1,12 +1,10 @@
 =begin
   locale/tag/simple.rb - Locale::Tag::Simple
 
-  Copyright (C) 2008  Masao Mutoh
+  Copyright (C) 2008,2009  Masao Mutoh
 
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
-
-  $Id: simple.rb 27 2008-12-03 15:06:50Z mutoh $
 =end
 
 require 'locale/util/memoizable'
@@ -22,6 +20,8 @@ module Locale
     # * ja-JP
     # * ja-392
     class Simple
+      include Util::Memoizable
+
       ALPHA = '[a-z]'
       DIGIT = '[0-9]'
       ALPHANUM = "[a-zA-Z0-9]"
@@ -40,17 +40,6 @@ module Locale
       # String.
       attr_accessor :tag
 
-      # Parse the language tag and return the new Locale::Tag::Simple. 
-      def self.parse(tag)
-        if tag =~ TAG_RE
-          ret = self.new($1, $2)
-          ret.tag = tag
-          ret
-        else
-          nil
-        end
-      end
-
       # call-seq:
       # to_common
       # to_posix
@@ -63,26 +52,40 @@ module Locale
           def to_#{name}
             convert_to(#{name.to_s.capitalize})
           end
-          memoize :to_#{name}
+          memoize_dup :to_#{name}
         EOS
       end
         
+      class << self
+        include Util::Memoizable
+        # Parse the language tag and return the new Locale::Tag::Simple. 
+        def parse(tag)
+          if tag =~ TAG_RE
+            ret = self.new($1, $2)
+            ret.tag = tag
+            ret
+          else
+            nil
+          end
+        end
+        memoize_dup :parse
+      end
+
       # Create a Locale::Tag::Simple
       def initialize(language, region = nil)
         raise "language can't be nil." unless language
         @language, @region = language, region
-        @language.downcase! if @language
-        @region.upcase! if @region
+        @language = @language.downcase if @language
+        @region = @region.upcase if @region
       end
 
       # Returns the language tag as the String. 
       #   <language>_<REGION>
       #   (e.g.) "ja_JP"
       def to_s
-        s = @language.dup
-        s << "_" << @region if @region
-        s
+        to_string
       end
+      memoize :to_s
 
       def to_str  #:nodoc:
         to_s
@@ -95,14 +98,17 @@ module Locale
       def eql?(other) #:nodoc:
         self.==(other)
       end
+      memoize :eql?
       
       def hash #:nodoc:
         "#{self.class}:#{to_s}".hash
       end
+      memoize :hash
 
       def inspect  #:nodoc:
         %Q[#<#{self.class}: #{to_s}>]
       end
+      memoize :inspect
 
       # For backward compatibility.
       def country; region end
@@ -111,7 +117,7 @@ module Locale
       def language=(val)
         clear
         @language = val
-        @language.downcase! if @language
+        @language = @language.downcase if @language
         @language
       end
 
@@ -119,7 +125,7 @@ module Locale
       def region=(val)
         clear
         @region = val
-        @region.upcase! if @region
+        @region = @region.upcase if @region
         @region
       end
 
@@ -128,18 +134,25 @@ module Locale
       def candidates
         [self.class.new(language, region), self.class.new(language)]
       end
+      memoize_dup :candidates
 
-      memoize :to_s, :to_str, :hash, :inspect, :candidates
-
-      # Conver to the klass(the class of Language::Tag)
+      # Convert to the klass(the class of Language::Tag)
       private
-      def convert_to(klass)
+      def convert_to(klass)  #:nodoc:
         if klass == Simple || klass == Posix
           klass.new(language, region)
         else
           klass.new(language, nil, region)
         end
       end
+
+      # Return simple language tag which format is"<lanuguage>_<REGION>". 
+      # This is to use internal only. Use to_s instead.
+      def to_string  
+        s = @language.dup
+        s << "_" << @region if @region
+        s      
+      end
     end
   end
 end

data/lib/locale/taglist.rb

@@ -9,6 +9,8 @@
   $Id: taglist.rb 27 2008-12-03 15:06:50Z mutoh $
 =end
 
+require 'locale/util/memoizable'
+
 module Locale
   # This provides the subclass of Array which behaves like 
   # the first(top priority) Locale::Tag object. 
@@ -24,6 +26,8 @@ module Locale
   # of this function.
   #
   class TagList < Array 
+    include Util::Memoizable
+
     # Returns the top priority language. (simple)
     def language
       self[0].language
@@ -48,18 +52,31 @@ module Locale
         ::Locale.driver_module.charset
       end
     end
+    memoize :charset
+
     # Returns the top priority modifier. (posix)
     def modifier
       (self[0].respond_to? :modifier) ? self[0].modifier : nil
     end
+    memoize :modifier
+
+    # Returns the top priority variants.(common, rfc, cldr)
+    def variants
+      (self[0].respond_to? :variants) ? self[0].variants : nil
+    end
+    memoize :variants
+
     # Returns the top priority extensions.(common, rfc, cldr)
     def extensions
       (self[0].respond_to? :extensions) ? self[0].extensions : nil
     end
+    memoize :extensions
+
     # Returns the top priority privateuse(rfc)
     def privateuse
       (self[0].respond_to? :privateuse) ? self[0].privateuse : nil
     end
+    memoize :privateuse
 
     def to_str
       self[0].to_str
@@ -88,6 +105,5 @@ module Locale
     def to_posix
       self[0].to_posix
     end
-
   end
 end

data/lib/locale/util/memoizable.rb

@@ -1,4 +1,5 @@
 # Refer from activesupport-2.2.0.
+#
 # * Remove the dependecies to activesupport.
 # * change the key to hash value of args.
 # * Not Thread safe
@@ -43,33 +44,59 @@ module Locale
       # 
       # To clear cache, #clear_foo, #clear_bar is also defined.
       #
-      # (NOTE) Consider to use this with huge objects to avoid memory leaks.
+      # (NOTE) 
+      # * Consider to use this with huge objects to avoid memory leaks.
+      # * Can't use this with super.<method> because of infinity loop.
       def memoize(*symbols)
+        memoize_impl(false, *symbols)
+      end
+
+      # memoize with dup. A copy object is returned.
+      def memoize_dup(*symbols)
+        memoize_impl(true, *symbols)
+      end
+
+      def memoize_impl(is_dup, *symbols) #:nodoc:
         symbols.each do |symbol|
           original_method = "_unmemoized_#{symbol}"
           memoized_ivar = MEMOIZED_IVAR.call(symbol)
-          class_eval <<-EOS, __FILE__, __LINE__
-          raise "Already memoized #{symbol}" if method_defined?(:#{original_method})
-          alias #{original_method} #{symbol}
+          dup_meth = is_dup ? "_dup" : ""
 
-          def #{symbol}(*args)
-            @_memoized_ivars ||= {}
-            @_memoized_ivars[:#{memoized_ivar}] ||= {}
+          class_eval <<-EOS, __FILE__, __LINE__
+            alias #{original_method} #{symbol}
+            def #{symbol}(*args)
+              _memoize#{dup_meth}(:#{memoized_ivar}, args.hash) do
+                #{original_method}(*args)
+              end
+            end
+          EOS
+        end
+      end
 
-            key = args.hash
+      def _memoize(ivar, key) #:nodoc:
+        @_memoized_ivars ||= {}
+        @_memoized_ivars[ivar] ||= {}
 
-            ret = @_memoized_ivars[:#{memoized_ivar}][key]
+        ret = @_memoized_ivars[ivar][key]
+        unless ret
+          ret = yield
+          ret.freeze
+          @_memoized_ivars[ivar][key] = ret 
+        end
+        ret
+      end
 
-            if ret
-              ret
-            else
-              @_memoized_ivars[:#{memoized_ivar}][key] = #{original_method}(*args).freeze
-            end
+      def _memoize_dup(ivar, key) #:nodoc:
+        ret = _memoize(ivar, key) do; yield; end
+        if ret
+          if ret.kind_of? Array
+            ret.map{|v| v.dup}.dup
+          else
+            ret.dup
           end
-          
-          EOS
+        else
+          nil
         end
-      
       end
     end
   end

data/lib/locale/version.rb

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

data/test/test_memoizable.rb

@@ -0,0 +1,133 @@
+require 'locale/util/memoizable'
+require 'test/unit'
+
+class A
+  include Locale::Util::Memoizable
+  def initialize
+    @count = 0
+    @a = ""
+  end
+  def test1(a)
+    @a += String(a)
+    @count += 1
+  end
+  memoize :test1
+  attr_reader :a
+end
+
+class B < A
+end
+
+class C < A
+  def test1(a)
+    @a = String(a) + @a
+    @count += 1
+  end
+  memoize :test1
+end
+
+class D
+  class << self
+    include Locale::Util::Memoizable
+    def init
+      @@count = 0
+      @@a = "a"
+    end
+    def test1(a)
+      @@a = @@a + "b" * a 
+      @@count += 1
+    end
+    memoize :test1
+    def a
+      @@a
+    end
+  end
+end
+
+class E
+  include Locale::Util::Memoizable
+  def test2
+    "aa"
+  end
+  memoize :test2
+
+  def test2_dup
+    "bb"
+  end
+  memoize_dup :test2_dup
+end
+
+class TestMemoizable < Test::Unit::TestCase
+  def test_simple
+    t = A.new
+    assert_equal 1, t.test1(1)
+    assert_equal "1", t.a
+    assert_equal 1, t.test1(1)
+    assert_equal "1", t.a
+    assert_equal 2, t.test1(2)
+    assert_equal "12", t.a
+    assert_equal 2, t.test1(2)
+    assert_equal "12", t.a
+    assert_equal 1, t.test1(1)
+    assert_equal "12", t.a
+  end
+
+  def test_simple_inherited
+    t = B.new
+    assert_equal 1, t.test1(1)
+    assert_equal "1", t.a
+    assert_equal 1, t.test1(1)
+    assert_equal "1", t.a
+    assert_equal 2, t.test1(2)
+    assert_equal "12", t.a
+    assert_equal 2, t.test1(2)
+    assert_equal "12", t.a
+    assert_equal 1, t.test1(1)
+    assert_equal "12", t.a
+  end
+
+  def test_override
+    t = C.new
+    assert_equal 1, t.test1(1)
+    assert_equal "1", t.a
+    assert_equal 1, t.test1(1)
+    assert_equal "1", t.a
+    assert_equal 2, t.test1(2)
+    assert_equal "21", t.a
+    assert_equal 2, t.test1(2)
+    assert_equal "21", t.a
+    assert_equal 1, t.test1(1)
+    assert_equal "21", t.a
+  end
+
+  def test_class_method
+     D.init
+     assert_equal 1, D.test1(1)
+     assert_equal "ab", D.a
+     assert_equal 1, D.test1(1)
+     assert_equal "ab", D.a
+     assert_equal 2, D.test1(2)
+     assert_equal "abbb", D.a
+     assert_equal 2, D.test1(2)
+     assert_equal "abbb", D.a
+     assert_equal 1, D.test1(1)
+     assert_equal "abbb", D.a
+  end
+
+  def test_freeze_or_dup
+    t = E.new
+    assert_equal "aa", t.test2
+    # When modification attempted on frozen objects,
+    # ruby 1.9 raises RuntimeError instead of TypeError.
+    # http://redmine.ruby-lang.org/issues/show/409
+    # http://redmine.ruby-lang.org/repositories/diff/ruby-19/error.c?rev=7294
+    if RUBY_VERSION < '1.9.0'
+      assert_raise(TypeError){ t.test2 << "a" }
+    else
+      assert_raise(RuntimeError){ t.test2 << "a" }
+    end
+    assert_equal "bb", t.test2_dup
+    assert_equal "bbb", t.test2_dup << "b"
+    assert_equal "bb", t.test2_dup
+  end
+end

data/test/test_tag.rb

@@ -815,11 +815,7 @@ class TagTest < Test::Unit::TestCase
 
     assert_equal Locale::Tag::Simple.parse("de_DE"), lang.to_simple
     assert_equal Locale::Tag::Common.parse("de_DE"), lang.to_common
-    if RUBY_VERSION < "1.9.0" and RUBY_PLATFORM != "java"
-      assert_equal Locale::Tag::Rfc.parse("de-DE-k-currency-DDM-k-collatio-phoneboo"), lang.to_rfc
-    else
-      assert_equal Locale::Tag::Rfc.parse("de-DE-k-collatio-phoneboo-k-currency-DDM"), lang.to_rfc
-    end
+    assert_equal Locale::Tag::Rfc.parse("de-DE-k-collatio-phoneboo-k-currency-DDM"), lang.to_rfc
     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
 
@@ -844,11 +840,7 @@ class TagTest < Test::Unit::TestCase
 
     assert_equal Locale::Tag::Simple.parse("en_US"), lang.to_simple
     assert_equal Locale::Tag::Common.parse("en_US_POSIX"), lang.to_common
-    if RUBY_VERSION < "1.9.0" and RUBY_PLATFORM != "java"
-      assert_equal Locale::Tag::Rfc.parse("en-US-POSIX-k-colStren-secondar-k-collatio-traditio-k-calendar-islamic"), lang.to_rfc
-    else
-      assert_equal Locale::Tag::Rfc.parse("en-US-POSIX-k-calendar-islamic-k-collatio-traditio-k-colStren-secondar"), lang.to_rfc
-    end
+    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
 
@@ -873,11 +865,7 @@ class TagTest < Test::Unit::TestCase
 
     assert_equal Locale::Tag::Simple.parse("en_US"), lang.to_simple
     assert_equal Locale::Tag::Common.parse("en_US"), lang.to_common
-    if RUBY_VERSION < "1.9.0" and RUBY_PLATFORM != "java"
-      assert_equal Locale::Tag::Rfc.parse("en-US-k-colStren-secondar-k-collatio-traditio-k-calendar-islamic"), lang.to_rfc
-    else
-      assert_equal Locale::Tag::Rfc.parse("en-US-k-calendar-islamic-k-collatio-traditio-k-colStren-secondar"), lang.to_rfc
-    end
+    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
 

data/test/test_taglist.rb

@@ -0,0 +1,34 @@
+# encoding: UTF-8
+
+require 'locale/tag'
+require 'locale/taglist'
+require 'test/unit'
+
+class TestTagList < Test::Unit::TestCase
+  def test_taglist_posix
+    list = Locale::TagList.new([Locale::Tag.parse("ja_JP.eucJP@mobile"), 
+				Locale::Tag.parse("en_US.iso8859-1")])
+
+    assert_equal "ja", list.language
+    assert_equal "JP", list.region
+    assert_equal "eucJP", list.charset
+    assert_equal "mobile", list.modifier
+    assert_equal "ja_JP.eucJP@mobile", list.to_s
+    assert_equal Locale::Tag::Common.parse("ja_JP_mobile"), list.to_common
+    assert_equal Locale::Tag::Rfc.parse("ja-JP-mobile"), list.to_rfc
+    assert_equal Locale::Tag::Cldr.parse("ja_JP_mobile"), list.to_cldr
+    assert_equal Locale::Tag::Posix.parse("ja_JP.eucJP@mobile"), list.to_posix
+    assert_equal Locale::Tag::Posix.parse("en_US.iso8859-1"), list[1]
+  end
+
+  def test_taglist_rfc
+    list = Locale::TagList.new([Locale::Tag.parse("ja-Hira-JP-MOBILE-y-aaa-x-bbb"), 
+				Locale::Tag.parse("en-US-mobile")])
+    assert_equal "ja", list.language
+    assert_equal "Hira", list.script
+    assert_equal "JP", list.region
+    assert_equal ["MOBILE"], list.variants
+    assert_equal ["y-aaa"], list.extensions
+    assert_equal "x-bbb", list.privateuse
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: locale
 version: !ruby/object:Gem::Version 
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors: 
 - Masao Mutoh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-21 00:00:00 +09:00
+date: 2009-04-19 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -22,7 +22,6 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- replace.rb
 - ChangeLog
 - samples
 - samples/sample_info.rb
@@ -68,7 +67,9 @@ files:
 - test
 - test/test_detect_general.rb
 - test/test_info.rb
+- test/test_memoizable.rb
 - test/test_thread.rb
+- test/test_taglist.rb
 - test/test_tag.rb
 - test/test_detect_cgi.rb
 - Rakefile

data/replace.rb

@@ -1,21 +0,0 @@
-Dir.glob("**/*") do |v|
-  lines = []
-  changed = false
-  next if File.directory? v
-  IO.foreach(v) {|line|
-    if line =~ /mutoh(at|@)highway.ne.jp/
-      lines << line.gsub(/mutoh( at |@)highway.ne.jp/, "mutomasa at gmail.com")
-      changed = true
-    else
-      lines << line
-    end
-  }
-  if changed
-    out = open(v, "w")
-    lines.each {|l|
-      out.write l
-    }
-    out.close
-  end
-end
-