Make the truncate() helper multi-byte safe (assuming $KCODE has been set to something other than "NONE") #2103

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2265 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2 files changed, 51 insertions, 0 deletions

diff --git a/actionpack/test/template/text_helper_test.rb b/actionpack/test/template/text_helper_test.rb
index 383e9f64f8..856c32c300 100644
--- a/actionpack/test/template/text_helper_test.rb
+++ b/actionpack/test/template/text_helper_test.rb
@@ -1,4 +1,5 @@
 require 'test/unit'
+require "#{File.dirname(__FILE__)}/../testing_sandbox"
 require File.dirname(__FILE__) + '/../../lib/action_view/helpers/text_helper'
 require File.dirname(__FILE__) + '/../../../activesupport/lib/active_support/core_ext/numeric'  # for human_size
 require File.dirname(__FILE__) + '/../../../activesupport/lib/active_support/core_ext/hash' # for stringify_keys
@@ -7,6 +8,7 @@ require File.dirname(__FILE__) + '/../../../activesupport/lib/active_support/cor
 class TextHelperTest < Test::Unit::TestCase
   include ActionView::Helpers::TextHelper
   include ActionView::Helpers::TagHelper
+  include TestingSandbox
   
   def setup
     # This simulates the fact that instance variables are reset every time
@@ -25,6 +27,29 @@ class TextHelperTest < Test::Unit::TestCase
     assert_equal "Hello Worl...", truncate("Hello World!!", 12)
   end
 
+  def test_truncate_multibyte_without_kcode
+    result = execute_in_sandbox(<<-'CODE')
+      require "#{File.dirname(__FILE__)}/../lib/action_view/helpers/text_helper"
+      include ActionView::Helpers::TextHelper
+      truncate("\354\225\210\353\205\225\355\225\230\354\204\270\354\232\224", 10)
+    CODE
+
+    assert_equal "\354\225\210\353\205\225\355\225...", result
+  end
+
+  def test_truncate_multibyte_with_kcode
+    result = execute_in_sandbox(<<-'CODE')
+      $KCODE = "u"
+      require 'jcode'
+
+      require "#{File.dirname(__FILE__)}/../lib/action_view/helpers/text_helper"
+      include ActionView::Helpers::TextHelper
+      truncate("\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254\353\236 \354\225\204\353\235\274\353\246\254\354\230\244", 10)
+    CODE
+
+    assert_equal "\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254\353\236 \354\225\204...", result
+  end
+
   def test_strip_links
     assert_equal "on my mind", strip_links("<a href='almost'>on my mind</a>")
   end
diff --git a/actionpack/test/testing_sandbox.rb b/actionpack/test/testing_sandbox.rb
new file mode 100644
index 0000000000..b21f411730
--- /dev/null
+++ b/actionpack/test/testing_sandbox.rb
@@ -0,0 +1,26 @@
+module TestingSandbox
+
+  # This whole thing *could* be much simpler, but I don't think Tempfile,
+  # popen and others exist on all platforms (like Windows).
+  def execute_in_sandbox(code)
+    test_name = "#{File.dirname(__FILE__)}/test.#{$$}.rb"
+    res_name = "#{File.dirname(__FILE__)}/test.#{$$}.out"
+
+    File.open(test_name, "w+") do |file|
+      file.write(<<-CODE)
+        $:.unshift "../lib"
+        block = Proc.new do
+          #{code}
+        end
+        print block.call
+      CODE
+    end
+
+    system("ruby #{test_name} > #{res_name}") or raise "could not run test in sandbox"
+    File.read(res_name)
+  ensure
+    File.delete(test_name) rescue nil
+    File.delete(res_name) rescue nil
+  end
+
+end