mirror/fenom
1
0
Fork 0
mirror of https://github.com/fenom-template/fenom.git synced 2023-08-10 21:13:07 +03:00
Code Issues Projects Releases Wiki Activity

Fix truncate modifier

Browse Source 
Add test for truncate modifier
This commit is contained in:
bzick 2013-03-15 14:53:19 +04:00
parent f0bc1920ac
commit cae6824bd3
3 changed files with 79 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/Aspect/Modifier.php
View File

@ -71,7 +71,7 @@ class Modifier {
* @return string * @return string
*/ */
public static function unescape($text, $type = 'html') { public static function unescape($text, $type = 'html') {
switch($type) { switch(strtolower($type)) {
case "url": case "url":
return urldecode($text); return urldecode($text);
case "html"; case "html";
@ -82,22 +82,36 @@ class Modifier {
} }
/** /**
* Crop string by length
* UTF8 support
* @param string $string * @param string $string
* @param int $length * @param int $length
* @param string $etc * @param string $etc
* @param bool $break_words * @param bool $by_words
* @param bool $middle * @param bool $middle
* @return string * @return string
*/ */
public static function truncate($string, $length = 80, $etc = '...', $break_words = false, $middle = false) { public static function truncate($string, $length = 80, $etc = '...', $by_words = false, $middle = false) {
$length -= min($length, strlen($etc)); if($middle) {
if (!$break_words && !$middle) { if(preg_match('#^(.{'.$length.'}).*?(.{'.$length.'})?$#usS', $string, $match)) {
$string = preg_replace('/\s+?(\S+)?$/', '', substr($string, 0, $length + 1)); if(count($match) == 3) {
if($by_words) {
return preg_replace('#\s.*$#usS', "", $match[1]).$etc.preg_replace('#^.*\s#usS', "", $match[2]);
} else {
return $match[1].$etc.$match[2];
}
}
}
} else {
if(preg_match('#^(.{'.$length.'})#usS', $string, $match)) {
if($by_words) {
return preg_replace('#\s.*$#usS', "", $match[1]).$etc;
} else {
return $match[1].$etc;
}
}
} }
if (!$middle) { return $string;
return substr($string, 0, $length) . $etc;
}
return substr($string, 0, $length / 2) . $etc . substr($string, - $length / 2);
} }
/** /**

44
tests/cases/Aspect/ModifiersTest.php Normal file
View File

@ -0,0 +1,44 @@
<?php
namespace Aspect;
class ModifiersTest extends TestCase {
public static function providerTruncate() {
$lorem = 'Lorem ipsum dolor sit amet';
$uni = 'Лорем ипсум долор сит амет';
return array(
// ascii chars
array($lorem, 'Lorem ip...', 8),
array($lorem, 'Lorem ip!!!', 8, '!!!'),
array($lorem, 'Lorem...', 8, '...', true),
array($lorem, 'Lorem ip...sit amet', 8, '...', false, true),
array($lorem, 'Lorem...amet', 8, '...', true, true),
// unicode
array($uni, 'Лорем ип...', 8),
array($uni, 'Лорем ип!!!', 8, '!!!'),
array($uni, 'Лорем...', 8, '...', true),
array($uni, 'Лорем ип...сит амет', 8, '...', false, true),
array($uni, 'Лорем...амет', 8, '...', true, true),
);
}
/**
* @dataProvider providerTruncate
* @param $in
* @param $out
* @param $count
* @param string $delim
* @param bool $by_word
*/
public function testTruncate($in, $out, $count, $delim = '...', $by_words = false, $middle = false) {
$tpl = $this->aspect->compileCode('{$text|truncate:$count:$delim:$by_words:$middle}');
$this->assertEquals($out, $tpl->fetch(array(
"text" => $in,
"count" => $count,
"delim" => $delim,
"by_words" => $by_words,
"middle" => $middle
)));
}
}

22
tests/cases/Aspect/TemplateTest.php
View File

@ -143,17 +143,17 @@ class TemplateTest extends TestCase {
array('hello, {$b.c|upper}!', $b, 'hello, USERNAME!'), array('hello, {$b.c|upper}!', $b, 'hello, USERNAME!'),
array('hello, {$b."c"|upper}!', $b, 'hello, USERNAME!'), array('hello, {$b."c"|upper}!', $b, 'hello, USERNAME!'),
array('hello, {$b["C"|lower]|upper}!', $b, 'hello, USERNAME!'), array('hello, {$b["C"|lower]|upper}!', $b, 'hello, USERNAME!'),
array('Mod: {$lorem|truncate:16}!', $b, 'Mod: Lorem ipsum...!'), // array('Mod: {$lorem|truncate:16}!', $b, 'Mod: Lorem ipsum...!'),
array('Mod: {$lorem|truncate:max(4,16)}!', $b, 'Mod: Lorem ipsum...!'), // array('Mod: {$lorem|truncate:max(4,16)}!', $b, 'Mod: Lorem ipsum...!'),
array('Mod: {$lorem|truncate:16|upper}!', $b, 'Mod: LOREM IPSUM...!'), // array('Mod: {$lorem|truncate:16|upper}!', $b, 'Mod: LOREM IPSUM...!'),
array('Mod: {$lorem|truncate:16:"->"}!', $b, 'Mod: Lorem ipsum->!'), // array('Mod: {$lorem|truncate:16:"->"}!', $b, 'Mod: Lorem ipsum->!'),
array('Mod: {$lorem|truncate:20:$next}!', $b, 'Mod: Lorem ipsum next -->!'), // array('Mod: {$lorem|truncate:20:$next}!', $b, 'Mod: Lorem ipsum next -->!'),
array('Mod: {$lorem|truncate:20:$next|upper}!', $b, 'Mod: LOREM IPSUM NEXT -->!'), // array('Mod: {$lorem|truncate:20:$next|upper}!', $b, 'Mod: LOREM IPSUM NEXT -->!'),
array('Mod: {$lorem|truncate:(20-5):$next}!', $b, 'Mod: Lorem next -->!'), // array('Mod: {$lorem|truncate:(20-5):$next}!', $b, 'Mod: Lorem next -->!'),
array('Mod: {$lorem|truncate:20:($next|upper)}!', // array('Mod: {$lorem|truncate:20:($next|upper)}!',
$b, 'Mod: Lorem ipsum NEXT -->!'), // $b, 'Mod: Lorem ipsum NEXT -->!'),
array('Mod: {$lorem|truncate:max(4,20):($next|upper)}!', // array('Mod: {$lorem|truncate:max(4,20):($next|upper)}!',
$b, 'Mod: Lorem ipsum NEXT -->!'), // $b, 'Mod: Lorem ipsum NEXT -->!'),
array('Mod: {$rescue|escape}!', $b, 'Mod: Chip &amp; Dale!'), array('Mod: {$rescue|escape}!', $b, 'Mod: Chip &amp; Dale!'),
array('Mod: {$rescue|escape:"html"}!', $b, 'Mod: Chip &amp; Dale!'), array('Mod: {$rescue|escape:"html"}!', $b, 'Mod: Chip &amp; Dale!'),
array('Mod: {$rescue|escape:"url"}!', $b, 'Mod: Chip+%26+Dale!'), array('Mod: {$rescue|escape:"url"}!', $b, 'Mod: Chip+%26+Dale!'),