gettext 2.3.9 → 3.0.0

data/test/test_po_parser.rb

@@ -18,85 +18,46 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require "gettext/tools/poparser"
+require "gettext/po_parser"
 
 class TestPOParser < Test::Unit::TestCase
-  def test_msgstr_not_existing
-    po_file = create_po_file(<<-EOP)
+  private
+  def create_po_file(content)
+    po_file = Tempfile.new("hello.po")
+    po_file.print(content)
+    po_file.close
+    po_file
+  end
+
+  def parse_po_file(po_file, parsed_entries)
+    parser = GetText::POParser.new
+    parser.parse_file(po_file.path, parsed_entries)
+  end
+
+  class TestMsgStr < self
+    class TestEmpty < self
+      def test_normal
+        po_file = create_po_file(<<-EOP)
 msgid "Hello"
 msgstr ""
 EOP
-    messages = parse_po_file(po_file, MO.new)
+        messages = parse_po_file(po_file, MO.new)
 
-    assert_equal(nil, messages["Hello"])
-  end
+        assert_equal(nil, messages["Hello"])
+      end
 
-  def test_empty_msgstr_for_msgid_plural
-    po_file = create_po_file(<<-EOP)
+      def test_plural
+        po_file = create_po_file(<<-EOP)
 msgid "He"
 msgid_plural "They"
 msgstr[0] ""
 msgstr[1] ""
 EOP
-    messages = parse_po_file(po_file, MO.new)
+        messages = parse_po_file(po_file, MO.new)
 
-    assert_true(messages.has_key?("He\000They"))
-    assert_equal(nil, messages["He\000They"])
-  end
-
-  class TestPoData < self
-    def test_comment
-      po_file = create_po_file(<<-EOP)
-#: file.rb:10
-msgid "hello"
-msgstr "bonjour"
-EOP
-      entries = parse_po_file(po_file)
-      assert_true(entries.msgids.include?("hello"))
-      assert_equal("bonjour", entries["hello"])
-      assert_equal("#: file.rb:10", entries.comment("hello"))
-    end
-
-    def test_msgctxt
-      po_file = create_po_file(<<-EOP)
-msgctxt "pronoun"
-msgid "he"
-msgstr "il"
-EOP
-      entries = parse_po_file(po_file)
-      assert_true(entries.msgids.include?("pronoun\004he"))
-      assert_equal("il", entries["pronoun\004he"])
-    end
-
-    def test_msgid_plural
-      po_file = create_po_file(<<-EOP)
-msgid "he"
-msgid_plural "they"
-msgstr[0] "il"
-msgstr[1] "ils"
-EOP
-      entries = parse_po_file(po_file)
-
-      assert_true(entries.msgids.include?("he\000they"))
-      assert_equal("il\000ils", entries["he\000they"])
-    end
-
-    def test_msgctxt_and_msgid_plural
-      po_file = create_po_file(<<-EOP)
-msgctxt "pronoun"
-msgid "he"
-msgid_plural "them"
-msgstr[0] "il"
-msgstr[1] "ils"
-EOP
-      entries = parse_po_file(po_file)
-      assert_true(entries.msgids.include?("pronoun\004he\000them"))
-      assert_equal("il\000ils", entries["pronoun\004he\000them"])
-    end
-
-    private
-    def parse_po_file(po_file)
-      super(po_file, GetText::Tools::MsgMerge::PoData.new)
+        assert_true(messages.has_key?("He\000They"))
+        assert_equal(nil, messages["He\000They"])
+      end
     end
   end
 
@@ -113,16 +74,45 @@ EOP
       assert_equal("bonjour", entries["hello"].msgstr)
     end
 
-    def test_references
-      po_file = create_po_file(<<-EOP)
+    class TestReferences < self
+      def test_single
+        po_file = create_po_file(<<-EOP)
 # This is the comment.
 #: file.rb:10
 msgid "hello"
 msgstr "bonjour"
 EOP
