gettext 3.4.0 → 3.4.3

data/test/test_parser.rb

@@ -24,6 +24,7 @@
 require "tempfile"
 require "gettext/tools/parser/ruby"
 require "gettext/tools/parser/erb"
+require "gettext/tools/parser/erubi"
 
 require "gettext/tools/xgettext"
 
@@ -215,6 +216,67 @@ class TestGetTextParser < Test::Unit::TestCase
 
       assert_target("Hello", ["#{path}:8"])
     end
+
+    def test_case
+      path = fixture_path("erb", "case.rhtml")
+      @ary = GetText::ErbParser.parse(path)
+
+      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0')
+        assert_target("Hello", ["#{path}:11"])
+        assert_target("World", ["#{path}:14"])
+      else
+        assert_target("Hello", ["#{path}:11"])
+        assert_nil(@ary.detect {|elem| elem.msgid == 'World'}) # Not detected. see PR #91
+      end
+    end
+  end
+
+  class TestErubiParser < self
+    include Helper::Path
+
+    def test_detect_encoding
+      euc_file = Tempfile.new("euc-jp.rhtml")
+      euc_file.open
+      euc_file.puts("<%#-*- coding: euc-jp -*-%>")
+      euc_file.close
+
+      euc_file_content = File.read(euc_file.path)
+      encoding = GetText::ErubiParser.new(euc_file.path).detect_encoding(euc_file_content)
+
+      assert_equal("EUC-JP", encoding)
+    end
+
+    def test_ascii
+      path = fixture_path("erb", "ascii.rhtml")
+      @ary = GetText::ErubiParser.parse(path)
+
+      assert_target 'aaa', ["#{path}:8"]
+      assert_target "aaa\n", ["#{path}:11"]
+      assert_target 'bbb', ["#{path}:12"]
+      assert_plural_target "ccc1", "ccc2", ["#{path}:13"]
+    end
+
+    def test_non_ascii
+      path = fixture_path("erb", "non_ascii.rhtml")
+      @ary = GetText::ErubiParser.parse(path)
+
+      assert_target('わたし', ["#{path}:12"])
+    end
+
+    def test_minus
+      path = fixture_path("erb", "minus.rhtml")
+      @ary = GetText::ErubiParser.parse(path)
+
+      assert_target("Hello", ["#{path}:8"])
+    end
+
+    def test_case
+      path = fixture_path("erb", "case.rhtml")
+      @ary = GetText::ErubiParser.parse(path)
+
+      assert_target("Hello", ["#{path}:11"])
+      assert_target("World", ["#{path}:14"]) # Detected with Erubi
+    end
   end
 
   def test_xgettext_parse

data/test/tools/test_xgettext.rb

@@ -118,6 +118,91 @@ EOP
     end
   end
 
+  class TestParser < self
+    # Default ERB parser (don't find anything after "case")
+    def test_erb
+      rhtml = <<-EOR
+<div>
+  <%= _('Hello') %>
+  <% case 1 %>
+  <% end %>
+  <%= _('World') %>
+</div>
+EOR
+
+      File.open(@rhtml_file_path, "w") do |rhtml_file|
+        rhtml_file.puts(rhtml)
+      end
+
+      @xgettext.run(
+        "--output", @pot_file_path,
+        @rhtml_file_path
+      )
+
+      pot_content = File.read(@pot_file_path)
+
+      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0')
+        expected_content = <<-EOP
+#{header}
+#: ../templates/xgettext.rhtml:2
+msgid "Hello"
+msgstr ""
+
+#: ../templates/xgettext.rhtml:5
+msgid "World"
+msgstr ""
+EOP
+      else
+        # "World" not detected. see PR #91
+        expected_content = <<-EOP
+#{header}
+#: ../templates/xgettext.rhtml:2
+msgid "Hello"
+msgstr ""
+EOP
+      end
+
+      assert_equal(expected_content, pot_content)
+    end
+
+    # Optional Erubi parser (find text after "case")
+    def test_erubi
+      rhtml = <<-EOR
+<div>
+  <%= _('Hello') %>
+  <% case 1 %>
+  <% end %>
+  <%= _('World') %>
+</div>
+EOR
+
+      File.open(@rhtml_file_path, "w") do |rhtml_file|
+        rhtml_file.puts(rhtml)
+      end
+
+      @xgettext.run(
+        "--output", @pot_file_path,
+        '--require', 'gettext/tools/parser/erubi',
+        '--parser', 'GetText::ErubiParser',
+        @rhtml_file_path
+      )
+
+      pot_content = File.read(@pot_file_path)
+      expected_content = <<-EOP
+#{header}
+#: ../templates/xgettext.rhtml:2
+msgid "Hello"
+msgstr ""
+
+#: ../templates/xgettext.rhtml:5
+msgid "World"
+msgstr ""
+EOP
+
+      assert_equal(expected_content, pot_content)
+    end
+  end
+
   class TestEncoding < self
     def test_different_encoding_from_current_locale
       rhtml = <<-EOR

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gettext
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.3
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,8 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-27 00:00:00.000000000 Z
+date: 2022-05-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: erubi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: locale
   requirement: !ruby/object:Gem::Requirement
@@ -25,6 +39,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.5
+- !ruby/object:Gem::Dependency
+  name: prime
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: text
   requirement: !ruby/object:Gem::Requirement
@@ -184,6 +212,7 @@ files:
 - lib/gettext/tools/msginit.rb
 - lib/gettext/tools/msgmerge.rb
 - lib/gettext/tools/parser/erb.rb
+- lib/gettext/tools/parser/erubi.rb
 - lib/gettext/tools/parser/glade.rb
 - lib/gettext/tools/parser/gtk_builder_ui_definitions.rb
 - lib/gettext/tools/parser/ruby.rb
@@ -1531,6 +1560,7 @@ files:
 - test/fixtures/backslash.rb
 - test/fixtures/erb/ascii.rhtml
 - test/fixtures/erb/ascii.rxml
+- test/fixtures/erb/case.rhtml
 - test/fixtures/erb/minus.rhtml
 - test/fixtures/erb/non_ascii.rhtml
 - test/fixtures/glade/2.glade
@@ -1563,6 +1593,8 @@ files:
 - test/locale/fr/LC_MESSAGES/plural_error.mo
 - test/locale/fr/LC_MESSAGES/test1.mo
 - test/locale/fr/LC_MESSAGES/test2.mo
+- test/locale/fr_BE/LC_MESSAGES/test1.mo
+- test/locale/fr_BE_Foo/LC_MESSAGES/test1.mo
 - test/locale/ir/LC_MESSAGES/plural.mo
 - test/locale/ja/LC_MESSAGES/_.mo
 - test/locale/ja/LC_MESSAGES/backslash.mo
@@ -1595,6 +1627,8 @@ files:
 - test/po/fr/plural_error.po
 - test/po/fr/test1.po
 - test/po/fr/test2.po
+- test/po/fr_BE/test1.po
+- test/po/fr_BE_Foo/test1.po
 - test/po/hello.pot
 - test/po/ir/plural.po
 - test/po/ja/_.edit.po
@@ -1677,7 +1711,8 @@ files:
 - test/tools/test_xgettext.rb
 homepage: https://ruby-gettext.github.io/
 licenses:
-- Ruby or LGPLv3+
+- Ruby
+- LGPL-3.0+
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -1694,7 +1729,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.0.dev
+rubygems_version: 3.4.0.dev
 signing_key: 
 specification_version: 4
 summary: Gettext is a pure Ruby libary and tools to localize messages.