get_pomo 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5dfb3605a381f45a3b9e031d2938d9e26bebcc67
-  data.tar.gz: 7e6b8818a926db276d8c882a6144861a89767bbe
+  metadata.gz: 10ce7fafc6ac3513491f6cc7966a018a6418b890
+  data.tar.gz: 718ce80076413a166985cd2cb2bfa41420425c32
 SHA512:
-  metadata.gz: 045d16e511a1ec0500e8ecabd03a0f9cddf107cba8970465566eef542dfab5784d8975b33659ca95ff1eb0a6e9dd47a0e6c0801b3bfd94d5c957e70f29cf4632
-  data.tar.gz: e5fc4ebecfa88511793611818a12702c2f16b5b16c79a96f353bd25e754622c378d6b6f3ac5f528361e1053497bd404df1698cebe6864f0be0a77dac602f09fe
+  metadata.gz: 811c853026cbf5a06edc89cc204f275b7380afc7a7946a70dc69afe94c31c1fb2b3ec8eb46ef2e8999f49433675012cd44391f19821166595dcfc8ccfb6f681e
+  data.tar.gz: 681fc7e7d3407e1127a5043a2488aa55c070f4d12a7ca60c382996f214a25d531cb4f4c655a02f2b3f017a6420e55abd9f5d2ee585045cef987857e7f179d97e

data/lib/get_pomo/po_file.rb

@@ -33,7 +33,7 @@ module GetPomo
       default_options = {:parse_obsoletes => false}
       @options.merge!(default_options.merge(options))
       start_new_translation
-      text.gsub!(/^#{"\357\273\277"}/, "") #remove boom
+      text.sub!(/^#{"\357\273\277"}/, "") #remove bom (utf8 byte order mark)
       text.split(/$/).each_with_index do |line,index|
         @line_number = index + 1
         next if line.empty?

data/lib/get_pomo/version.rb

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

data/vendor/iconv.rb

@@ -20,6 +20,7 @@
 
 begin
   require 'iconv'
+  GetPomo::Iconv = Iconv
 rescue LoadError
   # Provides Iconv.iconv which normally is provided through Ruby/GLib(1) functions.
   # This library is required for 'gettext'.
@@ -34,7 +35,7 @@ rescue LoadError
   # You can get binaries for Win32(One-Click Ruby Installer).
   # <URL: http://ruby-gnome2.sourceforge.jp/>
   module GetPomo
-    class Iconv2
+    class Iconv
       module Failure; end
       class InvalidEncoding < ArgumentError;  include Failure; end
       class IllegalSequence < ArgumentError;  include Failure; end

data/vendor/mofile.rb

@@ -15,12 +15,8 @@
     $Id: mo.rb,v 1.10 2008/06/17 16:40:52 mutoh Exp $
 =end
 
-require File.join(File.dirname(__FILE__),'iconv')
 require 'stringio'
 
-#Modifications:
-#  use Iconv or FastGettext::Icvon
-
 module GetPomo
   module GetText
     class MOFile < Hash
@@ -46,8 +42,12 @@ module GetPomo
         :trans_sysdep_tab_offset
       end
 
-      MAGIC_BIG_ENDIAN    = "\x95\x04\x12\xde"
+      MAGIC_BIG_ENDIAN = "\x95\x04\x12\xde"
       MAGIC_LITTLE_ENDIAN = "\xde\x12\x04\x95"
+      if "".respond_to?(:force_encoding)
+        MAGIC_BIG_ENDIAN.force_encoding("ASCII-8BIT")
+        MAGIC_LITTLE_ENDIAN.force_encoding("ASCII-8BIT")
+      end
 
       def self.open(arg = nil, output_charset = nil)
         result = self.new(output_charset)
@@ -149,18 +149,9 @@ module GetPomo
               @plural = "0" unless @plural
             end
           else
-            if @output_charset
-              begin
-                iconv = Iconv || FastGettext::Iconv
-                str = iconv.conv(@output_charset, @charset, str) if @charset
-              rescue iconv::Failure
-                if $DEBUG
-                  warn "@charset = ", @charset
-                  warn"@output_charset = ", @output_charset
-                  warn "msgid = ", original_strings[i]
-                  warn "msgstr = ", str
-                end
-              end
+            if @charset and @output_charset
+              str = convert_encoding(str, original_strings[i])
+              original_strings[i] = convert_encoding(original_strings[i], original_strings[i])
             end
           end
           self[original_strings[i]] = str.freeze
@@ -168,21 +159,26 @@ module GetPomo
         self
       end
 
+
+
       # Is this number a prime number ?
       # http://apidock.com/ruby/Prime
       def prime?(number)
         ('1' * number) !~ /^1?$|^(11+?)\1+$/
       end
 
-      def next_prime(seed)
-        require 'mathn'
-        prime = if RUBY_VERSION > "1.9.0"
-          Prime::EratosthenesGenerator.new
-        else
-          Prime.new
+      begin
+        require 'prime'
+        def next_prime(seed)
+          Prime.instance.find{|x| x > seed }
         end
-        while current = prime.succ
-          return current if current > seed
+      rescue LoadError
+        def next_prime(seed)
+          require 'mathn'
+          prime = Prime.new
+          while current = prime.succ
+            return current if current > seed
+          end
         end
       end
 
@@ -232,17 +228,17 @@ module GetPomo
 
         orig_table_data = Array.new()
         ary.each{|item, _|
-          orig_table_data.push(item.size)
+          orig_table_data.push(item.bytesize)
           orig_table_data.push(pos)
-          pos += item.size + 1 # +1 is <NUL>
+          pos += item.bytesize + 1 # +1 is <NUL>
         }
         io.write(orig_table_data.pack('V*'))
 
         trans_table_data = Array.new()
         ary.each{|_, item|
-          trans_table_data.push(item.size)
+          trans_table_data.push(item.bytesize)
           trans_table_data.push(pos)
-          pos += item.size + 1 # +1 is <NUL>
+          pos += item.bytesize + 1 # +1 is <NUL>
         }
         io.write(trans_table_data.pack('V*'))
 
@@ -295,6 +291,39 @@ module GetPomo
 
       attr_accessor :little_endian, :path, :last_modified
       attr_reader :charset, :nplurals, :plural
+
+      private
+      if "".respond_to?(:encode)
+        def convert_encoding(string, original_string)
+          begin
+            string.encode(@output_charset, @charset)
+          rescue EncodingError
+            if $DEBUG
+              warn "@charset = ", @charset
+              warn "@output_charset = ", @output_charset
+              warn "msgid = ", original_string
+              warn "msgstr = ", string
+            end
+            string
+          end
+        end
+      else
+
+        require File.expand_path('iconv.rb', File.dirname(__FILE__))
+        def convert_encoding(string, original_string)
+          begin
+
+            str = GetPomo::Iconv.conv(@output_charset, @charset, string)
+          rescue GetPomo::Iconv::Failure
+            if $DEBUG
+              warn "@charset = ", @charset
+              warn "@output_charset = ", @output_charset
+              warn "msgid = ", original_string
+              warn "msgstr = ", str
+            end
+          end
+        end
+      end
     end
   end
 end

metadata

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