add and use StringHelper - #26

Author: alexandresalome

src/Gitonomy/Git/Commit.php

@@ -12,6 +12,8 @@
 
 namespace Gitonomy\Git;
 
+use Gitonomy\Git\Util\StringHelper;
+
 /**
  * Representation of a Git commit.
  *
@@ -275,31 +277,15 @@ public function getShortMessage($length = 50, $preserve = false, $separator = '.
 
         $message = $this->getSubjectMessage();
 
-        if (function_exists('mb_substr')) {
-            if (mb_strlen($message) > $length) {
-                if ($preserve) {
-                    if (false !== ($breakpoint = mb_strpos($message, ' ', $length))) {
-                        $length = $breakpoint;
-                    }
-                }
-
-                return rtrim(mb_substr($message, 0, $length)) . $separator;
-            }
-
-            return $message;
-        } else {
-            if (strlen($message) > $length) {
-                if ($preserve) {
-                    if (false !== ($breakpoint = strpos($message, ' ', $length))) {
-                        $length = $breakpoint;
-                    }
-                }
-
-                return rtrim(substr($message, 0, $length)) . $separator;
+        if (StringHelper::strlen($message) > $length) {
+            if ($preserve && false !== ($breakpoint = StringHelper::strpos($message, ' ', $length))) {
+                $length = $breakpoint;
             }
 
-            return $message;
+            return rtrim(StringHelper::substr($message, 0, $length)).$separator;
         }
+
+        return $message;
     }
 
     /**

src/Gitonomy/Git/Util/StringHelper.php

@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * This file is part of Gitonomy.
+ *
+ * (c) Alexandre Salomé <[email protected]>
+ * (c) Julien DIDIER <[email protected]>
+ *
+ * This source file is subject to the GPL license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace Gitonomy\Git\Util;
+
+/**
+ * Helper class to support language particularity.
+ *
+ * @author Alexandre Salomé <[email protected]>
+ */
+class StringHelper
+{
+    private static $encoding = 'utf-8';
+
+    public static function setEncoding($encoding)
+    {
+        self::$encoding = $encoding;
+    }
+
+    public static function strlen($string)
+    {
+        return function_exists('mb_strlen') ? mb_strlen($string, self::$encoding) : strlen($string);
+    }
+
+    public static function substr($string, $start, $length = null)
+    {
+        return function_exists('mb_substr') ? mb_substr($string, $start, $length, self::$encoding) : substr($string, $start, $length);
+    }
+
+    public static function strpos($haystack, $needle, $offset = 0)
+    {
+        return function_exists('mb_strpos') ? mb_strpos($haystack, $needle, $offset, self::$encoding) : strpos($haystace, $needle, $offset);
+    }
+
+    public static function strrpos($haystack, $needle, $offset = 0)
+    {
+        return function_exists('mb_strrpos') ? mb_strrpos($haystack, $needle, $offset, self::$encoding) : strrpos($haystace, $needle, $offset);
+    }
+}

tests/Gitonomy/Git/Tests/CommitTest.php

@@ -170,20 +170,20 @@ public function testGetMessage($repository)
      */
     public function testGetShortMessage($repository)
     {
+        // tests with a multi-line message
         $commit = $repository->getCommit(self::LONGMESSAGE_COMMIT);
 
         $this->assertEquals('Fixed perm...', $commit->getShortMessage(10));
-    }
-
-    /**
-     * @dataProvider provideFoobar
-     */
-    public function testGetSubjectMessage($repository)
-    {
-        $commit = $repository->getCommit(self::LONGMESSAGE_COMMIT);
-
         $this->assertEquals('Fixed perm!!!', $commit->getShortMessage(10, false, '!!!'));
         $this->assertEquals('Fixed permissions!!!', $commit->getShortMessage(10, true, '!!!'));
+
+        // tests with a single-line message
+        $commit = $repository->getCommit(self::INITIAL_COMMIT);
+
+        $this->assertEquals('Add README', $commit->getShortMessage(20));
+        $this->assertEquals('A', $commit->getShortMessage(1, false, ''));
+        $this->assertEquals('Add!!!', $commit->getShortMessage(1, true, '!!!'));
+
     }
 
     /**