-      entries = parse_po_file(po_file)
-      assert_true(entries.has_key?(nil, "hello"))
-      assert_equal(["file.rb:10"], entries["hello"].references)
+        entries = parse_po_file(po_file)
+        assert_true(entries.has_key?(nil, "hello"))
+        assert_equal(["file.rb:10"], entries["hello"].references)
+      end
+
+      def test_per_line
+        po_file = create_po_file(<<-PO)
+# This is the comment.
+#: file.rb:10
+#: file.rb:20
+msgid "hello"
+msgstr "bonjour"
+        PO
+        entries = parse_po_file(po_file)
+        assert_true(entries.has_key?(nil, "hello"))
+        assert_equal(["file.rb:10", "file.rb:20"],
+                     entries["hello"].references)
+      end
+
+      def test_same_line
+        po_file = create_po_file(<<-PO)
+# This is the comment.
+#: file.rb:10 file.rb:20
+msgid "hello"
+msgstr "bonjour"
+        PO
+        entries = parse_po_file(po_file)
+        assert_true(entries.has_key?(nil, "hello"))
+        assert_equal(["file.rb:10", "file.rb:20"],
+                     entries["hello"].references)
+      end
     end
 
     def test_translator_comment
@@ -245,20 +235,7 @@ EOP
     end
   end
 
-  private
-  def create_po_file(content)
-    po_file = Tempfile.new("hello.po")
-    po_file.print(content)
-    po_file.close
-    po_file
-  end
-
-  def parse_po_file(po_file, parsed_entries)
-    parser = GetText::POParser.new
-    parser.parse_file(po_file.path, parsed_entries)
-  end
-
-  class FuzzyTest < self
+  class TestFuzzy < self
     def setup
       @po = <<-EOP
 #, fuzzy
@@ -270,7 +247,21 @@ EOP
       @po_file.close
     end
 
-    class IgnoreTest < self
+    private
+    def parse
+      parser = GetText::POParser.new
+      class << parser
+        def _(message_id)
+          message_id
+        end
+      end
+      messages = MO.new
+      yield parser
+      parser.parse_file(@po_file.path, messages)
+      messages
+    end
+
+    class TestIgnore < self
       def test_report_warning
         mock($stderr).print("Warning: fuzzy message was ignored.\n")
         mock($stderr).print("  #{@po_file.path}: msgid 'Hello'\n")
@@ -292,7 +283,7 @@ EOP
       end
     end
 
-    class NotIgnore < self
+    class TestNotIgnore < self
       def test_report_warning
         mock($stderr).print("Warning: fuzzy message was used.\n")
         mock($stderr).print("  #{@po_file.path}: msgid 'Hello'\n")
@@ -313,19 +304,37 @@ EOP
         assert_equal("Bonjour", messages["Hello"])
       end
     end
+  end
 
-    private
-    def parse
-      parser = GetText::POParser.new
-      class << parser
-        def _(message_id)
-          message_id
-        end
+  class TestHeader < self
+    class TestEncoding < self
+      def test_known
+        assert_equal(Encoding::EUC_JP, detect_encoding("EUC-JP"))
+      end
+
+      def test_unknown
+        assert_equal(Encoding.default_external, detect_encoding("CHARSET"))
+      end
+
+      def test_fuzzy
+        assert_equal(Encoding::EUC_JP,
+                     detect_encoding("EUC-JP", :fuzzy => true))
+      end
+
+      private
+      def detect_encoding(encoding, options={})
+        comments = []
+        comments << "#, fuzzy" if options[:fuzzy]
+        po_file = create_po_file(<<-PO)
+#{comments.join("\n")}
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=#{encoding}\\n"
+        PO
+
+        parser = GetText::POParser.new
+        parser.send(:detect_file_encoding, po_file.path)
       end
-      messages = MO.new
-      yield parser
-      parser.parse_file(@po_file.path, messages)
-      messages
     end
   end
 end

data/test/test_string.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# -*- coding: utf-8 -*-
 
 class TestGetTextString < Test::Unit::TestCase
   class TestFormat < self

data/test/{test_textdomain_bind.rb → test_text_domain_bind.rb}

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# -*- coding: utf-8 -*-
 
 class Foo
 end
@@ -6,18 +6,18 @@ end
 class TestGetTextBind < Test::Unit::TestCase
   def setup
     GetText.locale = "ja_JP.EUC-JP"
-    @dumped_all_textdomains = GetText::TextDomainManager.dump_all_textdomains
-    GetText::TextDomainManager.clear_all_textdomains
+    @dumped_all_text_domains = GetText::TextDomainManager.dump_all_text_domains
+    GetText::TextDomainManager.clear_all_text_domains
   end
 
   def teardown
