jro_apps/redmine Commit - r5247:e297c1c24447

scm: not use Iconv for log converting in Ruby 1.9 and fix tests fails in Ruby 1.9....

Toshi MARUYAMA -

r5247:e297c1c24447

parent child

Context file:

r5247:e297c1c24447

Collapse all files

app/models/changeset.rb +15 -8

                private
                def self.to_utf8(str, encoding)
-                 return str if str.blank?
+                 return str if str.nil?
+                 str.force_encoding("ASCII-8BIT") if str.respond_to?(:force_encoding)
+                 return str if str.empty?
+                 str.force_encoding("UTF-8") if str.respond_to?(:force_encoding)
+                 if str.respond_to?(:force_encoding)
+                   enc = encoding.blank? ? "UTF-8" : encoding
+                   if enc != "UTF-8"
+                     str.force_encoding(enc)
+                     str = str.encode("UTF-8")
+                   end
+                   if ! str.valid_encoding?
+                     str = str.encode("US-ASCII", :invalid => :replace,
+                           :undef => :replace, :replace => '?').encode("UTF-8")
+                   end
+                 else
                  unless encoding.blank? || encoding == 'UTF-8'
                    begin
                      str = Iconv.conv('UTF-8', encoding, str)
                      # do nothing here
                    end
                  end
-                 if str.respond_to?(:force_encoding)
-                   str.force_encoding('UTF-8')
-                   if ! str.valid_encoding?
-                     str = str.encode("US-ASCII", :invalid => :replace,
-                           :undef => :replace, :replace => '?').encode("UTF-8")
-                   end
-                 else
                    # removes invalid UTF8 sequences
                    begin
                      str = Iconv.conv('UTF-8//IGNORE', 'UTF-8', str + '  ')[0..-3]

test/unit/changeset_test.rb +2 -2

                def test_comments_should_be_converted_all_latin1_to_utf8
                    s1 = "\xC2\x80"
                    s2 = "\xc3\x82\xc2\x80"
+                   s4 = s2.dup
                    if s1.respond_to?(:force_encoding)
                      s3 = s1.dup
-                     s4 = s2.dup
                      s1.force_encoding('ASCII-8BIT')
                      s2.force_encoding('ASCII-8BIT')
                      s3.force_encoding('ISO-8859-1')
                                      :scmid => '12345',
                                      :comments => s1)
                    assert( c.save )
-                   assert_equal s2, c.comments
+                   assert_equal s4, c.comments
                end
                def test_identifier

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages