1.5.1 release

CHANGELOG.md

@@ -1,3 +1,9 @@
+### 1.5.1 (2014-04-19)
+
+  * Fixed toAscii() failing to remove remaining non-ascii characters
+  * Updated slugify() to treat dash and underscore as delimiters by default
+  * Updated slugify() to remove leading and trailing delimiter, if present
+
 ### 1.5.0 (2014-03-19)
 
   * Made both str and encoding protected, giving property access to subclasses

README.md

@@ -77,7 +77,7 @@ If you're using Composer to manage dependencies, you can include the following
 in your composer.json file:
 
     "require": {
-        "danielstjules/stringy": ">=1.5.0"
+        "danielstjules/stringy": ">=1.5.1"
     }
 
 Then, after running `composer update` or `php composer.phar update`, you can

src/Stringy.php

@@ -488,6 +488,8 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
             $str = str_replace($value, $key, $str);
         }
 
+        $str = preg_replace('/[^\x20-\x7E]/u', '', $str);
+
         return self::create($str, $this->encoding);
     }
 
@@ -714,13 +716,12 @@ class Stringy implements \Countable, \IteratorAggregate, \ArrayAccess
     {
         $stringy = self::create($this->str, $this->encoding);
 
-        $stringy->str = preg_replace("/[^a-zA-Z\d $replacement]/u", '',
-            $stringy->toAscii());
-        $stringy->str = $stringy->collapseWhitespace()->str;
-        $stringy->str = str_replace(' ', $replacement, strtolower($stringy));
-        $stringy->str = preg_replace("/[$replacement]+/u", $replacement, $stringy);
+        $quotedReplacement = preg_quote($replacement);
+        $pattern = "/[^a-zA-Z\d\s-_$quotedReplacement]/u";
+        $stringy->str = preg_replace($pattern, '', $stringy->toAscii());
 
-        return $stringy;
+        return $stringy->toLowerCase()->applyDelimeter($replacement)
+                       ->removeLeft($replacement)->removeRight($replacement);
     }
 
     /**

tests/CommonTest.php

@@ -174,10 +174,11 @@ abstract class CommonTest extends PHPUnit_Framework_TestCase
         return array(
             array('foo bar', 'fòô bàř'),
             array(' TEST ', ' ŤÉŚŢ '),
-            array('φ = z = 3', 'φ = ź = 3'),
+            array(' = z = 3', 'φ = ź = 3'),
             array('perevirka', 'перевірка'),
             array('lysaya gora', 'лысая гора'),
-            array('shchuka', 'щука')
+            array('shchuka', 'щука'),
+            array('', '漢字')
         );
     }
 
@@ -341,11 +342,12 @@ abstract class CommonTest extends PHPUnit_Framework_TestCase
             array('numbers-1234', 'numbers 1234'),
             array('perevirka-ryadka', 'перевірка рядка'),
             array('bukvar-s-bukvoy-y', 'букварь с буквой ы'),
-            // Conflicts between Russian or Bulgarian
-            //array('barzi-i-yarostni', 'бързи и яростни'),
             array('podekhal-k-podezdu-moego-doma', 'подъехал к подъезду моего дома'),
             array('foo:bar:baz', 'Foo bar baz', ':'),
-            array('a_string_with_underscores', 'A_string with_underscores', '_')
+            array('a_string_with_underscores', 'A_string with_underscores', '_'),
+            array('a_string_with_dashes', 'A string-with-dashes', '_'),
+            array('a\string\with\dashes', 'A string-with-dashes', '\\'),
+            array('an_odd_string', '--   An odd__   string-_', '_')
         );
     }