get_pomo 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a7082c11274ecb41c557230f20679ab1afc2b47
-  data.tar.gz: 96a578a70bf2e2690624d6b8f630da7237b55dc5
+  metadata.gz: 5dfb3605a381f45a3b9e031d2938d9e26bebcc67
+  data.tar.gz: 7e6b8818a926db276d8c882a6144861a89767bbe
 SHA512:
-  metadata.gz: 435a39400d98fe210781d43bbf80db4a56fbfc7e747e23ba872b107fc6b04c44e60fa6e68c0967a5bf5ebc6d8edb1fcc763230ae09b836da306b5e0d2fd33200
-  data.tar.gz: cd614be59a4bbfb31a2b487f7c17bbf4721c14e29c7674cbb6a091fe940c986c74394f61b45a39581764088fd0a663988aa62bde84917255d48713c93a556192
+  metadata.gz: 045d16e511a1ec0500e8ecabd03a0f9cddf107cba8970465566eef542dfab5784d8975b33659ca95ff1eb0a6e9dd47a0e6c0801b3bfd94d5c957e70f29cf4632
+  data.tar.gz: e5fc4ebecfa88511793611818a12702c2f16b5b16c79a96f353bd25e754622c378d6b6f3ac5f528361e1053497bd404df1698cebe6864f0be0a77dac602f09fe

data/lib/get_pomo/po_file.rb

@@ -4,15 +4,11 @@ require 'get_pomo/translation'
 module GetPomo
   class PoFile
     def self.parse(text, options = {})
-      default_options = {:parse_obsoletes => false}
-      options = default_options.merge(options)
       PoFile.new.add_translations_from_text(text, options)
     end
 
     def self.to_text(translations, options = {})
-      default_options = {:merge => false}
-      options = default_options.merge(options)
-      p = PoFile.new(:translations=>translations)
+      p = PoFile.new(:translations => translations)
       p.to_text(options)
     end
 
@@ -20,14 +16,22 @@ module GetPomo
 
     def initialize(options = {})
       @translations = options[:translations] || []
+      # no object options should be set through initialize arguments for now,
+      # as they are meant to be changeable for each method call
+      @options =  {:parse_obsoletes => false, :merge => false}
     end
 
-    #the text is split into lines and then converted into logical translations
-    #each translation consists of comments(that come before a translation)
-    #and a msgid / msgstr
+    # the text is split into lines and then converted into logical translations
+    # each translation consists of comments(that come before a translation)
+    # and a msgid / msgstr
     def add_translations_from_text(text, options = {})
+      # only keep valid options for this method
+      options.delete_if do |key, value|
+        !([:parse_obsoletes].include?(key))
+      end
+      # default options for this method
       default_options = {:parse_obsoletes => false}
-      options = default_options.merge(options)
+      @options.merge!(default_options.merge(options))
       start_new_translation
       text.gsub!(/^#{"\357\273\277"}/, "") #remove boom
       text.split(/$/).each_with_index do |line,index|
@@ -41,13 +45,18 @@ module GetPomo
           add_string line
         end
       end
-      start_new_translation(options[:parse_obsoletes]) #instance_variable has to be overwritten or errors can occur on next add
+      start_new_translation #instance_variable has to be overwritten or errors can occur on next add
       translations
     end
 
     def to_text(options = {})
+      # only keep valid options for this method
+      options.delete_if do |key, value|
+        !([:merge].include?(key))
+      end
+      # default options for this method
       default_options = {:merge => false}
-      options = default_options.merge(options)
+      @options.merge!(default_options.merge(options))
       GetPomo.unique_translations(translations, options[:merge]).map do |translation|
         comment = translation.comment.to_s.split(/\n|\r\n/).map{|line|"#{line}\n"}*''
 
@@ -117,15 +126,14 @@ module GetPomo
       @current_translation.complete?
     end
 
-    def store_translation(parse_obsoletes = false)
-      if translation_complete? && (parse_obsoletes || !@current_translation.obsolete?)
+    def store_translation
+      if translation_complete? && (@options[:parse_obsoletes] || !@current_translation.obsolete?)
        @translations += [@current_translation]
       end
-
     end
 
-    def start_new_translation(parse_obsoletes = false)
-      store_translation(parse_obsoletes) if translation_complete?
+    def start_new_translation
+      store_translation if translation_complete?
       @current_translation = Translation.new
     end
   end

data/lib/get_pomo/translation.rb

@@ -30,7 +30,7 @@ module GetPomo
     end
 
     def complete?
-      (not msgid.nil? and not msgstr.nil?) or self.obsolete?
+      (not msgid.nil? and not msgstr.nil?) or obsolete?
     end
 
     def fuzzy?

data/lib/get_pomo/version.rb

@@ -1,3 +1,3 @@
 module GetPomo
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: get_pomo
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it