locale 2.0.9 → 2.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c70c3a79e17ab4cc5af32c055728d0a2d5af6a7a
+  data.tar.gz: d8ca3c3e5f44decdbc49f76d4c48e3157bcd1f1a
+SHA512:
+  metadata.gz: b17b7898fcd4f80c350ae9441eba2b48dcfbb2f0d44bb319eeb27146394370e66d8b2dba4a616838301a6c6ca0d8313ffe7ec1c798b4e4d45c28df2b8138f31c
+  data.tar.gz: 634726bcd248a4babdc6748d030ee6c0a18af5564c79c2447ce185f549b8d38697edf1e45200033cc417a8114344b4f6dfc5277a4d58cfbeaf34f74e912e1dee

data/README.rdoc

@@ -67,9 +67,6 @@ LGPL(Lesser General Public License: http://www.gnu.org/licenses/lgpl-3.0.txt).
 * langtag-0.1.0 
   * by Martin Dürst <http://rubyforge.org/projects/langtag/>
 
-* memoizable.rb
-  * from ActiveSupport-2.2.0 <http://rubyforge.org/projects/activesupport/>
-
 * gettext gem
   * by The ruby-gettext project <https://ruby-gettext.github.com/>
 

data/doc/text/news.md

@@ -1,5 +1,18 @@
 # News
 
+## <a id="2-1-0">2.1.0</a>: 2013-12-15
+
+### Fixes
+
+  * Fixed a bug that memoization key hash collision on armv7hl.
+    Memoization feature is removed for this fix. If you get
+    performance issue. Please report it. We will solve the issue.
+    [GitHub#3] [Reported by mtasaka]
+
+### Thanks
+
+  * mtasaka
+
 ## <a id="2-0-9">2.0.9</a>: 2013-09-20
 
 Locale handling fix release.

data/lib/locale.rb

@@ -12,7 +12,6 @@
   $Id: locale.rb 27 2008-12-03 15:06:50Z mutoh $
 =end
 
-require 'locale/util/memoizable'
 require 'locale/tag'
 require 'locale/taglist'
 require 'locale/driver'
@@ -25,8 +24,6 @@ module Locale
   @@default_tag = nil
   @@driver_name = nil
 
-  include Locale::Util::Memoizable
-
   module_function
   def require_driver(name)  #:nodoc:
     require "locale/driver/#{name}"
@@ -213,21 +210,19 @@ module Locale
   #     The type of language tag. :common, :rfc, :cldr, :posix and 
   #     :simple are available. Default value is :common
   def candidates(options = {})
-    opts = {:supported_language_tags => nil, :current => current,
-      :type => :common}.merge(options)
-
-    if Thread.current[:candidates_caches]
-      cache = Thread.current[:candidates_caches][opts.hash]
-      return cache if cache
-    else
-      Thread.current[:candidates_caches] = {} 
-    end
-    Thread.current[:candidates_caches][opts.hash] =
+    opts = {
+      :supported_language_tags => nil,
+      :current                 => current,
+      :type                    => :common,
+    }.merge(options)
+
+    Thread.current[:candidates_caches] ||= {}
+    Thread.current[:candidates_caches][opts] ||=
       collect_candidates(opts[:type], opts[:current],
                          opts[:supported_language_tags])
   end
 
-  # collect tag candidates and memoize it. 
+  # collect tag candidates.
   # The result is shared from all threads.
   def collect_candidates(type, tags, supported_tags) # :nodoc:
     candidate_tags = tags.collect{|v| v.send("to_#{type}").candidates}
@@ -265,7 +260,6 @@ module Locale
 
     Locale::TagList.new(tags)
   end
-  memoize :collect_candidates
 
   # Gets the current charset.
   #
@@ -276,7 +270,6 @@ module Locale
   def charset
     driver_module.charset || "UTF-8"
   end
-  memoize :charset
 
   # Clear current locale.
   # * Returns: self
@@ -295,7 +288,6 @@ module Locale
       thread[:current_languages] = nil
       thread[:candidates_caches] = nil
     end
-    memoize_clear
     self
   end
 

data/lib/locale/tag.rb

@@ -13,13 +13,11 @@ 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.
@@ -33,7 +31,6 @@ module Locale
       end
       Locale::Tag::Irregular.new(tag)
     end
-    memoize :parse
   end
 end
 

data/lib/locale/tag/cldr.rb

@@ -26,7 +26,6 @@ module Locale
       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.
@@ -49,7 +48,6 @@ module Locale
             nil
           end
         end
-        memoize_dup :parse
       end
 
       # Create Locale::Tag::Cldr.
@@ -63,7 +61,6 @@ module Locale
 
       # Sets the extensions as an Hash.
       def extensions=(val)
-        clear
         @extensions = val
       end
 

data/lib/locale/tag/common.rb

@@ -33,7 +33,6 @@ 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.
@@ -49,7 +48,6 @@ module Locale
             nil
           end
         end
-        memoize_dup :parse
       end
 
       # Create a Locale::Tag::Common.
@@ -61,7 +59,6 @@ module Locale
       
       # Set the script (with capitalize)
       def script=(val)
-        clear
         @script = val
         @script = @script.capitalize if @script
         @script
@@ -69,7 +66,6 @@ module Locale
 
       # Set the variants as an Array.
       def variants=(val)
-        clear
         @variants = val
       end
 
@@ -88,7 +84,6 @@ 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)  #:nodoc:

data/lib/locale/tag/irregular.rb

@@ -27,14 +27,12 @@ module Locale
       def candidates
         [Irregular.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/posix.rb

@@ -56,13 +56,11 @@ module Locale
 
       # Set the charset.
       def charset=(val)
-        clear
         @charset = val
       end
 
       # Set the modifier as a String
       def modifier=(val)
-        clear
         @modifier = val
       end
 

data/lib/locale/tag/rfc.rb

@@ -27,7 +27,6 @@ module Locale
       attr_reader :extensions, :privateuse
 
       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.
@@ -55,7 +54,6 @@ module Locale
             nil
           end
         end
-        memoize_dup :parse
       end
 
       def initialize(language, script = nil, region = nil, variants = [],
@@ -66,13 +64,11 @@ module Locale
 
       # Sets the extensions as an Array.
       def extensions=(val)
-        clear
         @extensions = val
       end
 
       # Sets the privateuse as a String
       def privateuse=(val)
-        clear
         @privateuse = val
       end
 

data/lib/locale/tag/simple.rb

@@ -7,8 +7,6 @@
   license terms as Ruby.
 =end
 
-require 'locale/util/memoizable'
-
 module Locale
   module Tag
     # Abstract language tag class.
@@ -20,8 +18,6 @@ module Locale
     # * ja-JP
     # * ja-392
     class Simple
-      include Util::Memoizable
-
       ALPHA = '[a-z]'
       DIGIT = '[0-9]'
       ALPHANUM = "[a-zA-Z0-9]"
@@ -31,8 +27,6 @@ module Locale
 
       TAG_RE = /\A#{LANGUAGE}(?:[_-]#{REGION})?\Z/i
 
-      include Util::Memoizable
-
       attr_reader :language, :region
 
       # tag is set when .parse method is called.
@@ -52,12 +46,10 @@ module Locale
           def to_#{name}
             convert_to(#{name.to_s.capitalize})
           end
-          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
@@ -68,7 +60,6 @@ module Locale
             nil
           end
         end
-        memoize_dup :parse
       end
 
       # Create a Locale::Tag::Simple
@@ -85,7 +76,6 @@ module Locale
       def to_s
         to_string
       end
-      memoize :to_s
 
       def to_str  #:nodoc:
         to_s
@@ -102,24 +92,20 @@ 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
 
       # Set the language (with downcase)
       def language=(val)
-        clear
         @language = val
         @language = @language.downcase if @language
         @language
@@ -127,7 +113,6 @@ module Locale
 
       # Set the region (with upcase)
       def region=(val)
-        clear
         @region = val
         @region = @region.upcase if @region
         @region
@@ -138,7 +123,6 @@ module Locale
       def candidates
         [self.class.new(language, region), self.class.new(language)]
       end
-      memoize_dup :candidates
 
       # Convert to the klass(the class of Language::Tag)
       private

data/lib/locale/taglist.rb

@@ -9,8 +9,6 @@
   $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. 
@@ -26,8 +24,6 @@ module Locale
   # of this function.
   #
   class TagList < Array 
-    include Util::Memoizable
-
     # Returns the top priority language. (simple)
     def language
       self[0].language
@@ -54,31 +50,26 @@ module Locale
       top_priority_charset ||= ::Locale.driver_module.charset
       top_priority_charset
     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

data/lib/locale/version.rb

@@ -2,11 +2,12 @@
   version - version information of Ruby-Locale
 
   Copyright (C) 2008 Masao Mutoh
+  Copyright (C) 2013 Kouhei Sutou <kou@clear-code.com>
  
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 =end
 module Locale
-  VERSION = "2.0.9"
+  VERSION = "2.1.0"
 end
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locale
 version: !ruby/object:Gem::Version
-  version: 2.0.9
-  prerelease: 
+  version: 2.1.0
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -10,124 +9,108 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-20 00:00:00.000000000 Z
+date: 2013-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit-notify
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit-rr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'Ruby-Locale is the pure ruby library which provides basic APIs for
-  localization.
-
-'
+description: |
+  Ruby-Locale is the pure ruby library which provides basic APIs for localization.
 email:
 - kou@clear-code.com
 - mutomasa at gmail.com
@@ -156,7 +139,6 @@ files:
 - lib/locale/middleware.rb
 - lib/locale/data/languages.tab.gz
 - lib/locale/data/regions.tab.gz
-- lib/locale/util/memoizable.rb
 - lib/locale/taglist.rb
 - lib/locale.rb
 - samples/cgi/README
@@ -184,7 +166,6 @@ files:
 - test/test_locale.rb
 - test/test_thread.rb
 - test/test_info.rb
-- test/test_memoizable.rb
 - test/test_driver_jruby.rb
 - test/test_driver_win32.rb
 - test/test_detect_general.rb
@@ -192,27 +173,26 @@ homepage: https://github.com/ruby-gettext/locale
 licenses:
 - Ruby
 - LGPLv3+
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby-Locale is the pure ruby library which provides basic APIs for localization.
 test_files:
 - test/test_tag.rb
@@ -221,7 +201,6 @@ test_files:
 - test/test_locale.rb
 - test/test_thread.rb
 - test/test_info.rb
-- test/test_memoizable.rb
 - test/test_driver_jruby.rb
 - test/test_driver_win32.rb
 - test/test_detect_general.rb

data/lib/locale/util/memoizable.rb

@@ -1,108 +0,0 @@
-# Refer from activesupport-2.2.0.
-#
-# * Remove the dependecies to activesupport.
-# * change the key to hash value of args.
-# * Not Thread safe
-# * Add the clear method.
-module Locale
-  module Util
-    module Memoizable
-      MEMOIZED_IVAR = Proc.new do |symbol| 
-        "#{symbol.to_s.sub(/\?\Z/, '_query').sub(/!\Z/, '_bang')}".to_sym
-      end 
-
-      def self.included(base)
-        mod = self
-        base.class_eval do
-          extend mod
-        end
-      end
-
-      alias :freeze_without_memoizable :freeze  #:nodoc:
-      def freeze #:nodoc:
-        unless frozen?
-          @_memoized_ivars = {}
-          freeze_without_memoizable
-        end
-      end
-
-      # Clear memoized values. Deprecated.
-      def clear  # :nodoc: 
-        @_memoized_ivars = {}
-      end
-
-      # Clear memoized values.
-      def memoize_clear
-        @_memoized_ivars = {}
-      end
-
-      # Cache the result of the methods.
-      #
-      #  include Memoizable
-      #  def foo
-      #    ......
-      #  end
-      #  def bar(a, b)
-      #    ......
-      #  end
-      #  memoize :foo, :bar(a, b)
-      # 
-      # To clear cache, #clear_foo, #clear_bar is also defined.
-      #
-      # (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)
-          dup_meth = is_dup ? "_dup" : ""
-
-          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
-
-      def _memoize(ivar, key) #:nodoc:
-        @_memoized_ivars ||= {}
-        @_memoized_ivars[ivar] ||= {}
-
-        ret = @_memoized_ivars[ivar][key]
-        unless ret
-          ret = yield
-          ret.freeze
-          @_memoized_ivars[ivar][key] = ret 
-        end
-        ret
-      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
-        else
-          nil
-        end
-      end
-    end
-  end
-end

data/test/test_memoizable.rb

@@ -1,133 +0,0 @@
-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