get_pomo 0.6.1 → 0.6.2

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec
 
 gem 'bump'

data/Gemfile.lock

@@ -4,7 +4,7 @@ PATH
     get_pomo (0.6.1)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     bump (0.3.9)
     diff-lcs (1.1.3)

data/lib/get_pomo/mo_file.rb

@@ -59,4 +59,4 @@ module GetPomo
       string.split PLURAL_SEPERATOR
     end
   end
-end
+end

data/lib/get_pomo/po_file.rb

@@ -39,21 +39,21 @@ module GetPomo
 
     def to_text
       GetPomo.unique_translations(translations).map {|translation|
-        comment = translation.comment.to_s.split(/\n|\r\n/).map{|line|"##{line}\n"}*''
+        comment = translation.comment.to_s.split(/\n|\r\n/).map{|line|"#{line}\n"}*''
         msgid_and_msgstr = if translation.plural?
           msgids =
-          %Q(msgid "#{translation.msgid[0]}"\n)+
-          %Q(msgid_plural "#{translation.msgid[1]}"\n)
+          %Q(msgid "#{escape_quotes(translation.msgid[0])}"\n)+
+          %Q(msgid_plural "#{escape_quotes(translation.msgid[1])}"\n)
 
           msgstrs = []
           translation.msgstr.each_with_index do |msgstr,index|
-            msgstrs << %Q(msgstr[#{index}] "#{msgstr}")
+            msgstrs << %Q(msgstr[#{index}] "#{escape_quotes(msgstr)}")
           end
 
           msgids + (msgstrs*"\n")
         else
-          %Q(msgid "#{translation.msgid}"\n)+
-          %Q(msgstr "#{translation.msgstr}")
+          %Q(msgid "#{escape_quotes(translation.msgid)}"\n)+
+          %Q(msgstr "#{escape_quotes(translation.msgstr)}")
         end
 
         comment + msgid_and_msgstr
@@ -62,6 +62,11 @@ module GetPomo
 
     private
 
+    def escape_quotes(txt)
+      txt.gsub /"/, '\"'
+    end
+
+
     #e.g. # fuzzy
     def comment?(line)
       line =~ /^\s*#/
@@ -69,7 +74,7 @@ module GetPomo
 
     def add_comment(line)
       start_new_translation if translation_complete?
-      @current_translation.add_text(line.strip.sub('#','')+"\n",:to=>:comment)
+      @current_translation.add_text(line.strip+"\n",:to=>:comment)
     end
 
     #msgid "hello"
@@ -82,16 +87,18 @@ module GetPomo
       method, string = line.match(/^\s*([a-z0-9_\[\]]+)(.*)/)[1..2]
       raise "no method found" unless method
 
-      start_new_translation if method == 'msgid' and translation_complete?
+      start_new_translation if %W(msgid msgctxt).include? method and translation_complete?
       @last_method = method.to_sym
       add_string(string)
     end
 
     #"hello" -> hello
     def add_string(string)
-      return if string.strip.empty?
-      raise "not string format: #{string.inspect} on line #{@line_number}" unless string.strip =~ /^['"](.*)['"]$/
-      @current_translation.add_text($1,:to=>@last_method)
+      string = string.strip
+      return if string.empty?
+      raise "not string format: #{string.inspect} on line #{@line_number}" unless string =~ /^['"](.*)['"]$/
+      string_content = $1.gsub(/\\"/, '"')
+      @current_translation.add_text(string_content, :to=>@last_method)
     end
 
     def translation_complete?
@@ -108,4 +115,4 @@ module GetPomo
       @current_translation = Translation.new
     end
   end
-end
+end

data/lib/get_pomo/translation.rb

@@ -1,7 +1,7 @@
 module GetPomo
   class Translation
-    FUZZY_REGEX = /^\s*fuzzy\s*$/
-    attr_accessor :msgid, :msgstr, :comment
+    FUZZY_REGEX = /^#,\s*fuzzy/
+    attr_accessor :msgid, :msgstr, :msgctxt, :comment
 
     def add_text(text,options)
       to = options[:to]
@@ -18,7 +18,7 @@ module GetPomo
     end
 
     def to_hash
-      {:msgid=>msgid,:msgstr=>msgstr,:comment=>comment}.reject{|k,value|value.nil?}
+      {:msgctxt=>msgctxt,:msgid=>msgid,:msgstr=>msgstr,:comment=>comment}.reject{|k,value|value.nil?}
     end
 
     def complete?
@@ -26,12 +26,12 @@ module GetPomo
     end
 
     def fuzzy?
-      comment =~ FUZZY_REGEX
+      !!(comment =~ FUZZY_REGEX)
     end
 
     def fuzzy=(value)
       if value and not fuzzy?
-        add_text "\nfuzzy", :to=>:comment
+        add_text "\n#, fuzzy", :to=>:comment
       else
         self.comment = comment.to_s.split(/$/).reject{|line|line=~FUZZY_REGEX}.join("\n")
       end
@@ -40,5 +40,13 @@ module GetPomo
     def plural?
       msgid.is_a? Array or msgstr.is_a? Array
     end
+
+    def singular?
+      !plural?
+    end
+
+    def header?
+      msgid == ""
+    end
   end
-end
+end

data/lib/get_pomo/version.rb

@@ -1,3 +1,3 @@
 module GetPomo
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/spec/pomo/po_file_spec.rb

@@ -1,4 +1,5 @@
 require "spec_helper"
+require "get_pomo/po_file"
 
 describe GetPomo::PoFile do
   describe :parse do
@@ -11,6 +12,11 @@ describe GetPomo::PoFile do
       t[0].to_hash.should == {:msgid=>'xxx',:msgstr=>'yyy'}
     end
 
+    it "parses msgid and msgstr with escaping quote" do
+      t = GetPomo::PoFile.parse('msgid "x\"xx"' + "\n" + 'msgstr "y\"yy"')
+      t[0].to_hash.should == {:msgid=>'x"xx',:msgstr=>'y"yy'}
+    end
+
     it "parses a simple msgid and msg with additional whitespace" do
       t = GetPomo::PoFile.parse(%Q(  msgid    "xxx"   \n   msgstr    "yyy"   ))
       t[0].to_hash.should == {:msgid=>'xxx',:msgstr=>'yyy'}
@@ -28,12 +34,17 @@ describe GetPomo::PoFile do
 
     it "parses simple comments" do
       t = GetPomo::PoFile.parse(%Q(#test\nmsgid "xxx"\nmsgstr "yyy"))
-      t[0].to_hash.should == {:msgid=>'xxx',:msgstr=>'yyy',:comment=>"test\n"}
+      t[0].to_hash.should == {:msgid=>'xxx',:msgstr=>'yyy',:comment=>"#test\n"}
     end
 
     it "parses comments above msgstr" do
       t = GetPomo::PoFile.parse(%Q(#test\nmsgid "xxx"\n#another\nmsgstr "yyy"))
-      t[0].to_hash.should == {:msgid=>'xxx',:msgstr=>'yyy',:comment=>"test\nanother\n"}
+      t[0].to_hash.should == {:msgid=>'xxx',:msgstr=>'yyy',:comment=>"#test\n#another\n"}
+    end
+
+    it "parses a simple string with msgctxt" do
+      t = GetPomo::PoFile.parse(%Q(msgctxt "www"\nmsgid "xxx"\nmsgstr "yyy"))
+      t[0].to_hash.should == {:msgctxt => 'www', :msgid=>'xxx',:msgstr=>'yyy'}
     end
   end
 
@@ -94,12 +105,33 @@ describe GetPomo::PoFile do
       GetPomo::PoFile.to_text(GetPomo::PoFile.parse(text)).should == text
     end
 
+    it "escape double quotes" do
+      text = 'msgid "x\"xx"' + "\n" + 'msgstr "y\"yy"'
+      po = GetPomo::PoFile.parse(text)
+      GetPomo::PoFile.to_text(po).should == text
+    end
+
+    it "does not escape slashes" do
+      text = 'msgid "x\\"' + "\n" + 'msgstr "x\\"'
+      po = GetPomo::PoFile.parse(text)
+      GetPomo::PoFile.to_text(po).should == text
+    end
+
+    it "escape double quotes on plurals" do
+      text = 'msgid "x\"xx"' + "\n"
+      text += 'msgid_plural "x\"xx"' + "\n"
+      text += 'msgstr[0] "y\"yy"' + "\n"
+      text += 'msgstr[1] "y\"yy"'
+      po = GetPomo::PoFile.parse(text)
+      GetPomo::PoFile.to_text(po).should == text
+    end
+
     it "adds comments" do
       t = GetPomo::Translation.new
       t.msgid = 'a'
       t.msgstr = 'b'
-      t.add_text("c\n",:to=>:comment)
-      t.add_text("d\n",:to=>:comment)
+      t.add_text("#c\n",:to=>:comment)
+      t.add_text("#d\n",:to=>:comment)
       GetPomo::PoFile.to_text([t]).should == %Q(#c\n#d\nmsgid "a"\nmsgstr "b")
     end
 

data/spec/pomo/translation_spec.rb

@@ -79,11 +79,45 @@ describe GetPomo::Translation do
     end
   end
 
+  describe :singular? do
+    it{should be_singular}
+
+    it "is not singular if msgid is plural" do
+      subject.add_text("x",:to=>:msgid_plural)
+      should_not be_singular
+    end
+
+    it "is not singular if msgstr is plural" do
+      subject.add_text("x",:to=>"msgstr[0]")
+      should_not be_singular
+    end
+
+    it "is singular if simple strings where added" do
+      subject.msgid = "a"
+      subject.msgstr = "a"
+      should be_singular
+    end
+  end
+
+  describe :header? do
+    it{should_not be_header}
+
+    it "is header if msgid is empty" do
+      subject.msgid = ""
+      should be_header
+    end
+
+    it "is not header if there is something on msgid" do
+      subject.msgid = "a"
+      should_not be_header
+    end
+  end
+
   describe :fuzzy? do
     it{should_not be_fuzzy}
 
     it "is fuzzy if a fuzzy comment was added" do
-      subject.add_text("fuzzy",:to=>:comment)
+      subject.add_text("#, fuzzy",:to=>:comment)
       should be_fuzzy
     end
 
@@ -98,14 +132,14 @@ describe GetPomo::Translation do
     end
 
     it "changes comment when made fuzzy through fuzzy=" do
-      subject.comment = "hello"
+      subject.comment = "# hello"
       subject.fuzzy = true
-      subject.comment.should == "hello\nfuzzy"
+      subject.comment.should == "# hello\n#, fuzzy"
     end
 
     it "changes empty comment when made fuzzy through fuzzy=" do
       subject.fuzzy = true
-      subject.comment.should == "\nfuzzy"
+      subject.comment.should == "\n#, fuzzy"
     end
 
     it "preserves comments when making fuzzy/unfuzzy" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: get_pomo
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-06-24 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -29,8 +29,6 @@ files:
 - lib/get_pomo/po_file.rb
 - lib/get_pomo/translation.rb
 - lib/get_pomo/version.rb
-- prototype_treetop/po.treetop
-- prototype_treetop/test.rb
 - spec/files/complex.mo
 - spec/files/empty.mo
 - spec/files/plural.mo
@@ -57,21 +55,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3196374221407086229
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3196374221407086229
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: ! 'Ruby/Gettext: A .po and .mo file parser/generator'

data/prototype_treetop/po.treetop

@@ -1,25 +0,0 @@
-grammar Po
-  rule translation
-    msgid whitespace string
-  end
-
-  rule string
-    string whitespace string
-  end
-
-  rule quote
-    '"'
-  end
-
-  rule text
-    [^"]*
-  end
-
-  rule whitespace
-    [ \t\n\r]+
-  end
-
-  rule msgid
-    "msgid"
-  end
-end

data/prototype_treetop/test.rb

@@ -1,6 +0,0 @@
-require 'rubygems'
-require 'treetop'
-
-Treetop.load "po"
-parser = PoParser.new
-puts parser.parse(%Q(msgid "xxx" "yyy"))