gettext 3.0.3 → 3.0.4

data/test/test_class_info.rb

@@ -35,6 +35,16 @@ end
 class @@anon::AC1; end
 module @@anon::AM1; end
 
+module TestClassInfoSandbox
+  class << self
+    def clear
+      constants.each do |name|
+        remove_const(name)
+      end
+    end
+  end
+end
+
 class TestClassInfo < Test::Unit::TestCase
   include GetText::ClassInfo
 
@@ -70,7 +80,7 @@ class TestClassInfo < Test::Unit::TestCase
 =end
   end
 
-  def test_rellated_classes_with_all_classes
+  def test_related_classes_with_all_classes
     assert_equal [M1, Object], related_classes(M1, [M1])
     assert_equal [M1, Object], related_classes(M1::M3::M4, [M1])
     assert_equal [M1::M3, Object], related_classes(M1::M3::M4, [M1::M3])
@@ -84,4 +94,35 @@ class TestClassInfo < Test::Unit::TestCase
   def test_ruby19
     assert_equal Object, GetText::ClassInfo.normalize_class(Module.new)
   end
+
+  sub_test_case "related_classes" do
+    def setup
+      unless Module.respond_to?(:prepend, true)
+        omit("Module#prepend is required")
+      end
+
+      TestClassInfoSandbox.module_eval(<<-SOURCE)
+        module Prepended
+        end
+
+        class Base
+          prepend Prepended
+        end
+      SOURCE
+    end
+
+    def teardown
+      TestClassInfoSandbox.clear
+    end
+
+    def test_prepend
+      assert_equal([
+                     TestClassInfoSandbox::Base,
+                     TestClassInfoSandbox,
+                     TestClassInfoSandbox::Prepended,
+                     Object,
+                   ],
+                   related_classes(TestClassInfoSandbox::Base))
+    end
+  end
 end

data/test/test_po.rb

@@ -257,7 +257,25 @@ msgstr ""
       PO
     end
 
+    def test_reference
+      @po.order = :reference
+      assert_equal(<<-PO, @po.to_s)
+#: hello.rb:1
+msgid "Hello"
+msgstr ""
+
+#: hello.rb:2
+msgid "World"
+msgstr ""
+
+#: hello.rb:3
+msgid "Hello World"
+msgstr ""
+      PO
+    end
+
     def test_references
+      raise "Remove :references support!" if GetText::VERSION >= "4.0.0"
       @po.order = :references
       assert_equal(<<-PO, @po.to_s)
 #: hello.rb:1

data/test/test_po_entry.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2012  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2012-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2014  Kouhei Sutou <kou@clear-code.com>
 # Copyright (C) 2010  masone (Christian Felder) <ema@rh-productions.ch>
 # Copyright (C) 2009  Masao Mutoh
 #
@@ -375,6 +375,52 @@ EOP
     end
 
     class TestOptions < self
+      class TestIncludeTranslatorComment < self
+        def setup
+          @entry = GetText::POEntry.new(:normal)
+          @entry.msgid = "hello"
+          @entry.translator_comment = "translator comment"
+        end
+
+        def test_default
+          assert_equal(<<-PO, @entry.to_s)
+# translator comment
+msgid "hello"
+msgstr ""
+          PO
+        end
+
+        def test_false
+          assert_equal(<<-PO, @entry.to_s(:include_translator_comment => false))
+msgid "hello"
+msgstr ""
+          PO
+        end
+      end
+
+      class TestIncludeExtractedComment < self
+        def setup
+          @entry = GetText::POEntry.new(:normal)
+          @entry.msgid = "hello"
+          @entry.extracted_comment = "extracted comment"
+        end
+
+        def test_default
+          assert_equal(<<-PO, @entry.to_s)
+#. extracted comment
+msgid "hello"
+msgstr ""
+          PO
+        end
+
+        def test_false
+          assert_equal(<<-PO, @entry.to_s(:include_extracted_comment => false))
+msgid "hello"
+msgstr ""
+          PO
+        end
+      end
+
       class TestIncludeReferenceComment < self
         def setup
           @entry = GetText::POEntry.new(:normal)
@@ -398,6 +444,95 @@ msgstr ""
         end
       end
 
