PoParser 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8036d5aecfd813ef156edec1a8595a2351757e62
-  data.tar.gz: c5ae7091bcd9688b6222ef1b0f184092bd47fbd3
+  metadata.gz: 954ba00cb0682d03951ff75fc7de053d515a621b
+  data.tar.gz: 40d00d176527e9c4ff109cd44dd3c46c16674a42
 SHA512:
-  metadata.gz: 57d9bc1dce5ff0212d027de02621ab56a6e1f4e32a8ccec4df69d3e053457d571029098e820cb0117e7d9fc524deb9e8a0db106ceaea16a2a2b335f267ca7f22
-  data.tar.gz: efcd02494737acea74a7a773d4cd551daec9ce83d5bb672e8f72e6cf08a04d095486f95460b2d88f40d6050a611f138f5300729a8fe68c3d08038186486f84db
+  metadata.gz: 8b1635f9d67863a2ffe25c0051b3d772d3ae595f8600fe190d152524441a4f44354b1b95929ca2b47ea46526bb80a52646919796c67610d822bdc85261bf6ffe
+  data.tar.gz: 1bfa4f0d0d4df93cba148577e3b803113c627758c26e1cee69de0f823d8fbf0b82dfdd912ce7c98c7b9866dbc08a1cc6a2768f2fc4e685e7415b7aafd2d6362f

data/CHANGELOG.md

@@ -1,38 +1,54 @@
-## Version 1.0.3
-* Add `obsolete` alias for `cached` entries. Now you can use `Po#obsolete` or `Entry#obsolete?`
+1.1.0 / 2016-12-07
+==================
 
-## Version 1.0.2
-* Update dependencies
-* Handle empty lines in .po file (thanks to @roland9)
-* Fix translated strings stats
+  * fixed typo refrence, but kept it backwards compatible for entries
+  * [Header] skip empty header fields from to_s output with a warning
+  * [Parser] Allow multiple space after msgs and text
+  * added alias methods for entry accessors
 
-## Version 1.0.1
+Version 1.0.3
+=============
 
-* Update dependencies and tests
+  * Add `obsolete` alias for `cached` entries. Now you can use `Po#obsolete` or `Entry#obsolete?`
 
-## Version 1.0.0
+Version 1.0.2
+=============
 
-* add support for header entry
-* `add_entry` renamed to `add` and returns `self`
-* besides percentages, inspect of `po` now returns each entry count too
-* `po.add` now raises error if you try to add an unknown label
+  * Update dependencies
+  * Handle empty lines in .po file (thanks to @roland9)
+  * Fix translated strings stats
 
-## Version 0.2.1
+Version 1.0.1
+=============
 
-* Add search_in method.
+  * Update dependencies and tests
 
-## Version 0.2.0
+Version 1.0.0
+=============
 
-* Some entries in PO files are started with "#~", these entries are just kept by program for later use and are not counted as active entries. `PoParser` now supports them. We won't count them in stats or show them in Tanslated or Untranslated entries. They're just there.
+  * add support for header entry
+  * `add_entry` renamed to `add` and returns `self`
+  * besides percentages, inspect of `po` now returns each entry count too
+  * `po.add` now raises error if you try to add an unknown label
 
-* Added size/length methods to `PO` class. It won't count cached entries(described above).
+Version 0.2.1
+=============
 
-## Version 0.1.1
+  * Add search_in method.
 
-* Fix bug of "str" and "to_str" on Messages
-* Small refactoring
+Version 0.2.0
+=============
 
-## Version 0.1.0
+  * Some entries in PO files are started with "#~", these entries are just kept by program for later use and are not counted as active entries. `PoParser` now supports them. We won't count them in stats or show them in Tanslated or Untranslated entries. They're just there.
+  * Added size/length methods to `PO` class. It won't count cached entries(described above).
 
-* initial release
+Version 0.1.1
+=============
 
+  * Fix bug of "str" and "to_str" on Messages
+  * Small refactoring
+
+Version 0.1.0
+=============
+
+  * initial release

data/Gemfile

@@ -8,7 +8,7 @@ group :test do
 end
 
 group :development do
-  gem 'pry'
+  gem 'pry-byebug', :platforms => :mri
   gem 'guard-rspec'
 end
 

data/README.md

@@ -66,7 +66,7 @@ You can add a new entry to the PO file:
 ```ruby
 new_entry = {
               translator_comment: 'comment',
-              refrence: 'refrence comment',
+              reference: 'reference comment',
               msgid: 'untranslated',
               msgstr: 'translated string'
             }
@@ -84,7 +84,7 @@ Adding plural string is the same:
 ```ruby
 new_entry = {
               translator_comment: 'comment',
-              refrence: 'refrence comment',
+              reference: 'reference comment',
               msgid_plural: 'untranslated',
               'msgstr[0]': 'translated string',
               'msgstr[1]': 'translated string'
@@ -100,11 +100,11 @@ Each entry can have following properties (for more information see [GNU PO file
 
 ```
 translator_comment
-refrence
+reference
 extracted_comment
 flag
 previous_untraslated_string
-cached
+cached # obsolete entries
 msgid
 msgid_plural
 msgstr

data/lib/poparser/constants.rb

@@ -2,7 +2,7 @@ module PoParser
   COMMENTS_LABELS = {
     :translator_comment => '#',
     :extracted_comment => '#.',
-    :refrence => '#:',
+    :reference => '#:',
     :flag => '#,',
     :previous_untraslated_string => '#|',
     :cached => '#~'

data/lib/poparser/entry.rb

@@ -18,6 +18,11 @@ module PoParser
       define_reader_methods
 
       self.class.send(:alias_method, :translate, :msgstr=)
+      self.class.send(:alias_method, :obsolete, :cached)
+      self.class.send(:alias_method, :obsolete=, :cached=)
+      # alias for backward compatibility of this typo
+      self.class.send(:alias_method, :refrence, :reference)
+      self.class.send(:alias_method, :refrence=, :reference)
     end
 
     # If entry doesn't have any msgid, it's probably a cached entry that is

data/lib/poparser/header.rb

@@ -34,6 +34,11 @@ module PoParser
       end
       string << "msgid \"\"\nmsgstr \"\""
       configs.each do |k, v|
+        if v.nil? || v.empty?
+          puts "WARNING: \"#{k}\" header field is empty and skipped"
+          next
+        end
+
         string << "#{k}: #{v}\n".dump
       end
       string.join("\n")

data/lib/poparser/parser.rb

@@ -7,7 +7,7 @@ module PoParser
 
     # Comments
     rule(:comments) do
-      refrence |
+      reference |
       extracted_comment | flag |
       previous_untraslated_string |
       cached |
@@ -16,14 +16,14 @@ module PoParser
 
     rule(:translator_comment)         { spaced('#') >> comment_text_line.as(:translator_comment) }
     rule(:extracted_comment)          { spaced('#.') >> comment_text_line.as(:extracted_comment) }
-    rule(:refrence)                   { spaced('#:') >> comment_text_line.as(:refrence) }
+    rule(:reference)                   { spaced('#:') >> comment_text_line.as(:reference) }
     rule(:flag)                       { spaced('#,') >> comment_text_line.as(:flag) }
     rule(:previous_untraslated_string){ spaced('#|') >> comment_text_line.as(:previous_untraslated_string) }
     rule(:cached)                     { spaced('#~') >> comment_text_line.as(:cached) }
 
     # Entries
     rule(:entries) do
-      msgid.as(:msgid) | 
+      msgid.as(:msgid) |
       msgid_plural.as(:msgid_plural) |
       msgstr.as(:msgstr) |
       msgstr_plural.as(:msgstr_plural) |
@@ -39,7 +39,7 @@ module PoParser
     rule(:msgctxt)      { spaced('msgctxt') >> msg_text_line >> multiline.repeat }
 
     # Helpers
-    rule(:space)       { match['[^\S\n]'] } #match only whitespace and not newline
+    rule(:space)       { match['\p{Blank}'].repeat } #match only whitespace and not newline
     rule(:space?)      { space.maybe }
     rule(:newline)     { match["\n"] }
     rule(:eol)         { newline | any.absent? }
@@ -65,4 +65,3 @@ module PoParser
     end
   end
 end
-

data/lib/poparser/po.rb

@@ -15,7 +15,7 @@ module PoParser
     # @example
     #   entry = {
     #             translator_comment: 'comment',
-    #             refrence: 'refrense comment',
+    #             reference: 'reference comment',
     #             flag: 'fuzzy',
     #             msgid: 'translatable string',
     #             msgstr: 'translation'

data/lib/poparser/version.rb

@@ -1,3 +1,3 @@
 module PoParser
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

data/spec/poparser/entry_spec.rb

@@ -8,7 +8,7 @@ describe PoParser::Entry do
   end
 
   let(:labels) do
-    [:refrence, :extracted_comment, :flag, :previous_untraslated_string,
+    [:reference, :refrence, :extracted_comment, :flag, :previous_untraslated_string,
       :translator_comment, :msgid, :msgid_plural, :msgstr, :msgctxt]
   end
 

data/spec/poparser/parser_spec.rb

@@ -1,13 +1,12 @@
-#encoding: utf-8
-require "spec_helper"
+# encoding: utf-8
+require 'spec_helper'
 
 describe PoParser::Parser do
   let(:po) { PoParser::Parser.new }
 
   context(:comments) do
-
     let(:tc)  { po.translator_comment }
-    let(:rc)  { po.refrence }
+    let(:rc)  { po.reference }
     let(:ec)  { po.extracted_comment }
     let(:fc)  { po.flag }
     let(:pusc){ po.previous_untraslated_string }
@@ -35,7 +34,6 @@ describe PoParser::Parser do
       expect(pusc).to parse("#| \"Hello,\\n\"\n")
       expect(pusc).to parse("#| \"The new state of %(module)s - %(branch)s - %(domain)s (%(language)s) is \"\n")
     end
-
   end
 
   context 'Entries' do
@@ -46,11 +44,13 @@ describe PoParser::Parser do
     it 'parses msgid' do
       expect(msgid).to parse "msgid \"The new state of %(module)s - %(branch)s - %(domain)s (%(language)s) is now \"\n"
       expect(msgid).to parse "msgid \"The new \"state\" of %(module)s - %(branch)s - %(domain)s (%(language)s) is now \"\n"
+      expect(msgid).to parse "msgid     \"The new \"state\" of %(module)s - %(branch)s - %(domain)s (%(language)s) is now \"\n"
     end
 
     it 'parses msgstr' do
       expect(msgstr).to parse "msgstr \"The new state of %(module)s - %(branch)s - %(domain)s (%(language)s) is now \"\n"
       expect(msgstr).to parse "msgstr \"فعالیت نامعتبر. شاید یک نفر دیگر دقیقا قبل از شما یک فعالیت دیگر ارسال کرده ۱۲۳۱۲۳۱safda \"\n"
+      expect(msgstr).to parse "msgstr     \"The new state of %(module)s - %(branch)s - %(domain)s (%(language)s) is now \"\n"
     end
 
     it 'parses multiline entries' do
@@ -60,10 +60,13 @@ describe PoParser::Parser do
     end
 
     it 'parses plural msgstr entries' do
-      str = "msgstr[0] \"\""
+      str1 = "msgstr[0] \"\""
+      str2 = "msgstr[0]  \"\""
+      str3 = "msgstr[0]\"\""
       result = [{:msgstr_plural=>{:plural_id=>"0", :text=>""}}]
-      expect(po.parse(str)).to eq(result)
+      expect(po.parse(str1)).to eq(result)
+      expect(po.parse(str2)).to eq(result)
+      expect(po.parse(str3)).to eq(result)
     end
   end
-
 end

data/spec/poparser/po_spec.rb

@@ -5,7 +5,7 @@ describe PoParser::Po do
   let (:entry) do
     {
       translator_comment: 'comment',
-      refrence: 'refrence comment',
+      reference: 'reference comment',
       msgid: 'untranslated',
       msgstr: 'translated string'
     }

data/spec/poparser/tokenizer_spec.rb

@@ -5,7 +5,7 @@ describe PoParser::Tokenizer do
   let(:token)  { PoParser::Tokenizer.new }
   let(:po_file){ Pathname.new('spec/poparser/fixtures/tokenizer.po').realpath }
   let(:po_file_empty_line){ Pathname.new('spec/poparser/fixtures/tokenizer_empty_line.po').realpath }
-  let(:result) { [{:refrence=>"templates:105", :msgid=>"Afrikaans", :msgstr=>"آفریقایی"}, {:flag=>"fuzzy", :msgid=>"Afrikaans", :msgstr=>"آفریقایی" }] }
+  let(:result) { [{:reference=>"templates:105", :msgid=>"Afrikaans", :msgstr=>"آفریقایی"}, {:flag=>"fuzzy", :msgid=>"Afrikaans", :msgstr=>"آفریقایی" }] }
 
   it 'should be able to extracts entries' do
     expect(

data/spec/spec_helper.rb

@@ -9,6 +9,7 @@ require 'poparser'
 require 'parslet/rig/rspec'
 require 'coveralls'
 require 'awesome_print'
+require 'pry'
 
 Coveralls.wear!
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: PoParser
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Arash Mousavi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-28 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet