gettext 2.0.4 → 2.1.0

data/COPYING

@@ -1,5 +1,6 @@
-You can redistribute this program  and/or modify it under either the terms of 
-the LGPL (see the file LGPL), or the conditions below:
+Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.jp>.
+You can redistribute it and/or modify it under either the terms of the GPL
+version 2 (see the file GPL), or the conditions below:
 
   1. You may make and give away verbatim copies of the source form of the
      software without restriction, provided that you duplicate all of the
@@ -16,22 +17,22 @@ the LGPL (see the file LGPL), or the conditions below:
        b) use the modified software only within your corporation or
           organization.
 
-       c) rename any non-standard executables so the names do not conflict
-	  with standard executables, which must also be provided.
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
 
        d) make other distribution arrangements with the author.
 
-  3. You may distribute the software in object code or executable
-     form, provided that you do at least ONE of the following:
+  3. You may distribute the software in object code or binary form,
+     provided that you do at least ONE of the following:
 
-       a) distribute the executables and library files of the software,
+       a) distribute the binaries and library files of the software,
 	  together with instructions (in the manual page or equivalent)
 	  on where to get the original distribution.
 
        b) accompany the distribution with the machine-readable source of
 	  the software.
 
-       c) give non-standard executables non-standard names, with
+       c) give non-standard binaries non-standard names, with
           instructions on where to get the original software distribution.
 
        d) make other distribution arrangements with the author.

data/ChangeLog

@@ -1,3 +1,24 @@
+= Ruby-GetText-Package-2.1.0 (2009-11-11)
+ * Implemented parsing of translator comments (GNU gettext feature) 
+   [by Vladimir Dobriakov]
+ * Refactor the directory structure.
+   * Move files for runtime to lib/gettext/runtime/*.
+   * Move files for development(rgettext/rmsgfmt) to
+     lib/gettext/tools/*.
+ * Refactor parsers for po. po-message object is defined as GetText::PoMessage
+   class. [by Vladimir Dobriakov, Masao Mutoh]
+ * Speed up when lots of objects are created to share the textdomain in each
+   objects. [Reported by Gaël Séchaud.]
+ * Fix "%{foo.bar}" %{"foo.bar".to_sym => "a"} doesn't work.
+   [Bug#26663, Reported by Danilo Castilho]
+ * lib/gettext.rb: Fixed to work unless gem. [Reported by Vladimir Dobriakov]
+ * Fixed a wrong String literal in a CGI sample.
+   [Bug #26531, by Eugene Mikhailov]
+ * Update license information(explicit to use ruby's or LGPL).
+   [Pointed out by Masateru Yoshikawa]
+ * Code cleanup.
+ * Update minor version.
+
 = Ruby-GetText-Package-2.0.4 (2009-05-23)
  * Fix String#% return nil when the string have no place holders. [by okkez]
  * Update pofiles and remove old messages.

data/README.rdoc

@@ -65,14 +65,8 @@ Rails / ActiveRecord specific code now lives in locale_rails[http://github.com/m
     gem uninstall gettext
 
 * gem
-    #from github (edge/unstable)
+    #from rubyforge 
     (sudo/su on POSIX system)
-    gem install locale
-    gem install mutoh-gettext -s http://gems.github.com/
-
-    #from rubyforge (stable)
-    (sudo/su on POSIX system)
-    gem install locale
     gem install gettext
 
 * download tar-ball
@@ -150,8 +144,8 @@ For more details and options, have a look at the samples folder or
 consult the tutorial[http://www.yotabanana.com/hiki/ruby-gettext-howto.html].
 
 == License
-This program is licenced under the same licence as Ruby.  
-(See the file 'COPYING'.)
+This program is licenced under the same licence as Ruby(See COPYING) or 
+LGPL(Lesser General Public License: http://www.gnu.org/licenses/lgpl-3.0.txt).  
 
 * mofile.rb
   * Copyright (C) 2001-2009 Masao Mutoh <mutoh at highwhay.ne.jp>
@@ -227,21 +221,21 @@ This program is licenced under the same licence as Ruby.
 * Chinese(zh_TW)            - 2.0.1
 * Czech(cs)                 - 1.9.0 (old)
 * Dutch(nl)                 - 1.90.0 (old)
-* English(default)          - 1.90.0 (old)
+* English(default)          - 2.1.0
 * Esperanto(eo)             - 2.0.1
 * Estonian(et)              - 2.0.1
-* French(fr)                - 2.0.1
+* French(fr)                - 2.0.1 
 * German(de)                - 2.0.1
 * Greek(el)                 - 2.0.1 
 * Hungarian(hu)             - 2.0.1
 * Italian(it)               - 1.6.0 (old)
-* Japanese(ja)              - 2.0.1
+* Japanese(ja)              - 2.1.0
 * Korean(ko)                - 1.9.0 (old)
 * Latvian(lv)               - 2.0.1 
 * Norwegian(nb)             - 2.0.1
 * Portuguese(Brazil)(pt_BR) - 2.0.1
 * Russian(ru)               - 2.0.1
-* Serbian(sr)               - 1.91.0 (old)
+* Serbian(sr)               - 2.0.1
 * Spanish(es)               - 2.0.1
 * Swedish(sv)               - 0.8.0 (too much old)
 * Ukrainian(ua)             - 2.0.1

data/Rakefile

@@ -25,9 +25,9 @@ PKG_VERSION = GetText::VERSION
 ############################################################
 # GetText tasks for developing
 ############################################################
-desc "Create lib/gettext/poparser.rb"
+desc "Create lib/gettext/tools/poparser.rb"
 task :poparser do
-  poparser_path = "lib/gettext/poparser.rb"
+  poparser_path = "lib/gettext/tools/poparser.rb"
   racc = File.join(Config::CONFIG['bindir'], "racc")
   if ! FileTest.exist?(racc)
     puts "racc was not found: #{racc}"
@@ -81,10 +81,10 @@ desc "Update pot/po files to match new version."
 task :updatepo do
   begin
     require 'gettext'
-    require 'gettext/poparser'
+    require 'gettext/tools/poparser'
     require 'gettext/tools'
   rescue LoadError
-    puts "gettext/poparser was not found."
+    puts "gettext/tools/poparser was not found."
   end
 
   #lib/gettext/*.rb -> rgettext.po
@@ -166,7 +166,7 @@ spec = Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.executables = Dir.entries('bin').delete_if {|item| /^\.|CVS|~$/ =~ item }
   s.bindir = 'bin'
-  s.add_dependency('locale', '>= 2.0.4')
+  s.add_dependency('locale', '>= 2.0.5')
   s.has_rdoc = true
   s.description = <<-EOF
         Ruby-GetText-Package is a GNU GetText-like program for Ruby.
@@ -187,6 +187,8 @@ Rake::GemPackageTask.new(spec) do |p|
   p.need_zip = false
 end
 
+task :package => [:makemo]
+
 ############################################################
 # Misc tasks
 ############################################################

data/benchmark/1.93.0.txt

@@ -0,0 +1,8 @@
+"1.93.0"
+                               user     system      total        real
+bindtextdomain             2.580000   0.620000   3.200000 (  3.237802)
+set_locale                18.920000   2.540000  21.460000 ( 21.950700)
+gettext ja                 1.870000   0.780000   2.650000 (  2.696046)
+gettext en (not found)     1.830000   0.820000   2.650000 (  2.697443)
+ngettext ja                4.260000   1.280000   5.540000 (  5.689135)
+ngettext en (not found)    5.300000   1.430000   6.730000 (  6.889310)

data/benchmark/2.0.0.txt

@@ -0,0 +1,8 @@
+"2.0.0"
+                               user     system      total        real
+bindtextdomain             2.350000   0.490000   2.840000 (  2.837863)
+set_locale                 2.700000   0.630000   3.330000 (  3.330341)
+gettext ja                74.160000   8.680000  82.840000 ( 82.886468)
+gettext en (not found)    62.030000   8.910000  70.940000 ( 70.976801)
+ngettext ja               75.610000   8.660000  84.270000 ( 84.316501)
+ngettext en (not found)   68.940000   9.630000  78.570000 ( 78.630459)

data/benchmark/2.0.4.txt

@@ -0,0 +1,11 @@
+"2.0.4"
+                               user     system      total        real
+bindtextdomain             1.960000   0.440000   2.400000 (  2.439888)
+set_locale                 5.970000   2.070000   8.040000 (  8.050040)
+gettext ja                 1.210000   0.390000   1.600000 (  1.604350)
+gettext en (not found)     1.220000   0.370000   1.590000 (  1.593880)
+ngettext ja                2.200000   0.500000   2.700000 (  2.699904)
+ngettext en (not found)    1.850000   0.450000   2.300000 (  2.318696)
+create object ja         168.840000  26.220000 195.060000 (195.235649)
+create object en         222.410000  32.830000 255.240000 (255.385031)
+190140K

data/benchmark/2.1.0.txt

@@ -0,0 +1,11 @@
+"2.1.0"
+                               user     system      total        real
+bindtextdomain             1.320000   0.000000   1.320000 (  1.348555)
+set_locale                 3.990000   0.000000   3.990000 (  4.073860)
+gettext ja                 1.130000   0.000000   1.130000 (  1.144062)
+gettext en (not found)     1.130000   0.000000   1.130000 (  1.141781)
+ngettext ja                1.950000   0.000000   1.950000 (  1.991278)
+ngettext en (not found)    1.650000   0.000000   1.650000 (  1.676332)
+create object ja           1.210000   0.000000   1.210000 (  1.224649)
+create object en           1.220000   0.000000   1.220000 (  1.234247)
+104K 

data/benchmark/benchmark.rb

@@ -0,0 +1,68 @@
+$:.unshift "../../locale/lib"
+$:.unshift "../../gettext/lib"
+
+#require 'rubygems'
+require 'benchmark'
+require 'gettext'
+
+num = 100000
+
+def memory
+  pid = Process.pid
+  map = `pmap -d #{pid}`
+  map.split("\n").last.strip.squeeze(' ').split(' ')[3].to_i
+end
+
+curr_mem = memory
+
+class Test
+  include GetText
+  bindtextdomain("test1", :path => "../test/locale")
+  def test
+    _("language")
+  end
+end
+
+p GetText::VERSION
+Benchmark.bm(25){|x|
+  x.report("bindtextdomain"){ num.times{|i|
+    GetText.bindtextdomain("test1", :path => "../test/locale")
+    #GetText.bindtextdomain("test1", "../test/locale")
+  } }
+  x.report("set_locale"){ num.times{|i|
+    GetText.locale = "ja"
+  } }
+  GetText.locale = "ja"
+  x.report("gettext ja"){ num.times{|i|
+    GetText._("language")
+  } }
+  GetText.locale = "en"
+  x.report("gettext en (not found)"){ num.times{|i|
+    GetText._("language")
+  } }
+
+  GetText.bindtextdomain("plural", :path => "../test/locale")
+  #GetText.bindtextdomain("plural", "../test/locale")
+  GetText.locale = "ja"
+  x.report("ngettext ja"){ (num / 2).times{|i|
+    GetText.n_("single", "plural", 1)
+    GetText.n_("single", "plural", 2)
+  } }
+  GetText.locale = "en"
+  x.report("ngettext en (not found)"){ (num / 2).times{|i|
+    GetText.n_("single", "plural", 1)
+    GetText.n_("single", "plural", 2)
+  } }
+
+  GetText.locale = "ja"
+  x.report("create object ja"){ num.times{|i|
+      Test.new.test
+  } }
+  GetText.locale = "en"
+  x.report("create object en"){ num.times{|i|
+      Test.new.test
+  } }
+}
+
+GC.start
+puts "#{memory - curr_mem}K "

data/benchmark/test.rb

@@ -0,0 +1,28 @@
+require 'benchmark'
+
+def test(s)
+  ret = ""
+  if s =~ /^\#<|^$/ or s == "GetText"
+  #if s.size == 0 or s[0..1] = "#<" or s == "GetText"
+    ret = Object
+  end
+  ret
+end
+
+num = 100000
+
+Benchmark.bm(25){|x|
+  x.report("test matched"){ num.times{|i|
+    test("#<foo>")
+  } }
+  x.report("test matched nodata"){ num.times{|i|
+    test("")
+  } }
+  x.report("test matched GetText"){ num.times{|i|
+    test("GetText")
+  } }
+  x.report("test not matched"){ num.times{|i|
+    test("FooBar")
+  } }
+
+}

data/bin/rgettext

@@ -2,12 +2,11 @@
 =begin
   rgettext - ruby version of xgettext
 
-  Copyright (C) 2005  Masao Mutoh
+  Copyright (C) 2005-2009  Masao Mutoh
   
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: rgettext,v 1.15 2008/07/24 17:17:48 mutoh Exp $
 =end
 
 begin

data/bin/rmsgfmt

@@ -2,12 +2,10 @@
 =begin
   rgettext - ruby version of xgettext
 
-  Copyright (C) 2005  Masao Mutoh
+  Copyright (C) 2005-2009  Masao Mutoh
  
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
-
-  $Id: rmsgfmt,v 1.14 2008/07/24 17:17:48 mutoh Exp $
 =end
 
 begin

data/bin/rmsgmerge

@@ -6,8 +6,6 @@
  
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
-
-  $Id: rmsgmerge,v 1.13 2008/07/24 17:17:48 mutoh Exp $
 =end
 
 begin

data/lib/gettext.rb

@@ -8,15 +8,13 @@
       Masahiro Sakai    <s01397ms@sfc.keio.ac.jp>
 
   You may redistribute it and/or modify it under the same
-  license terms as Ruby.
-
-  $Id: gettext.rb,v 1.46 2008/09/13 18:23:55 mutoh Exp $
+  license terms as Ruby or LGPL.
 =end
 
-if respond_to? :gem
+if Object.constants.include? "Gem"
   begin
     begin
-      gem 'locale', '>=2.0' 
+      gem 'locale', '>=2.0.4' 
     rescue Gem::LoadError
     end
   rescue NoMethodError
@@ -28,7 +26,7 @@ require 'locale'
 raise "Install locale as gem or uninstall old gettext" unless Locale.respond_to? :candidates
 
 require 'gettext/version'
-require 'gettext/textdomain_manager'
+require 'gettext/runtime/textdomain_manager'
 
 module GetText
   # If the textdomain isn't bound when calling GetText.textdomain, this error is raised.

data/lib/gettext/cgi.rb

@@ -4,9 +4,7 @@
   Copyright (C) 2005-2009  Masao Mutoh
 
   You may redistribute it and/or modify it under the same
-  license terms as Ruby.
-
-  $Id$
+  license terms as Ruby or LGPL.
 =end
 
 require 'cgi'

data/lib/gettext/core_ext/iconv.rb

@@ -8,12 +8,10 @@
   For JRuby:
   Use Java String class to convert strings.
 
-  Copyright (C) 2004-2007  Masao Mutoh
+  Copyright (C) 2004-2009  Masao Mutoh
 
   You may redistribute it and/or modify it under the same
-  license terms as Ruby.
-
-  $Id: iconv.rb,v 1.6 2007/11/08 14:21:22 mutoh Exp $
+  license terms as Ruby or LGPL.
 =end
 
 begin