polint 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d183c6f2819c7036fef793ace5644f76349b3f24
-  data.tar.gz: e8a9bcda101105ce78e492790021fae4643cc015
+  metadata.gz: 230c13623db8e5c272c96404b565e76d1149e11b
+  data.tar.gz: 8d70271797b9a0342001833308874f11e8b24ed7
 SHA512:
-  metadata.gz: 0dbb533fad098c6a220f317b8e88c910e2c80fa8fee04902b934c0f067b66d1f278b77c99319d1f3566d35329362ec5e30d22d14fada4e16b93706eb5b002ce4
-  data.tar.gz: 14b55b4f3a1d6078fe003ff097d6a574c7a77a483b2bcc7d513d8654b565258c375715531c82ccc420753d3bb4e30cde10788986e2a57811bd259948d5c72772
+  metadata.gz: d7d72c3db3edbcc9d4bf52a18bcb316206361f0e28f0e8fcdd80e0f5d2e24ff5c59a48bb0e50546dc56218715d7c2c76a09cb6f5bf182c83ea1995fd78ff9f4f
+  data.tar.gz: 279c37ba16b2dfb3ba1eea26645c9a44a05002c10ba2f1ae9e628351c617e19413a04065f14302f026e21eac43fca42e0e26841c81c17fd5b9d468b510274a7c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    polint (0.1.0)
+    polint (0.2.1)
       parslet (~> 1.7, >= 1.7.1)
       term-ansicolor
 

data/lib/polint/parser.rb

@@ -33,7 +33,8 @@ module Polint
     rule(:flag) { str(',') >> lwsp >> match(/[a-z\-]/).repeat(1).as(:flag) >> lwsp }
     rule(:flag_comment) { start_comment >> flag.repeat(1).as(:flags) >> endl }
     rule(:reference_comment) { start_comment >> str(':') >> lwsp >> match(/[^\n]/).repeat.as(:reference) >> endl }
-    rule(:comment) { flag_comment | reference_comment }
+    rule(:unparsed_comment) { start_comment >> (match(/[^~]/) >> lwsp >> match(/[^\n]/).repeat).as(:comment) >> endl }
+    rule(:comment) { flag_comment | reference_comment | unparsed_comment }
     rule(:comments) { comment.repeat }
 
     rule(:msgid) { str('msgid') >> lwsp >> quoted_strings.as(:msgid) }
@@ -45,7 +46,11 @@ module Polint
     rule(:translation) { (comments >> msgid >> msgid_plural.maybe >> msgstr.repeat(1)).as(:translation) >> blank_line }
     rule(:translations) { translation.repeat }
 
-    rule(:file) { (headers >> translations).as(:file) }
+    rule(:obsolete_line) { start_comment >> str('~') >> lwsp >> match(/[^\n]/).repeat >> endl }
+    rule(:obsolete_translation) { obsolete_line.repeat(1).as(:obsolete_translation) >> blank_line }
+    rule(:obsolete_translations) { obsolete_translation.repeat }
+
+    rule(:file) { (headers >> translations >> obsolete_translations).as(:file) }
     root(:file)
 
   end

data/lib/polint/transform.rb

@@ -16,12 +16,12 @@ module Polint
       { headers: items.to_h }
     end
 
-    rule(msgid: sequence(:items)) { { msgid: { text: items.join("\n") } } }
-    rule(msgid_plural: sequence(:items)) { { msgid_plural: { text: items.join("\n") } } }
+    rule(msgid: sequence(:items)) { { msgid: { text: items.join } } }
+    rule(msgid_plural: sequence(:items)) { { msgid_plural: { text: items.join } } }
     rule(msgstr: subtree(:items)) do
       msgstr = {}
       msgstr[:index] = items.shift[:index].to_i if items.first.is_a?(Hash)
-      msgstr[:text] = items.join("\n")
+      msgstr[:text] = items.join
       { msgstr: msgstr }
     end
 
@@ -29,6 +29,7 @@ module Polint
       translation = {
         flags: [],
         references: [],
+        comments: [],
         msgid: {},
         msgid_plural: {},
         msgstrs: []
@@ -38,6 +39,7 @@ module Polint
         case k
         when :flags then translation[:flags] |= v
         when :reference then translation[:references] << v
+        when :comment then translation[:comments] << v
         when :msgid, :msgid_plural then translation[k] = v
         when :msgstr then translation[:msgstrs] << v
         end

data/lib/polint/version.rb

@@ -1,3 +1,3 @@
 module Polint
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/polint.rb

@@ -120,7 +120,7 @@ module Polint
       tree = Polint::Parser.new.parse(data)
       tree = Polint::Transform.new.apply(tree)
 
-      die 'No Plural-Forms header found' unless tree[:headers].key?('Plural-Forms')
+      die "The PO file '#{@pofile}' has no Plural-Forms header, aborting." unless tree[:headers].key?('Plural-Forms')
       nplurals = tree[:headers]['Plural-Forms'][:nplurals]
 
       tree[:translations].each do |translation|
@@ -150,7 +150,7 @@ module Polint
         end
       end
     rescue Parslet::ParseFailed => e
-      die e.cause.ascii_tree
+      die "The PO file '#{@pofile}' cannot be parsed, aborting.\n\n#{e.cause.ascii_tree}"
     end
 
     # Check for errors in a key/translation pair.

data/spec/data/en-valid.po

@@ -16,3 +16,9 @@ msgid "Hello World Plural"
 msgid_plural "Hello %{n} Worlds Plural"
 msgstr[0] "Hello World Plural"
 msgstr[1] "Hello %{n} Worlds Plural"
+
+#~ msgid "Obsolete Translation"
+#~ msgstr "Obsolete Translation"
+
+#~ msgid "Another Obsolete Translation"
+#~ msgstr "Another Obsolete Translation"

data/spec/lib/polint/parser_spec.rb

@@ -89,6 +89,30 @@ RSpec.describe Polint::Parser do
     end
   end
 
+  describe 'rule(:unparsed_comment)' do
+    let(:rule) { :unparsed_comment }
+
+    context 'when matching a translator comment' do
+      let(:line) { '# no semantics here' }
+      it { expect(tree).to eq comment: ' no semantics here' }
+    end
+
+    context 'when matching an extracted comment' do
+      let(:line) { '#. no semantics here' }
+      it { expect(tree).to eq comment: '. no semantics here' }
+    end
+
+    context 'when matching a previous translation comment' do
+      let(:line) { '#| no semantics here' }
+      it { expect(tree).to eq comment: '| no semantics here' }
+    end
+
+    context 'when matching an obsolete translation' do
+      let(:line) { '#~ obsolete things go here' }
+      it { expect{ tree }.to raise_error Parslet::ParseFailed }
+    end
+  end
+
   describe 'rule(:msgid)' do
     let(:rule) { :msgid }
 
@@ -255,4 +279,21 @@ RSpec.describe Polint::Parser do
     end
   end
 
+  describe 'rule(:obsolete_translation)' do
+    let(:rule) { :obsolete_translation }
+    let(:line) { lines.join("\n") }
+
+    context 'when matching a singular single-line msgstr with comments' do
+      let(:lines) {
+        [
+          '#~ msgid "Hello World"',
+          '#~ msgstr "Hello World"'
+        ]
+      }
+      it {
+        expect(tree).to eq obsolete_translation: line
+      }
+    end
+  end
+
 end

data/spec/lib/polint/transform_spec.rb

@@ -37,10 +37,11 @@ RSpec.describe Polint::Transform do
           { flags: [{ flag: 'fuzzy' }] },
           { reference: '../../some_file.rb:34' },
           { reference: '../../some_other_file.rb:283' },
-          { msgid: [{ quoted_string: [] }, { quoted_string: 'Hello World' }, { quoted_string: 'Hello Again'}] },
-          { msgid_plural: [{ quoted_string: [] }, { quoted_string: 'Hello %{n} Worlds' }, { quoted_string: 'Hello Again'}] },
-          { msgstr: [{ index: '0' }, { quoted_string: [] }, { quoted_string: 'Hello World' }, { quoted_string: 'Hello Again'}] },
-          { msgstr: [{ index: '1' }, { quoted_string: [] }, { quoted_string: 'Hello %{n} Worlds' }, { quoted_string: 'Hello Again'}] }
+          { comment: 'arbitrary text' },
+          { msgid: [{ quoted_string: [] }, { quoted_string: 'Hello World\\n' }, { quoted_string: 'Hello Again'}] },
+          { msgid_plural: [{ quoted_string: [] }, { quoted_string: 'Hello %{n} Worlds\\n' }, { quoted_string: 'Hello Again'}] },
+          { msgstr: [{ index: '0' }, { quoted_string: [] }, { quoted_string: 'Hello World\\n' }, { quoted_string: 'Hello Again'}] },
+          { msgstr: [{ index: '1' }, { quoted_string: [] }, { quoted_string: 'Hello %{n} Worlds\\n' }, { quoted_string: 'Hello Again'}] }
         ]
       }
     }
@@ -48,11 +49,12 @@ RSpec.describe Polint::Transform do
       expect(output).to eq translation: {
         flags: [:fuzzy],
         references: ['../../some_file.rb:34', '../../some_other_file.rb:283'],
-        msgid: { text: "\nHello World\nHello Again" },
-        msgid_plural: { text: "\nHello %{n} Worlds\nHello Again" },
+        comments: ['arbitrary text'],
+        msgid: { text: 'Hello World\\nHello Again' },
+        msgid_plural: { text: 'Hello %{n} Worlds\\nHello Again' },
         msgstrs: [
-          { index: 0, text: "\nHello World\nHello Again" },
-          { index: 1, text: "\nHello %{n} Worlds\nHello Again" }
+          { index: 0, text: 'Hello World\\nHello Again' },
+          { index: 1, text: 'Hello %{n} Worlds\\nHello Again' }
         ]
       }
     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polint
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Julien Letessier
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A linter for Uniforum PO files.