scm: set empty log encoding UTF-8 in Ruby 1.9 and add tests.

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

scm: set empty log encoding UTF-8 in Ruby 1.9 and add tests.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5368 e93f8b46-1217-0410-a6f0-8f06a7374b81
60b34ea2 · Toshi MARUYAMA · Eric Davis · 81bdbd77 · 60b34ea2 · 60b34ea2
Commit 60b34ea2 authored Apr 09, 2011 by Toshi MARUYAMA Committed by Eric Davis Jun 03, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 40 additions and 1 deletion

changeset.rb app/models/changeset.rb +4 -1

changeset_test.rb test/unit/changeset_test.rb +36 -0

No files found.
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -241,7 +241,10 @@ class Changeset < ActiveRecord::Base
  def self.to_utf8(str, encoding)
    return str if str.nil?
    str.force_encoding("ASCII-8BIT") if str.respond_to?(:force_encoding)
-    return str if str.empty?
+    if str.empty?
+      str.force_encoding("UTF-8") if str.respond_to?(:force_encoding)
+      return str
+    end
    str.force_encoding("UTF-8") if str.respond_to?(:force_encoding)
    if str.respond_to?(:force_encoding)
      enc = encoding.blank? ? "UTF-8" : encoding

--- a/test/unit/changeset_test.rb
+++ b/test/unit/changeset_test.rb
@@ -281,6 +281,42 @@ class ChangesetTest < ActiveSupport::TestCase
      assert_equal s4, c.comments
  end

+  def test_comments_nil
+      proj = Project.find(3)
+      r = Repository::Bazaar.create!(
+            :project => proj, :url => '/tmp/test/bazaar',
+            :log_encoding => 'ISO-8859-1' )
+      assert r
+      c = Changeset.new(:repository => r,
+                        :committed_on => Time.now,
+                        :revision => '123',
+                        :scmid => '12345',
+                        :comments => nil)
+      assert( c.save )
+      assert_equal "", c.comments
+      if c.comments.respond_to?(:force_encoding)
+        assert_equal "UTF-8", c.comments.encoding.to_s
+      end
+  end
+
+  def test_comments_empty
+      proj = Project.find(3)
+      r = Repository::Bazaar.create!(
+            :project => proj, :url => '/tmp/test/bazaar',
+            :log_encoding => 'ISO-8859-1' )
+      assert r
+      c = Changeset.new(:repository => r,
+                        :committed_on => Time.now,
+                        :revision => '123',
+                        :scmid => '12345',
+                        :comments => "")
+      assert( c.save )
+      assert_equal "", c.comments
+      if c.comments.respond_to?(:force_encoding)
+        assert_equal "UTF-8", c.comments.encoding.to_s
+      end
+  end
+
  def test_identifier
    c = Changeset.find_by_revision('1')
    assert_equal c.revision, c.identifier