move iconv from utf8 logic from pdf to lib/redmine/codeset_util.rb for common use...

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7818 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/redmine/codeset_util.rb b/lib/redmine/codeset_util.rb
index 5188a355ca1a71ebd75dce59947a37c44c492162..bf24080c6d5724462c0b559b4c64b1bc1f5aea02 100644 (file)
--- a/lib/redmine/codeset_util.rb
+++ b/lib/redmine/codeset_util.rb
@@ -78,5 +78,38 @@ module Redmine
       end
       str
     end
+
+    def self.from_utf8(str, encoding)
+      str ||= ''
+      if str.respond_to?(:force_encoding)
+        str.force_encoding('UTF-8')
+        if encoding.upcase != 'UTF-8'
+          str = str.encode(encoding, :invalid => :replace,
+                           :undef => :replace, :replace => '?')
+        else
+          str = self.replace_invalid_utf8(str)
+        end
+      elsif RUBY_PLATFORM == 'java'
+        begin
+          ic = Iconv.new(encoding, 'UTF-8')
+          str = ic.iconv(str)
+        rescue
+          str = str.gsub(%r{[^\r\n\t\x20-\x7e]}, '?')
+        end
+      else
+        ic = Iconv.new(encoding, 'UTF-8')
+        txtar = ""
+        begin
+          txtar += ic.iconv(str)
+        rescue Iconv::IllegalSequence
+          txtar += $!.success
+          str = '?' + $!.failed[1, $!.failed.length]
+          retry
+        rescue
+          txtar += $!.success
+        end
+        str = txtar
+      end
+    end
   end
 end

diff --git a/lib/redmine/export/pdf.rb b/lib/redmine/export/pdf.rb
index 212a9f1edc0ccf25d32e3246205172fe76c41f4d..eab53723175ba64cf79a39ff078c3f3d29a8f510 100644 (file)
--- a/lib/redmine/export/pdf.rb
+++ b/lib/redmine/export/pdf.rb
@@ -36,9 +36,6 @@ module Redmine
         def initialize(lang)
           set_language_if_valid lang
           pdf_encoding = l(:general_pdf_encoding).upcase
-          if RUBY_VERSION < '1.9'
-            @ic = Iconv.new(pdf_encoding, 'UTF-8')
-          end
           super('P', 'mm', 'A4', (pdf_encoding == 'UTF-8'), pdf_encoding)
           case current_language.to_s.downcase
           when 'vi'
@@ -104,7 +101,7 @@ module Redmine
         end
 
         def fix_text_encoding(txt)
-          RDMPdfEncoding::rdm_pdf_iconv(@ic, txt)
+          RDMPdfEncoding::rdm_from_utf8(txt, l(:general_pdf_encoding))
         end
 
         def RDMCell(w ,h=0, txt='', border=0, ln=0, align='', fill=0, link='')
@@ -505,37 +502,11 @@ module Redmine
 
       class RDMPdfEncoding
         include Redmine::I18n
-        def self.rdm_pdf_iconv(ic, txt)
+        def self.rdm_from_utf8(txt, encoding)
           txt ||= ''
+          txt = Redmine::CodesetUtil.from_utf8(txt, encoding)
           if txt.respond_to?(:force_encoding)
-            txt.force_encoding('UTF-8')
-            if l(:general_pdf_encoding).upcase != 'UTF-8'
-              txt = txt.encode(l(:general_pdf_encoding), :invalid => :replace,
-                               :undef => :replace, :replace => '?')
-            else
-              txt = Redmine::CodesetUtil.replace_invalid_utf8(txt)
-            end
             txt.force_encoding('ASCII-8BIT')
-          elsif RUBY_PLATFORM == 'java'
-            begin
-              ic ||= Iconv.new(l(:general_pdf_encoding), 'UTF-8')
-              txt = ic.iconv(txt)
-            rescue
-              txt = txt.gsub(%r{[^\r\n\t\x20-\x7e]}, '?')
-            end
-          else
-            ic ||= Iconv.new(l(:general_pdf_encoding), 'UTF-8')
-            txtar = ""
-            begin
-              txtar += ic.iconv(txt)
-            rescue Iconv::IllegalSequence
-              txtar += $!.success
-              txt = '?' + $!.failed[1,$!.failed.length]
-              retry
-            rescue
-              txtar += $!.success
-            end
-            txt = txtar
           end
           txt
         end

diff --git a/test/unit/lib/redmine/export/pdf_test.rb b/test/unit/lib/redmine/export/pdf_test.rb
index ec1f3fd7bbe87ca497ed51badb7c6c7306b1de7a..d80741cdd826ad3cbdf791fbed2f900a396f40e7 100644 (file)
--- a/test/unit/lib/redmine/export/pdf_test.rb
+++ b/test/unit/lib/redmine/export/pdf_test.rb
@@ -19,38 +19,21 @@ require File.expand_path('../../../../../test_helper', __FILE__)
 require 'iconv'
 
 class PdfTest < ActiveSupport::TestCase
-  include Redmine::I18n
 
   def test_fix_text_encoding_nil
