Permalink
Browse files

Use String#chars in TextHelper::excerpt. Closes #6386 [Manfred Stiens…

…tra]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5288 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 48cef84 commit 41c362352433f265a95c00d8e7b5c1f1299e9011 @NZKoz NZKoz committed Oct 12, 2006
View
@@ -1,5 +1,7 @@
*SVN*
+* Use String#chars in TextHelper::excerpt. Closes #6386 [Manfred Stienstra]
+
* Install named routes into ActionView::Base instead of proxying them to the view via helper_method. Closes #5932. [Nicholas Seckar]
* Update to latest Prototype and script.aculo.us trunk versions [Thomas Fuchs]
@@ -10,7 +12,6 @@
* render_text may optionally append to the response body. render_javascript appends by default. This allows you to chain multiple render :update calls by setting @performed_render = false between them (awaiting a better public API). [Jeremy Kemper]
->>>>>>> .r5282
* Rename test assertion to prevent shadowing. Closes #6306. [psross]
* Fixed that NumberHelper#number_to_delimiter should respect precision of higher than two digits #6231 [phallstrom]
@@ -45,14 +45,14 @@ def excerpt(text, phrase, radius = 100, excerpt_string = "...")
if text.nil? || phrase.nil? then return end
phrase = Regexp.escape(phrase)
- if found_pos = text =~ /(#{phrase})/i
+ if found_pos = text.chars =~ /(#{phrase})/i
start_pos = [ found_pos - radius, 0 ].max
- end_pos = [ found_pos + phrase.length + radius, text.length ].min
+ end_pos = [ found_pos + phrase.chars.length + radius, text.chars.length ].min
prefix = start_pos > 0 ? excerpt_string : ""
- postfix = end_pos < text.length ? excerpt_string : ""
+ postfix = end_pos < text.chars.length ? excerpt_string : ""
- prefix + text[start_pos..end_pos].strip + postfix
+ prefix + text.chars[start_pos..end_pos].strip + postfix
else
nil
end
@@ -24,31 +24,16 @@ def test_truncate
assert_equal "Hello Wor...", truncate("Hello World!!", 12)
end
- def test_truncate_multibyte_without_kcode
- result = execute_in_sandbox(<<-'CODE')
- require File.dirname(__FILE__) + '/../../activesupport/lib/active_support/core_ext/kernel'
- 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...", result
- end
-
- def test_truncate_multibyte_with_kcode
- result = execute_in_sandbox(<<-'CODE')
- $KCODE = "u"
- require 'jcode'
-
- require File.dirname(__FILE__) + '/../../activesupport/lib/active_support/core_ext/kernel'
- 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 ...", result
+ def test_truncate_multibyte
+ with_kcode 'none' do
+ assert_equal "\354\225\210\353\205\225\355...", truncate("\354\225\210\353\205\225\355\225\230\354\204\270\354\232\224", 10)
+ end
+ with_kcode 'u' do
+ assert_equal "\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254\353\236 ...",
+ 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)
+ end
end
-
+
def test_strip_links
assert_equal "on my mind", strip_links("<a href='almost'>on my mind</a>")
assert_equal "on my mind", strip_links("<A href='almost'>on my mind</A>")
@@ -105,7 +90,15 @@ def test_excerpt_with_regex
assert_equal('...is a beautiful! morn...', excerpt('This is a beautiful! morning', 'beautiful', 5))
assert_equal('...is a beautiful? morn...', excerpt('This is a beautiful? morning', 'beautiful', 5))
end
-
+
+ def test_excerpt_with_utf8
+ with_kcode('u') do
+ assert_equal("...fficiency could not be h...", excerpt("That's why efficiency could not be helped", 'could', 8))
+ end
+ with_kcode('none') do
+ assert_equal("...\203ciency could not be h...", excerpt("That's why efficiency could not be helped", 'could', 8))
+ end
+ end
def test_word_wrap
assert_equal("my very very\nvery long\nstring", word_wrap("my very very very long string", 15))
@@ -1,26 +1,11 @@
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
+ # Temporarily replaces KCODE for the block
+ def with_kcode(kcode)
+ old_kcode, $KCODE = $KCODE, kcode
+ begin
+ yield
+ ensure
+ $KCODE = old_kcode
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

0 comments on commit 41c3623

Please sign in to comment.