Changeset 9030

Timestamp:

03/15/08 19:59:34 (1 year ago)

Author:

david

Message:

Fixed that TextHelper#excerpt would include one character too many (closes #11268) [Irfy]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_view/helpers/text_helper.rb (modified) (4 diffs)
• trunk/actionpack/test/template/text_helper_test.rb (modified) (3 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Fixed that TextHelper#excerpt would include one character too many #11268 [Irfy]
-
-* Fix more obscure nested parameter hash parsing bug.  #10797 [thomas.lee]

trunk/actionpack/lib/action_view/helpers/text_helper.rb

@@ -93 +93 @@
-        # The +radius+ expands the excerpt on each side of the first occurrence of +phrase+ by the number of characters
-        # defined in +radius+ (which defaults to 100). If the excerpt radius overflows the beginning or end of the +text+,
-If the +phrase+ 
-
+The resulting string will be stripped in any case.
+If the +phrase+ 
-        #
-        # ==== Examples
-        #   excerpt('This is an example', 'an', 5) 
-p
+
-        #
-        #   excerpt('This is an example', 'is', 5) 
-n
+
-        #
-        #   excerpt('This is an example', 'is') 
@@ -107 +107 @@
-        #
-        #   excerpt('This next thing is an example', 'ex', 2) 
- t
+
-        #
-        #   excerpt('This is also an example', 'an', 8, '<chop> ')
@@ -117 +117 @@
-            if found_pos = text.chars =~ /(#{phrase})/i
-              start_pos = [ found_pos - radius, 0 ].max
-found_pos + phrase.chars.length + radius
+[ found_pos + phrase.chars.length + radius - 1, 0].max
-
-              prefix  = start_pos > 0 ? excerpt_string : ""
-
+- 1 
-
-              prefix + text.chars[start_pos..end_pos].strip + postfix
@@ -135 +135 @@
-            if found_pos = text =~ /(#{phrase})/i
-              start_pos = [ found_pos - radius, 0 ].max
-found_pos + phrase.length + radius
+[ found_pos + phrase.length + radius - 1, 0].max
-
-              prefix  = start_pos > 0 ? excerpt_string : ""
-
+- 1 
-
-              prefix + text[start_pos..end_pos].strip + postfix

trunk/actionpack/test/template/text_helper_test.rb

@@ -103 +103 @@
-
-  def test_excerpt
-i
+
-    assert_equal("This is a...", excerpt("This is a beautiful morning", "this", 5))
-    assert_equal("...iful morning", excerpt("This is a beautiful morning", "morning", 5))
@@ -109 +109 @@
-  end
-
+  def test_excerpt_in_borderline_cases
+    assert_equal("", excerpt("", "", 0))
+    assert_equal("a", excerpt("a", "a", 0))
+    assert_equal("...b...", excerpt("abc", "b", 0))
+    assert_equal("abc", excerpt("abc", "b", 1))
+    assert_equal("abc...", excerpt("abcd", "b", 1))
+    assert_equal("...abc", excerpt("zabc", "b", 1))
+    assert_equal("...abc...", excerpt("zabcd", "b", 1))
+    assert_equal("zabcd", excerpt("zabcd", "b", 2))
+
+    # excerpt strips the resulting string before ap-/prepending excerpt_string.
+    # whether this behavior is meaningful when excerpt_string is not to be
+    # appended is questionable.
+    assert_equal("zabcd", excerpt("  zabcd  ", "b", 4))
+    assert_equal("...abc...", excerpt("z  abc  d", "b", 1))
+  end
+
-  def test_excerpt_with_regex
-n
-n
+
+
-  end
-
@@ -117 +134 @@
-    def test_excerpt_with_utf8
-      with_kcode('u') do
- h
+
-      end
-      with_kcode('none') do
- h
+
-      end
-    end
-  else
-    def test_excerpt_with_utf8
- h
- h
+
+
-    end
-  end