+      class TestIncludeFlagComment < self
+        def setup
+          @entry = GetText::POEntry.new(:normal)
+          @entry.msgid = "hello"
+          @entry.flag = "fuzzy"
+        end
+
+        def test_default
+          assert_equal(<<-PO, @entry.to_s)
+#, fuzzy
+msgid "hello"
+msgstr ""
+          PO
+        end
+
+        def test_false
+          assert_equal(<<-PO, @entry.to_s(:include_flag_comment => false))
+msgid "hello"
+msgstr ""
+          PO
+        end
+      end
+
+      class TestIncludePreviousComment < self
+        def setup
+          @entry = GetText::POEntry.new(:normal)
+          @entry.msgid = "hello"
+          @entry.previous = "msgid \"Hello\""
+        end
+
+        def test_default
+          assert_equal(<<-PO, @entry.to_s)
+#| msgid "Hello"
+msgid "hello"
+msgstr ""
+          PO
+        end
+
+        def test_false
+          assert_equal(<<-PO, @entry.to_s(:include_previous_comment => false))
+msgid "hello"
+msgstr ""
+          PO
+        end
+      end
+
+      class TestIncludeAllComments < self
+        def setup
+          @entry = GetText::POEntry.new(:normal)
+          @entry.msgid = "hello"
+          @entry.translator_comment = "translator comment"
+          @entry.extracted_comment = "extracted comment"
+          @entry.references = ["hello.rb:1"]
+          @entry.flag = "fuzzy"
+          @entry.previous = "msgid \"Hello\""
+        end
+
+        def test_default
+          assert_equal(<<-PO, @entry.to_s)
+# translator comment
+#. extracted comment
+#: hello.rb:1
+#, fuzzy
+#| msgid "Hello"
+msgid "hello"
+msgstr ""
+          PO
+        end
+
+        def test_false
+          assert_equal(<<-PO, @entry.to_s(:include_all_comments => false))
+msgid "hello"
+msgstr ""
+          PO
+        end
+
+        def test_false_with_other_include
+          options = {
+            :include_reference_comment => true,
+            :include_all_comments      => false,
+          }
+          assert_equal(<<-PO, @entry.to_s(options))
+#: hello.rb:1
+msgid "hello"
+msgstr ""
+          PO
+        end
+      end
+
       class TestEncoding < self
         def setup
           @entry = GetText::POEntry.new(:normal)
@@ -473,6 +608,19 @@ msgstr ""
         assert_false(entry.obsolete?)
       end
     end
+
+    class TestFuzzy < self
+      def test_fuzzy_flag
+        entry = GetText::POEntry.new(:normal)
+        entry.flag = "fuzzy"
+        assert_true(entry.fuzzy?)
+      end
+
+      def test_no_fuzzy_flag
+        entry = GetText::POEntry.new(:normal)
+        assert_false(entry.fuzzy?)
+      end
+    end
   end
 
   class TestFormatter < self
@@ -518,29 +666,37 @@ msgstr ""
         assert_equal(expected_message, format_message(message))
       end
 
+      def test_one_line_with_newline
+        message = "line\n"
+        assert_equal(<<-FORMATTED_MESSAGE, format_message(message))
+""
+"line\\n"
+        FORMATTED_MESSAGE
+      end
+
       def test_wrap
-        message = "long line\n"
+        message = "long line"
         assert_equal(<<-MESSAGE, format_message(message, :max_line_width => 4))
 ""
 "long"
 " lin"
-"e\\n"
+"e"
         MESSAGE
       end
 
       def test_disable_wrap
-        message = "long line\n"
+        message = "long line"
         assert_equal(<<-MESSAGE, format_message(message, :max_line_width => 0))
-"long line\\n"
+"long line"
         MESSAGE
       end
 
       def test_multilines_disable_wrap
-        message = "long\nline\n"
+        message = "long\nline"
         assert_equal(<<-MESSAGE, format_message(message, :max_line_width => 0))
 ""
 "long\\n"
-"line\\n"
+"line"
         MESSAGE
       end
 

data/test/tools/test_msgcat.rb

