From 390280b842605d78ec1ab968605e5968677c9400 Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis@37signals.com>
Date: Mon, 19 Sep 2005 21:36:36 +0000
Subject: 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
---
 actionpack/CHANGELOG                              |  2 ++
 actionpack/lib/action_view/helpers/text_helper.rb |  8 ++++++-
 actionpack/test/template/text_helper_test.rb      | 25 ++++++++++++++++++++++
 actionpack/test/testing_sandbox.rb                | 26 +++++++++++++++++++++++
 4 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 actionpack/test/testing_sandbox.rb

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 1aab5ca956..894d06b950 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Make the truncate() helper multi-byte safe (assuming $KCODE has been set to something other than "NONE") #2103
+
 * Add routing tests from #1945 [ben@groovie.org]
 
 * Add a routing test case covering #2101 [Nicholas Seckar]
diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb
index bc753262f2..8be3d3589c 100644
--- a/actionpack/lib/action_view/helpers/text_helper.rb
+++ b/actionpack/lib/action_view/helpers/text_helper.rb
@@ -20,7 +20,13 @@ module ActionView
       # if the +text+ is longer than +length+.
       def truncate(text, length = 30, truncate_string = "...")
         if text.nil? then return end
-        if text.length > length then text[0..(length - 3)] + truncate_string else text end
+
+        if $KCODE == "NONE"
+          text.length > length ? text[0..(length - 3)] + truncate_string : text
+        else
+          chars = text.split(//)
+          chars.length > length ? chars[0..(length-3)].join + truncate_string : text
+        end
       end
 
       # Highlights the +phrase+ where it is found in the +text+ by surrounding it like
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
-- 
cgit v1.2.3