polint 0.2.0 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d183c6f2819c7036fef793ace5644f76349b3f24
-  data.tar.gz: e8a9bcda101105ce78e492790021fae4643cc015
+SHA256:
+  metadata.gz: f744d2e7bb0a9fc647d2c748156c429eaafd19a3a64be8108d014847036692db
+  data.tar.gz: b59ef6a71f426e6e450965cf310b2d266876f7324428c2ffe1f6500692316b27
 SHA512:
-  metadata.gz: 0dbb533fad098c6a220f317b8e88c910e2c80fa8fee04902b934c0f067b66d1f278b77c99319d1f3566d35329362ec5e30d22d14fada4e16b93706eb5b002ce4
-  data.tar.gz: 14b55b4f3a1d6078fe003ff097d6a574c7a77a483b2bcc7d513d8654b565258c375715531c82ccc420753d3bb4e30cde10788986e2a57811bd259948d5c72772
+  metadata.gz: c21194377b3172e5c21d23986122edbbd7f770ecb3d8382b9243e3c85d62160b9ad34249970d3df58c57914215c55abb33bc3bbf02bf054b42f08127b1f5f003
+  data.tar.gz: 1bc81e36b32b77cde0aff2bdf4585beb42462b8b369b2533d2d7866d6767d9318f697244ce89d72611ef171f9af9d8dc7f9f4217919312f0d57b92085c50ac99

data/Gemfile.lock

@@ -1,86 +1,82 @@
 PATH
   remote: .
   specs:
-    polint (0.1.0)
-      parslet (~> 1.7, >= 1.7.1)
+    polint (0.2.3)
+      parslet (~> 1.8)
       term-ansicolor
 
 GEM
   remote: https://rubygems.org/
   specs:
-    blankslate (3.1.3)
-    byebug (9.0.5)
-    coderay (1.1.1)
-    diff-lcs (1.2.5)
-    ffi (1.9.10)
-    formatador (0.2.5)
-    guard (2.14.0)
+    byebug (11.1.3)
+    coderay (1.1.3)
+    diff-lcs (1.5.0)
+    ffi (1.15.5)
+    formatador (1.1.0)
+    guard (2.18.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
-      lumberjack (~> 1.0)
+      lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
-      pry (>= 0.9.12)
+      pry (>= 0.13.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
-    guard-rspec (4.7.2)
+    guard-rspec (4.7.3)
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    lumberjack (1.0.10)
-    method_source (0.8.2)
+    listen (3.7.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    lumberjack (1.2.8)
+    method_source (1.0.0)
     nenv (0.3.0)
-    notiffany (0.1.0)
+    notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parslet (1.7.1)
-      blankslate (>= 2.0, <= 4.0)
-    pry (0.10.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.0)
-      byebug (~> 9.0)
-      pry (~> 0.10)
-    rake (10.5.0)
-    rb-fsevent (0.9.7)
-    rb-inotify (0.9.7)
-      ffi (>= 0.5.0)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    parslet (1.8.2)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.10.1)
+      byebug (~> 11.0)
+      pry (>= 0.13, < 0.15)
+    rake (13.0.6)
+    rb-fsevent (0.11.1)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    ruby_dep (1.3.1)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
     shellany (0.0.1)
-    slop (3.6.0)
-    term-ansicolor (1.3.2)
+    sync (0.5.0)
+    term-ansicolor (1.7.1)
       tins (~> 1.0)
-    thor (0.19.1)
-    tins (1.10.2)
+    thor (1.2.1)
+    tins (1.31.1)
+      sync
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
-  bundler (~> 1.7)
+  bundler (~> 2.3)
   guard-rspec
   polint!
   pry-byebug
-  rake (~> 10.0)
+  rake (~> 13.0)
 
 BUNDLED WITH
-   1.12.5
+   2.3.6

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) }
@@ -42,10 +43,14 @@ module Polint
     rule(:index) { str('[') >> match(/[0-9]/).repeat(1).as(:index) >> str(']') }
     rule(:msgstr) { str('msgstr') >> (index.maybe >> lwsp >> quoted_strings).as(:msgstr) }
 
-    rule(:translation) { (comments >> msgid >> msgid_plural.maybe >> msgstr.repeat(1)).as(:translation) >> blank_line }
+    rule(:translation) { (comments >> msgid >> msgid_plural.repeat(0, 1) >> 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) { (comment.repeat >> obsolete_line.repeat(1).as(:text)).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.3"
 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/polint.gemspec

@@ -17,11 +17,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2.3"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "guard-rspec"
 
   spec.add_dependency "term-ansicolor"
-  spec.add_dependency "parslet", "~> 1.7", ">= 1.7.1"
+  spec.add_dependency "parslet", "~> 1.8"
 end

data/spec/data/en-valid.po

@@ -16,3 +16,10 @@ msgid "Hello World Plural"
 msgid_plural "Hello %{n} Worlds Plural"
 msgstr[0] "Hello World Plural"
 msgstr[1] "Hello %{n} Worlds Plural"
+
+# comment on obsolete translation
+#~ 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 }
 
@@ -207,6 +231,25 @@ RSpec.describe Polint::Parser do
       }
     end
 
+    context 'when matching without comments' do
+      let(:lines) {
+        [
+          'msgid "Hello World"',
+          'msgid_plural "Hello %{n} Worlds"',
+          'msgstr[0] "Hello World"',
+          'msgstr[1] "Hello %{n} Worlds"'
+        ]
+      }
+      it {
+        expect(tree).to eq translation: [
+          { msgid: [{ quoted_string: 'Hello World' }] },
+          { msgid_plural: [{ quoted_string: 'Hello %{n} Worlds' }] },
+          { msgstr: [{ index: '0' }, { quoted_string: 'Hello World' }] },
+          { msgstr: [{ index: '1' }, { quoted_string: 'Hello %{n} Worlds' }] }
+        ]
+      }
+    end
+
     # TODO: Multiline strings and negative cases
   end
 
@@ -255,4 +298,25 @@ 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) {
+        [
+          '# comment on obsolete translation',
+          '#~ msgid "Hello World"',
+          '#~ msgstr "Hello World"'
+        ]
+      }
+      it {
+        expect(tree).to eq obsolete_translation: [
+          { comment: 'comment on obsolete translation' },
+          { text: %{#~ msgid "Hello World"\n#~ msgstr "Hello World"} }
+        ]
+      }
+    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,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: polint
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.3
 platform: ruby
 authors:
 - Julien Letessier
 - Greg Beech
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-06-22 00:00:00.000000000 Z
+date: 2022-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -87,21 +87,15 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.1
-description: 
+        version: '1.8'
+description:
 email:
 - julien.letessier@gmail.com
 - greg@gregbeech.com
@@ -136,7 +130,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -151,9 +145,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: A linter for Uniforum PO files.
 test_files: