locale 2.0.2 → 2.0.3

data/lib/locale/util/memoizable.rb.20090328

@@ -0,0 +1,96 @@
+# 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.
+      def 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.
+      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__
+            alias #{original_method} #{symbol}
+            def #{symbol}(*args)
+              _memoize(#{is_dup}, :#{memoized_ivar}, args.hash) do
+                #{original_method}(*args)
+              end
+            end
+          EOS
+        end
+      end
+
+      def _memoize(is_dup, 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
+        
+        return ret unless is_dup
+        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/lib/locale/util/memoizable.rb.old

@@ -0,0 +1,91 @@
+# 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 |klass, symbol|
+        "#{klass.name.gsub(/::/, "_")}_#{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.
+      def 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.
+      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(self, symbol)
+ 
+          class_eval <<-EOS, __FILE__, __LINE__
+            alias #{original_method} #{symbol}
+            def #{symbol}(*args)
+              @_memoized_ivars ||= {}
+              @_memoized_ivars[:#{memoized_ivar}] ||= {}
+
+              key = args.hash
+
+              ret = @_memoized_ivars[:#{memoized_ivar}][key]
+                                     print String(key) + "#{original_method}, #{memoized_ivar}" + ret.to_s + "\n"
+              if ret
+p 1
+                ret
+              else
+p  @_memoized_ivars
+p 222222222
+p "#{original_method}(*args).freeze"
+                if "Locale_Tag_Common_to_s" == "#{memoized_ivar}"
+p                @_memoized_ivars[:#{memoized_ivar}][key] = super.#{original_method}(*args).freeze
+                else
+p 11111111111
+                  @_memoized_ivars[:#{memoized_ivar}][key] = #{original_method}(*args).freeze
+                end
+              end
+            end
+          EOS
+        end
+      end
+    end
+  end
+end

data/lib/locale/version.rb

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

data/replace.rb

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

data/test.rb

@@ -0,0 +1,28 @@
+require 'locale/util/memoizable'
+
+class Test
+  include Locale::Util::Memoizable
+  def set_test(a)
+p "set_test"
+    @a = a
+  end
+  memoize :set_test
+  def test
+    @a
+  end
+end
+
+class Test2 < Test
+  def set_test(a)
+p "set_test2"
+    @a = a
+  end
+  memoize :set_test
+end
+
+
+a = Test.new
+a.set_test(1)
+a.set_test(1)
+a.set_test(1)
+p a.test

data/test/test.rb

@@ -0,0 +1,7 @@
+$LOAD_PATH.unshift "../lib"
+
+require 'locale'
+
+p a = Locale::Tag::Rfc.parse("ja-JP-MOBILE")
+
+p a.to_posix

data/test/tmp.txt

@@ -0,0 +1,20 @@
+-581759920_unmemoized_parse, _parse
+{:_parse=>{}}
+222222222
+"_unmemoized_parse(*args).freeze"
+11111111111
+0_unmemoized_inspect, Locale_Tag_Simple_inspect
+{:Locale_Tag_Simple_inspect=>{}}
+222222222
+"_unmemoized_inspect(*args).freeze"
+11111111111
+0_unmemoized_to_s, Locale_Tag_Rfc_to_s
+{:Locale_Tag_Simple_inspect=>{}, :Locale_Tag_Rfc_to_s=>{}}
+222222222
+"_unmemoized_to_s(*args).freeze"
+11111111111
+"rfc.to_s, 1"
+0_unmemoized_to_s, Locale_Tag_Common_to_s
+{:Locale_Tag_Common_to_s=>{}, :Locale_Tag_Simple_inspect=>{}, :Locale_Tag_Rfc_to_s=>{}}
+222222222
+"_unmemoized_to_s(*args).freeze"

data/test2.rb

@@ -0,0 +1,14 @@
+class Test
+  def test(a)
+    @a = a
+  end
+  alias :test_new :test
+end
+
+class Test2 < Test
+  def test(a)
+    @a = a + 1
+  end
+end
+
+p Test2.new.test_new(1)

data/test3.rb

@@ -0,0 +1,12 @@
+$:.insert(0, "lib")
+#require 'benchmark'
+require 'locale'
+
+#Benchmark.bm(18){|x|
+#  x.report("bindtextdomain"){ 100000.times{|i|
+(0...100000).each {
+       Locale.candidates
+#     }
+#  }
+}
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: locale
 version: !ruby/object:Gem::Version 
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors: 
 - Masao Mutoh
@@ -22,7 +22,72 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- test.rb
+- replace.rb
 - ChangeLog
+- doc
+- doc/index.html
+- doc/fr_method_index.html
+- doc/created.rid
+- doc/fr_class_index.html
+- doc/classes
+- doc/classes/Locale
+- doc/classes/Locale/Util.html
+- doc/classes/Locale/Tag
+- doc/classes/Locale/Tag/Irregular.html
+- doc/classes/Locale/Tag/Simple.html
+- doc/classes/Locale/Tag/Rfc.html
+- doc/classes/Locale/Tag/Cldr.html
+- doc/classes/Locale/Tag/Posix.html
+- doc/classes/Locale/Tag/Common.html
+- doc/classes/Locale/Info.html
+- doc/classes/Locale/Tag.html
+- doc/classes/Locale/Info
+- doc/classes/Locale/Info/Region.html
+- doc/classes/Locale/Info/Language.html
+- doc/classes/Locale/TagList.html
+- doc/classes/Locale/Util
+- doc/classes/Locale/Util/Memoizable.html
+- doc/classes/Locale/Driver.html
+- doc/classes/Locale/Driver
+- doc/classes/Locale/Driver/Win32.html
+- doc/classes/Locale/Driver/Win32Table.html
+- doc/classes/Locale/Driver/Env.html
+- doc/classes/Locale/Driver/Posix.html
+- doc/classes/Locale/Driver/CGI.html
+- doc/classes/Locale/Driver/JRuby.html
+- doc/classes/Locale.html
+- doc/files
+- doc/files/ChangeLog.html
+- doc/files/lib
+- doc/files/lib/locale_rb.html
+- doc/files/lib/locale
+- doc/files/lib/locale/driver
+- doc/files/lib/locale/driver/win32_rb.html
+- doc/files/lib/locale/driver/win32_table_rb.html
+- doc/files/lib/locale/driver/posix_rb.html
+- doc/files/lib/locale/driver/cgi_rb.html
+- doc/files/lib/locale/driver/jruby_rb.html
+- doc/files/lib/locale/driver/env_rb.html
+- doc/files/lib/locale/version_rb.html
+- doc/files/lib/locale/tag_rb.html
+- doc/files/lib/locale/tag
+- doc/files/lib/locale/tag/simple_rb.html
+- doc/files/lib/locale/tag/rfc_rb.html
+- doc/files/lib/locale/tag/posix_rb.html
+- doc/files/lib/locale/tag/irregular_rb.html
+- doc/files/lib/locale/tag/cldr_rb.html
+- doc/files/lib/locale/tag/common_rb.html
+- doc/files/lib/locale/info
+- doc/files/lib/locale/info/language_rb.html
+- doc/files/lib/locale/info/region_rb.html
+- doc/files/lib/locale/taglist_rb.html
+- doc/files/lib/locale/info_rb.html
+- doc/files/lib/locale/util
+- doc/files/lib/locale/util/memoizable_rb.html
+- doc/files/README_rdoc.html
+- doc/rdoc-style.css
+- doc/fr_file_index.html
 - samples
 - samples/sample_info.rb
 - samples/rack
@@ -37,6 +102,9 @@ files:
 - samples/cgi/http.rb
 - samples/cgi/README
 - setup.rb
+- benchmark
+- benchmark/benchmark_2.0.1.txt
+- benchmark/benchmark.rb
 - COPYING
 - lib
 - lib/locale
@@ -62,20 +130,26 @@ files:
 - lib/locale/info/region.rb
 - lib/locale/taglist.rb
 - lib/locale/util
+- lib/locale/util/memoizable.rb.20090328
+- lib/locale/util/memoizable.rb.old
 - lib/locale/util/memoizable.rb
 - lib/locale/data
 - lib/locale/data/regions.tab.gz
 - lib/locale/data/languages.tab.gz
 - lib/locale.rb
 - README.rdoc
+- test3.rb
 - test
+- test/test.rb
 - test/test_detect_general.rb
 - test/test_info.rb
 - test/test_memoizable.rb
+- test/tmp.txt
 - test/test_thread.rb
 - test/test_taglist.rb
 - test/test_tag.rb
 - test/test_detect_cgi.rb
+- test2.rb
 - Rakefile
 has_rdoc: true
 homepage: http://locale.rubyforge.org/