PoParser 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59e498594dd8ffa5a2798c285b7c783ba6befc1a
-  data.tar.gz: ec33eca7c0eccef3ab3141974ea0ac953ce6c5be
+  metadata.gz: 529c54e8854a295bac23c8873ecb6111d85b421f
+  data.tar.gz: 76dfc88f971f62fc0f469835ab70e8730d8d4fbc
 SHA512:
-  metadata.gz: a063630a9cb8ccc1e105106d3b4a95fd3705880d0a688787e736f168b82669a48b4a58eb8a0dea10511a75758bca6eb454c2c46db7e9dda0405ab026ff0d3aae
-  data.tar.gz: e8edf326ef72caa6d612c618f2283ebeb37602bb16a36cabbc34402769e8160228d1be3fb2d41815a29919a868b48a3f73abb91a1af8d7e46d7ff1947db7889f
+  metadata.gz: 1cbf07f2d14cddf89616a40028c73bc4cb828b3f1b74500477fc351b1852a1612b0fcca17410335201db1a514d2aa24ab7711ff30f1d38859b31457cf1802c1a
+  data.tar.gz: 9c873d0bf1c394b5d0e1806938770a5c0ec494ec624f226673076890884a0cf60a7ed342ffd5b5011fab64bbb55558e3943d45d22de66c8090cd1c0bf7e8b7f0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+3.1.0 / 2017-06-04
+==================
+
+  * parse content of obsolete entries (#19)
+
 3.0.1 / 2017-06-01
 ==================
 

data/lib/poparser/comment.rb

@@ -5,13 +5,16 @@ module PoParser
     def initialize(type, value)
       @type = type
       @value  = value
+
+      if @type.to_s =~ /^previous_/ # these behave more like messages
+        remove_empty_line
+      end
     end
 
     def to_s(with_label = false)
       return to_str unless with_label
       if @value.is_a? Array
         if @type.to_s =~ /^previous_/ # these behave more like messages
-          remove_empty_line
           string = ["#{COMMENTS_LABELS[@type]} \"\"\n"]
           @value.each do |str|
             string << "#| \"#{str}\"\n".gsub(/[\p{Blank}]+$/, '')

data/lib/poparser/entry.rb

@@ -23,6 +23,13 @@ module PoParser
       # alias for backward compatibility of this typo
       self.class.send(:alias_method, :refrence, :reference)
       self.class.send(:alias_method, :refrence=, :reference=)
+      if self.obsolete?
+        obsolete_content = SimplePoParser.parse_message(obsolete.value.join("\n").gsub(/^\|/, "#|"))
+        obsolete_content.each do |name, value|
+          raise(ArgumentError, "Unknown label #{name}") if !valid_label? name
+          set_instance_variable(name, value)
+        end
+      end
     end
 
     # If entry doesn't have any msgid, it's probably a obsolete entry that is

data/lib/poparser/po.rb

@@ -86,7 +86,7 @@ module PoParser
         entry.obsolete?
       end
     end
-    alias_method :obsolete, :obsolete
+    alias_method :cached, :obsolete
 
     # Count of all entries without counting obsolete entries
     #

data/lib/poparser/version.rb

@@ -1,3 +1,3 @@
 module PoParser
-  VERSION = "3.0.1"
+  VERSION = "3.1.0"
 end

data/spec/poparser/entry_spec.rb

@@ -110,7 +110,7 @@ describe PoParser::Entry do
   context 'obsolete' do
     before do
       @entry = PoParser::Entry.new
-      @entry.obsolete = '#~ msgid "a obsolete entry"'
+      @entry.obsolete = ['#~ msgid "a obsolete entry"', '#~ msgstr ""']
       @entry.flag = 'Fuzzy'
     end
 
@@ -130,5 +130,21 @@ describe PoParser::Entry do
     it 'shouldn\'t mark it as fuzzy' do
       expect(@entry.fuzzy?).to be_falsy
     end
+
+    it 'should further parse the obsolete content' do
+      path = Pathname.new('spec/poparser/fixtures/complex_obsolete.po').realpath
+      @po = PoParser::Tokenizer.new.extract_entries(path)
+      obsolete_entry = @po.obsolete.first
+      expect(obsolete_entry.obsolete?).to be_truthy
+      expect(obsolete_entry.msgctxt.value).to eq('Context')
+      expect(obsolete_entry.msgid.value).to eq('msgid')
+      expect(obsolete_entry.msgid_plural.value).to eq(['multiline msgid_plural\n', ''])
+      expect(obsolete_entry.previous_msgctxt.value).to eq('previous context')
+      expect(obsolete_entry.previous_msgid.value).to eq(
+        ['multiline\n', 'previous messageid']
+      )
+      expect(obsolete_entry.previous_msgid_plural.value).to eq('previous msgid_plural')
+    end
+
   end
 end

data/spec/poparser/fixtures/complex_obsolete.po

@@ -0,0 +1,21 @@
+# translator-comment
+#
+#. extract
+#: reference1
+#: reference2
+#, flag
+#~| msgctxt "previous context"
+#~| msgid ""
+#~| "multiline\n"
+#~| "previous messageid"
+#~| msgid_plural "previous msgid_plural"
+#~ msgctxt "Context"
+#~ msgid "msgid"
+#~ msgid_plural ""
+#~ "multiline msgid_plural\n"
+#~ ""
+#~ msgstr[0] "msgstr 0"
+#~ msgstr[1] ""
+#~ "msgstr 1 multiline 1\n"
+#~ "msgstr 1 line 2\n"
+#~ msgstr[2] "msgstr 2"

data/spec/poparser/po_spec.rb

@@ -41,7 +41,7 @@ describe PoParser::Po do
 
   it 'returns all obsolete strings' do
     entry2, entry3 = entry.dup, entry.dup
-    [entry2, entry3].each { |en| en[:obsolete] = 'test' }
+    [entry2, entry3].each { |en| en[:obsolete] = ['msgid "test"', 'msgstr "test"'] }
     @po << [entry, entry2, entry3]
     expect(@po.obsolete.size).to eq 2
   end
@@ -60,7 +60,7 @@ describe PoParser::Po do
 
   it 'shouldn\'t count obsolete entries' do
     @po << entry
-    obsolete = { obsolete: 'sth', flag: 'Fuzzy' }
+    obsolete = { obsolete: ['msgid "sth"', 'msgstr "sth"'], flag: 'Fuzzy' }
     @po << obsolete
     expect(@po.size).to eq(1)
   end
@@ -124,4 +124,5 @@ describe PoParser::Po do
         }.to raise_error(RuntimeError, "Duplicate entry, header was already instantiated")
     end
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: PoParser
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Arash Mousavi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-01 00:00:00.000000000 Z
+date: 2017-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_po_parser
@@ -81,6 +81,7 @@ files:
 - poparser.gemspec
 - spec/poparser/comment_spec.rb
 - spec/poparser/entry_spec.rb
+- spec/poparser/fixtures/complex_obsolete.po
 - spec/poparser/fixtures/header.po
 - spec/poparser/fixtures/header_error.po
 - spec/poparser/fixtures/multiline.po
@@ -126,6 +127,7 @@ summary: A PO file parser, editor and generator.
 test_files:
 - spec/poparser/comment_spec.rb
 - spec/poparser/entry_spec.rb
+- spec/poparser/fixtures/complex_obsolete.po
 - spec/poparser/fixtures/header.po
 - spec/poparser/fixtures/header_error.po
 - spec/poparser/fixtures/multiline.po