-    GetText::TextDomainManager.restore_all_textdomains(@dumped_all_textdomains)
+    GetText::TextDomainManager.restore_all_text_domains(@dumped_all_text_domains)
   end
 
   def test_bindtextdomain
     domain = GetText.bindtextdomain("foo")
-    assert_equal domain, GetText::TextDomainManager.create_or_find_textdomain_group(Object).textdomains[0]
-    assert_equal domain, GetText::TextDomainManager.textdomain_pool("foo")
+    assert_equal domain, GetText::TextDomainManager.create_or_find_text_domain_group(Object).text_domains[0]
+    assert_equal domain, GetText::TextDomainManager.text_domain_pool("foo")
   end
 
   def test_textdomain

data/test/{test_textdomain_multi.rb → test_text_domain_multi.rb}

@@ -1,6 +1,6 @@
-# encoding: utf-8
+# -*- coding: utf-8 -*-
 
-require 'fixtures/multi_textdomain.rb'
+require 'fixtures/multi_text_domain'
 
 class TestGetTextMulti < Test::Unit::TestCase
   include MultiTextDomain
@@ -24,7 +24,7 @@ class TestGetTextMulti < Test::Unit::TestCase
   end
 
   def test_inheritance
-    # inheritance. only parent has a textdomain and it's methods
+    # inheritance. only parent has a text domain and it's methods
     test = C21.new
     assert_equal("japanese", test.test)   # Use C11's po(test1.po)
     assert_equal("JAPANESE", test.test2)  # Use C11's po(test2.po)
@@ -38,7 +38,7 @@ class TestGetTextMulti < Test::Unit::TestCase
     # module
     assert_equal("japanese", M1.test)
 
-    # sub-module. only an included module has a textdomain and it's methods
+    # sub-module. only an included module has a text domain and it's methods
     assert_equal("japanese", M1::M1M1.test)   # Same method with M1.
     assert_equal("LANGUAGE", M1::M1M1.test2)  # No influence from ancestors.
 
@@ -72,7 +72,7 @@ class TestGetTextMulti < Test::Unit::TestCase
     assert_equal("no data", test.test3)   # No po file.
   end
 
-  def test_same_msgid_but_different_textdomain
+  def test_same_msgid_but_different_text_domain
     test1 = C12.new  # test1 domain
     test2 = C51.new  # test3 domain
     test3 = C52.new  # test3 domain but inherited C11.

data/test/{test_textdomain_toplevel.rb → test_text_domain_toplevel.rb}

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# -*- coding: utf-8 -*-
 
 include GetText
 

data/test/test_thread.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# -*- coding: utf-8 -*-
 
 require 'thread'
 

data/test/tools/files/simple_translation.rb

@@ -1,3 +1,3 @@
-# encoding: utf-8
+# -*- coding: utf-8 -*-
 
 _('a translation')

data/test/{parser → tools/parser}/test_ruby.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2012  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2013  Kouhei Sutou <kou@clear-code.com>
 # Copyright (C) 2010  masone (Christian Felder) <ema@rh-productions.ch>
 # Copyright (C) 2009  Vladimir Dobriakov <vladimir@geekq.net>
 # Copyright (C) 2009-2010  Masao Mutoh
@@ -43,7 +43,7 @@ class TestRubyParser < Test::Unit::TestCase
         :msgid_plural => nil,
         :msgstr       => nil,
         :separator    => nil,
-        :references      => nil,
+        :references   => nil,
       }
       default.merge(message)
     end
@@ -56,7 +56,7 @@ class TestRubyParser < Test::Unit::TestCase
         :msgid_plural => po_entry.msgid_plural,
         :msgstr       => po_entry.msgstr,
         :separator    => po_entry.separator,
-        :references      => normalize_references(po_entry.references),
+        :references   => normalize_references(po_entry.references),
       }
     end
   end
@@ -68,8 +68,6 @@ class TestRubyParser < Test::Unit::TestCase
   end
 
   class TestDetectEncoding < self
-    setup :need_encoding
-
     def test_ascii_and_hyphen
       assert_equal("euc-jp", detect_encoding("# coding: euc-jp"))
     end
@@ -96,7 +94,8 @@ class TestRubyParser < Test::Unit::TestCase
 
     private
     def detect_encoding(content)
-      GetText::RubyParser.detect_encoding(content)
+      parser = GetText::RubyParser.new("/tmp/source.rb")
+      parser.detect_encoding(content)
     end
 
     class NewLineStyle < self
@@ -114,7 +113,7 @@ class TestRubyParser < Test::Unit::TestCase
     end
   end
 
-  class Test_ < self
+  sub_test_case("_") do
     def test_one_line
       assert_parse([
                      {
@@ -125,20 +124,117 @@ class TestRubyParser < Test::Unit::TestCase
                    "one_line.rb")
     end
 
+    def test_one_new_line
+      path = "one_new_line.rb"
+      assert_parse([
+                     {
+                       :msgid      => "one new line\n",
+                       :references => ["#{path}:28"],
+                     },
+                   ],
+                   path)
+    end
+
+    def test_middle_new_line
+      path = "middle_new_line.rb"
+      assert_parse([
+                     {
+                       :msgid      => "middle\nnew line",
+                       :references => ["#{path}:28"],
+                     },
+                   ],
+                   path)
+    end
+
+    def test_multiple_lines_literal
+      path = "multiple_lines_literal.rb"
+      assert_parse([
+                     {
+                       :msgid      => "multiple\nlines\nliteral\n",
+                       :references => ["#{path}:28"],
+                     },
+                   ],
+                   path)
+    end
+
+    def test_multiple_same_messages
+      path = "multiple_same_messages.rb"
+      assert_parse([
+                     {
+                       :msgid      => "multiple same messages",
+                       :references => ["#{path}:28"],
+                     },
+                     {
+                       :msgid      => "multiple same messages",
+                       :references => ["#{path}:32"],
+                     },
+                   ],
+                   path)
+    end
+
+    def test_multiple_messages_in_same_line
+      path = "multiple_messages_in_same_line.rb"
+      assert_parse([
+                     {
+                       :msgid      => "multiple",
+                       :references => ["#{path}:28"],
+                     },
+                     {
+                       :msgid      => "in same line",
+                       :references => ["#{path}:28"],
+                     },
+                   ],
+                   path)
+    end
+
+    def test_literal_concatenation_with_continuation_line
+      path = "literal_concatenation_with_continuation_line.rb"
+      msgid = "literal concatenation with continuation line"
+      assert_parse([
+                     {
+                       :msgid      => msgid,
+                       :references => ["#{path}:28"],
+                     },
+                   ],
+                   path)
+    end
+
+    def test_double_quote_in_single_quote
+      path = "double_quote_in_single_quote.rb"
+      assert_parse([
+                     {
+                       :msgid      => "double \"quote\" in single quote",
+                       :references => ["#{path}:28"],
+                     },
+                   ],
+                   path)
+    end
+
+    def test_double_quote_in_double_quote
+      path = "double_quote_in_double_quote.rb"
+      assert_parse([
+                     {
+                       :msgid      => "double \"quote\" in double quote",
+                       :references => ["#{path}:28"],
+                     },
+                   ],
+                   path)
+    end
+
     private
     def fixture_path(*components)
       super("_", *components)
     end
   end
 
-  class Tests_ < self
+  sub_test_case("s_") do
     def test_custom
       assert_parse([
                      {
-                       :msgid     => "context|context$message",
-                       :msgstr    => nil,
-                       :separator => "$",
-                       :references   => ["custom.rb:28"],
+                       :msgid      => "context|context$message",
+                       :msgstr     => nil,
+                       :separator  => "$",
+                       :references => ["custom.rb:28"],
                      }
                    ],
                    "custom.rb")
@@ -150,7 +246,7 @@ class TestRubyParser < Test::Unit::TestCase
     end
   end
 
-  class Testns_ < self
+  sub_test_case("ns_") do
     def test_custom
       assert_parse([
                      {
@@ -158,7 +254,7 @@ class TestRubyParser < Test::Unit::TestCase
                        :msgid_plural => "context|context$messages",
                        :msgstr       => nil,
                        :separator    => "$",
-                       :references      => ["custom.rb:28"],
+                       :references   => ["custom.rb:28"],
                      }
                    ],
                    "custom.rb")