-    set_language_if_valid 'ja'
-    assert_equal 'CP932', l(:general_pdf_encoding)
-    if RUBY_VERSION < '1.9' 
-      if RUBY_PLATFORM == 'java'
-        ic = Iconv.new("SJIS", 'UTF-8')
-      else
-        ic = Iconv.new(l(:general_pdf_encoding), 'UTF-8')
-      end
-    end
-    assert_equal '', Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, nil)
+    assert_equal '', Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(nil, "UTF-8")
+    assert_equal '', Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(nil, "ISO-8859-1")
   end
 
   def test_rdm_pdf_iconv_cannot_convert_ja_cp932
-    set_language_if_valid 'ja'
-    assert_equal 'CP932', l(:general_pdf_encoding)
-    if RUBY_VERSION < '1.9'
-      if RUBY_PLATFORM == 'java'
-        ic = Iconv.new("SJIS", 'UTF-8')
-      else
-        ic = Iconv.new(l(:general_pdf_encoding), 'UTF-8')
-      end
-    end
+    encoding = ( RUBY_PLATFORM == 'java' ? "SJIS" : "CP932" )
     utf8_txt_1  = "\xe7\x8b\x80\xe6\x85\x8b"
     utf8_txt_2  = "\xe7\x8b\x80\xe6\x85\x8b\xe7\x8b\x80"
     utf8_txt_3  = "\xe7\x8b\x80\xe7\x8b\x80\xe6\x85\x8b\xe7\x8b\x80"
     if utf8_txt_1.respond_to?(:force_encoding)
-      txt_1 = Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, utf8_txt_1)
-      txt_2 = Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, utf8_txt_2)
-      txt_3 = Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, utf8_txt_3)
+      txt_1 = Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_1, encoding)
+      txt_2 = Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_2, encoding)
+      txt_3 = Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_3, encoding)
       assert_equal "?\x91\xd4", txt_1
       assert_equal "?\x91\xd4?", txt_2
       assert_equal "??\x91\xd4?", txt_3
@@ -59,33 +42,28 @@ class PdfTest < ActiveSupport::TestCase
       assert_equal "ASCII-8BIT", txt_3.encoding.to_s
     elsif RUBY_PLATFORM == 'java'
       assert_equal "??",
-                   Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, utf8_txt_1)
+                   Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_1, encoding)
       assert_equal "???",
-                   Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, utf8_txt_2)
+                   Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_2, encoding)
       assert_equal "????",
-                   Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, utf8_txt_3)
+                   Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_3, encoding)
     else
       assert_equal "???\x91\xd4",
-                   Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, utf8_txt_1)
+                   Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_1, encoding)
       assert_equal "???\x91\xd4???",
-                   Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, utf8_txt_2)
+                   Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_2, encoding)
       assert_equal "??????\x91\xd4???",
-                   Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, utf8_txt_3)
+                   Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_3, encoding)
     end
   end
 
   def test_rdm_pdf_iconv_invalid_utf8_should_be_replaced_en
-    set_language_if_valid 'en'
-    assert_equal 'UTF-8', l(:general_pdf_encoding)
     str1 = "Texte encod\xe9 en ISO-8859-1"
     str2 = "\xe9a\xe9b\xe9c\xe9d\xe9e test"
     str1.force_encoding("UTF-8") if str1.respond_to?(:force_encoding)
     str2.force_encoding("ASCII-8BIT") if str2.respond_to?(:force_encoding)
-    if RUBY_VERSION < '1.9'
-      ic = Iconv.new(l(:general_pdf_encoding), 'UTF-8')
-    end
-    txt_1 = Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, str1)
-    txt_2 = Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, str2)
+    txt_1 = Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(str1, 'UTF-8')
+    txt_2 = Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(str2, 'UTF-8')
     if txt_1.respond_to?(:force_encoding)
       assert_equal "ASCII-8BIT", txt_1.encoding.to_s
       assert_equal "ASCII-8BIT", txt_2.encoding.to_s
@@ -95,21 +73,13 @@ class PdfTest < ActiveSupport::TestCase
   end
 
   def test_rdm_pdf_iconv_invalid_utf8_should_be_replaced_ja
-    set_language_if_valid 'ja'
-    assert_equal 'CP932', l(:general_pdf_encoding)
     str1 = "Texte encod\xe9 en ISO-8859-1"
     str2 = "\xe9a\xe9b\xe9c\xe9d\xe9e test"
     str1.force_encoding("UTF-8") if str1.respond_to?(:force_encoding)
     str2.force_encoding("ASCII-8BIT") if str2.respond_to?(:force_encoding)
-    if RUBY_VERSION < '1.9'
-      if RUBY_PLATFORM == 'java'
-        ic = Iconv.new("SJIS", 'UTF-8')
-      else
-        ic = Iconv.new(l(:general_pdf_encoding), 'UTF-8')
-      end
-    end
-    txt_1 = Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, str1)
-    txt_2 = Redmine::Export::PDF::RDMPdfEncoding::rdm_pdf_iconv(ic, str2)
+    encoding = ( RUBY_PLATFORM == 'java' ? "SJIS" : "CP932" )
+    txt_1 = Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(str1, encoding)
+    txt_2 = Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(str2, encoding)
     if txt_1.respond_to?(:force_encoding)
       assert_equal "ASCII-8BIT", txt_1.encoding.to_s
       assert_equal "ASCII-8BIT", txt_2.encoding.to_s