PoParser 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 954ba00cb0682d03951ff75fc7de053d515a621b
-  data.tar.gz: 40d00d176527e9c4ff109cd44dd3c46c16674a42
+  metadata.gz: 0e320991c1d0d99631e3e9f69479d8b4a4e32e75
+  data.tar.gz: a22450eeb90828fa9396ab9e3ae4a066286282ac
 SHA512:
-  metadata.gz: 8b1635f9d67863a2ffe25c0051b3d772d3ae595f8600fe190d152524441a4f44354b1b95929ca2b47ea46526bb80a52646919796c67610d822bdc85261bf6ffe
-  data.tar.gz: 1bfa4f0d0d4df93cba148577e3b803113c627758c26e1cee69de0f823d8fbf0b82dfdd912ce7c98c7b9866dbc08a1cc6a2768f2fc4e685e7415b7aafd2d6362f
+  metadata.gz: b7244529dfffea1b170cc164581de87a9098cf3a0f4ca981de3c3a0a2a4a5fba222a8b32cd766cfee7ead2a750d6d19740718a8829a9590bde737b6b4b2d74f2
+  data.tar.gz: 5ab25bb5cfbc95cfe0bb0a131bdebae1b71d16eabf26c4b0adc378611244ed85ae4020ef04d991120b3a7c5c1af8c1606fd28240d0c4144dfcd41b9ffbc5b189

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+
+2.0.0 / 2016-12-22
+==================
+
+  * `Comment#to_s` now returns string instead of array (backward incompatible)
+  * Parser won't choke on cases where there are spaces before eol
+
 1.1.0 / 2016-12-07
 ==================
 

data/lib/poparser/comment.rb

@@ -1,32 +1,32 @@
 module PoParser
   class Comment
-    attr_accessor :type, :str
+    attr_accessor :type, :value
 
-    def initialize(type, str)
+    def initialize(type, value)
       @type = type
-      @str  = str
+      @value  = value
     end
 
     def to_s(with_label = false)
-      return @str unless with_label
-      if @str.is_a? Array
+      return to_str unless with_label
+      if @value.is_a? Array
         string = []
-        @str.each do |str|
+        @value.each do |str|
           string << "#{COMMENTS_LABELS[@type]} #{str}\n".gsub(/[^\S\n]+$/, '')
         end
         return string.join
       else
         # removes the space but not newline at the end
-        "#{COMMENTS_LABELS[@type]} #{@str}\n".gsub(/[^\S\n]+$/, '')
+        "#{COMMENTS_LABELS[@type]} #{@value}\n".gsub(/[^\S\n]+$/, '')
       end
     end
 
     def to_str
-      @str
+      @value.is_a?(Array) ? @value.join : @value
     end
 
     def inspect
-      @str
+      @value
     end
   end
 end

data/lib/poparser/entry.rb

@@ -146,7 +146,7 @@ module PoParser
             if instance_variable_get("@#{type}".to_sym).is_a? object
               klass      = instance_variable_get "@#{type}".to_sym
               klass.type = type
-              klass.str  = val
+              klass.value  = val
             else
               instance_variable_set "@#{type}".to_sym, object.new(type, val)
             end

data/lib/poparser/header.rb

@@ -7,7 +7,7 @@ module PoParser
 
     def initialize(entry)
       @entry            = entry
-      @comments         = entry.translator_comment.to_s
+      @comments         = entry.translator_comment.value
       @original_configs = convert_msgstr_to_hash(entry.msgstr)
 
       HEADER_LABELS.each do |k, v|
@@ -46,7 +46,7 @@ module PoParser
 
   private
     def convert_msgstr_to_hash(msgstr)
-      options_array = msgstr.to_s.map do |options|
+      options_array = msgstr.value.map do |options|
         options.split(':', 2).each do |k|
           k.strip!
           k.chomp!
@@ -70,4 +70,3 @@ module PoParser
     end
   end
 end
-

data/lib/poparser/message.rb

@@ -1,46 +1,45 @@
 module PoParser
   class Message
-    attr_accessor :type
-    attr_writer :str
+    attr_accessor :type, :value
 
-    def initialize(type, str)
+    def initialize(type, value)
       @type = type
-      @str  = str
+      @value  = value
 
       remove_empty_line
     end
 
     def str
-      @str.is_a?(Array) ? @str.join : @str
+      @value.is_a?(Array) ? @value.join : @value
     end
 
     def to_s(with_label = false)
-      return @str unless with_label
-      if @str.is_a? Array
+      return to_str unless with_label
+      if @value.is_a? Array
         remove_empty_line
         # multiline messages should be started with an empty line
         lines = ["#{label} \"\"\n"]
-        @str.each do |str|
+        @value.each do |str|
           lines << "\"#{str}\"\n"
         end
         return lines.join
       else
-        "#{label} \"#{@str}\"\n"
+        "#{label} \"#{@value}\"\n"
       end
     end
 
     def to_str
-      @str.is_a?(Array) ? @str.join : @str
+      @value.is_a?(Array) ? @value.join : @value
     end
 
     def inspect
-      @str
+      @value
     end
 
   private
     def remove_empty_line
-      if @str.is_a? Array
-        @str.shift if @str.first == ''
+      if @value.is_a? Array
+        @value.shift if @value.first == ''
       end
     end
 

data/lib/poparser/parser.rb

@@ -46,7 +46,7 @@ module PoParser
     rule(:character)   { escaped | text }
     rule(:text)        { any }
     rule(:escaped)     { str('\\') >> any }
-    rule(:msg_line_end){ str('"') >> eol }
+    rule(:msg_line_end){ str('"') >> space? >> eol }
 
     rule(:comment_text_line) do
       (eol.absent? >> character).repeat.maybe.as(:text) >> eol

data/lib/poparser/version.rb

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

data/spec/poparser/fixtures/multiline.po

@@ -1,6 +1,6 @@
 msgid ""
 "first"
 "second"
-msgstr ""
+msgstr "" 
 "aval"
 "dovom"

metadata

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