@@ -0,0 +1,397 @@
+# Copyright (C) 2014  Kouhei Sutou <kou@clear-code.com>
+#
+# License: Ruby's or LGPL
+#
+# This library is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# 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 "stringio"
+require "tempfile"
+
+require "gettext/tools/msgcat"
+
+class TestToolsMsgCat < Test::Unit::TestCase
+  private
+  def run_msgcat(input_pos, *options)
+    inputs = input_pos.collect do |po|
+      input = Tempfile.new("msgcat-input")
+      input.write(po)
+      input.close
+      input
+    end
+    output = Tempfile.new("msgcat-output")
+    command_line = ["--output", output.path]
+    command_line.concat(options)
+    command_line.concat(inputs.collect(&:path))
+    @stdout, @stderr = capture_output do
+      GetText::Tools::MsgCat.run(*command_line)
+    end
+    output.read
+  end
+
+  def capture_output
+    original_stdout = $stdout
+    original_stderr = $stderr
+    begin
+      stdout = StringIO.new
+      stderr = StringIO.new
+      $stdout = stdout
+      $stderr = stderr
+      yield
+      [stdout.string, stderr.string]
+    ensure
+      $stdout = original_stdout
+      $stderr = original_stderr
+    end
+  end
+
+  class TestHeader < self
+    def setup
+      @po1 = <<-PO
+msgid ""
+msgstr ""
+"Project-Id-Version: gettext 3.0.0\\n"
+      PO
+      @po2 = <<-PO
+msgid ""
+msgstr ""
+"Language: ja\\n"
+      PO
+    end
+
+    def test_default
+      assert_equal(@po1, run_msgcat([@po1, @po2]))
+    end
+  end
+
+  class TestNoDuplicated < self
+    class TestTranslated < self
+      def setup
+        @po1 = <<-PO
+msgid "Hello"
+msgstr "Bonjour"
+        PO
+
+        @po2 = <<-PO
+msgid "World"
+msgstr "Monde"
+        PO
+      end
+
+      def test_default
+        assert_equal(<<-PO.chomp, run_msgcat([@po1, @po2]))
+#{@po1}
+#{@po2}
+        PO
+      end
+    end
+  end
+
+  class TestDuplicated < self
+    class TestTranslated < self
+      class TestSame < self
+        def setup
+          @po = <<-PO
+msgid "Hello"
+msgstr "Bonjour"
+          PO
+        end
+
+        def test_default
+          assert_equal(@po, run_msgcat([@po, @po]))
+        end
+      end
+
+      class TestDifferent < self
+        def setup
+          @po1 = <<-PO
+msgid "Hello"
+msgstr "Bonjour"
+          PO
+
+          @po2 = <<-PO
+msgid "Hello"
+msgstr "Salut"
+          PO
+        end
+
+        def test_default
+          assert_equal(@po1, run_msgcat([@po1, @po2]))
+        end
+      end
+    end
+  end
+
+  class TestSort < self
+    class TestByMsgid < self
+      def setup
+        @po_alice = <<-PO
+msgid "Alice"
+msgstr ""
+        PO
+
+        @po_bob = <<-PO
+msgid "Bob"
+msgstr ""
+        PO
+
+        @po_charlie = <<-PO
+msgid "Charlie"
+msgstr ""
+        PO
+      end
+
+      def test_sort_by_msgid
+        sorted_po = <<-PO.chomp
+#{@po_alice}
+#{@po_bob}
+#{@po_charlie}
+        PO
+        assert_equal(sorted_po,
+                     run_msgcat([@po_charlie, @po_bob, @po_alice],
+                                "--sort-by-msgid"))
+      end
+
+      def test_sort_output
+        sorted_po = <<-PO.chomp
+#{@po_alice}
+#{@po_bob}
+#{@po_charlie}
+        PO
+        assert_equal(sorted_po,
+                     run_msgcat([@po_charlie, @po_bob, @po_alice],
+                                "--sort-output"))
+      end
+
+      def test_no_sort_output
+        not_sorted_po = <<-PO.chomp
+#{@po_charlie}
+#{@po_bob}
+#{@po_alice}
+        PO
+        assert_equal(not_sorted_po,
+                     run_msgcat([@po_charlie, @po_bob, @po_alice],
+                                "--no-sort-output"))
+      end
+    end
+
+    class TestByReference < self
+      def setup
+        @po_a1 = <<-PO
+#: a.rb:1
+msgid "Hello 3"
+msgstr ""
+        PO
+
+        @po_a2 = <<-PO
+#: a.rb:2
+msgid "Hello 2"
+msgstr ""
+        PO
+
+        @po_b1 = <<-PO
+#: b.rb:1
+msgid "Hello 1"
+msgstr ""
+        PO
+      end
+
+      def test_sort_by_location
+        sorted_po = <<-PO.chomp
+#{@po_a1}
+#{@po_a2}
+#{@po_b1}
+        PO
+        assert_equal(sorted_po,
+                     run_msgcat([@po_b1, @po_a2, @po_a1],
+                                "--sort-by-location"))
+      end
+
+      def test_sort_by_file
+        sorted_po = <<-PO.chomp
+#{@po_a1}
+#{@po_a2}
+#{@po_b1}
+        PO
+        assert_equal(sorted_po,
+                     run_msgcat([@po_b1, @po_a2, @po_a1],
+                                "--sort-by-file"))
+      end
+    end
+  end
+
+  class TestComment < self
+    class TestReference < self
+      def setup
+        @po = <<-PO
+# translator comment
+#: a.rb:1
+msgid "Hello"
+msgstr ""
+        PO
+      end
+
+      def test_no_location
+        assert_equal(<<-PO, run_msgcat([@po], "--no-location"))
+# translator comment
+msgid "Hello"
+msgstr ""
+        PO
+      end
+    end
+
+    class TestAll < self
+      def setup
+        @po = <<-PO
+# translator comment
+#. extracted comment
+#: hello.rb:1
+#, c-format
+#| msgid "Hello"
+msgid "Hello"
+msgstr ""
+        PO
+      end
+
+      def test_no_all_comments
+        assert_equal(<<-PO, run_msgcat([@po], "--no-all-comments"))
+msgid "Hello"
+msgstr ""
+        PO
+      end
+    end
+  end
+
+  class TestWidth < self
+    def setup
+      @po = <<-PO
+msgid "long long long long long long long long long long long long long long long line"
+msgstr ""
+      PO
+    end
+
+    def test_default
+      assert_equal(<<-PO, run_msgcat([@po]))
+msgid ""
+"long long long long long long long long long long long long long long long lin"
+"e"
+msgstr ""
+      PO
+    end
+
+    def test_width
+      assert_equal(<<-PO, run_msgcat([@po], "--width=40"))
+msgid ""
+"long long long long long long long long "
+"long long long long long long long line"
+msgstr ""
+      PO
+    end
+
+
+    def test_wrap
+      assert_equal(<<-PO, run_msgcat([@po], "--wrap"))
+msgid ""
+"long long long long long long long long long long long long long long long lin"
+"e"
+msgstr ""
+      PO
+    end
+
+    def test_no_wrap
+      assert_equal(<<-PO, run_msgcat([@po], "--no-wrap"))
+msgid "long long long long long long long long long long long long long long long line"
+msgstr ""
+      PO
+    end
+  end
+
+  class TestFuzzy < self
+    class TestAllFuzzy < self
+      def setup
+        @po_fuzzy1 = <<-PO
+#, fuzzy
+msgid "Hello"
+msgstr "Bonjour1"
+        PO
+
+        @po_fuzzy2 = <<-PO
+#, fuzzy
+msgid "Hello"
+msgstr "Bonjour2"
+        PO
+      end
+
+      def test_default
+        assert_equal(<<-PO, run_msgcat([@po_fuzzy1, @po_fuzzy2]))
+#, fuzzy
+msgid "Hello"
+msgstr "Bonjour1"
+        PO
+      end
+
+      def test_no_fuzzy
+        assert_equal("", run_msgcat([@po_fuzzy1, @po_fuzzy2], "--no-fuzzy"))
+      end
+    end
+
+    class TestHaveNoFuzzy < self
+      def setup
+        @po_fuzzy = <<-PO
+#, fuzzy
+msgid "Hello"
+msgstr "Bonjour1"
+        PO
+
+        @po_not_fuzzy = <<-PO
+msgid "Hello"
+msgstr "Bonjour2"
+        PO
+      end
+
+      def test_default
+        assert_equal(<<-PO, run_msgcat([@po_fuzzy, @po_not_fuzzy]))
+msgid "Hello"
+msgstr "Bonjour2"
+        PO
+      end
+
+      def test_no_fuzzy
+        assert_equal(<<-PO, run_msgcat([@po_fuzzy, @po_not_fuzzy], "--no-fuzzy"))
+msgid "Hello"
+msgstr "Bonjour2"
+        PO
+      end
+    end
+  end
+
+  class TestWarning < self
+    def setup
+      @po_fuzzy = <<-PO
+#, fuzzy
+msgid "Hello World"
+msgstr "Bonjour"
+      PO
+    end
+
+    def test_default
+      run_msgcat([@po_fuzzy])
+      assert_not_empty(@stderr)
+    end
+
+    def test_no_report_warning
+      run_msgcat([@po_fuzzy], "--no-report-warning")
+      assert_empty(@stderr)
+    end
+  end
+end