Changeset 63

Timestamp:

05/22/2007 02:22:50 PM (19 months ago)

Author:

Shadowhand

Message:

Fixing #35, replaced plural() with a more intelligent solution, fixed singular() to work with strings that end in "zes", "xes", or "ses".

Files:

• trunk/system/helpers/inflector_helper.php (modified) (6 diffs)

trunk/system/helpers/inflector_helper.php

@@ -37 +37 @@
  * @param       string
  * @return      str
- */             
+ */
 function singular($str)
 {
-        $str = strtolower(trim($str));
+        $str = trim(rtrim($str));
         $end = substr($str, -3);
-        
+
         if ($end == 'ies')
         {
                 $str = substr($str, 0, strlen($str)-3).'y';
         }
+        elseif ($end == 'ses' || $end == 'zes' || $end == 'xes')
+        {
+                $str = substr($str, 0, strlen($str)-2);
+        }
         else
         {
                 $end = substr($str, -1);
-                
+
                 if ($end == 's')
                 {
@@ -56 +60 @@
                 }
         }
-        
+
         return $str;
 }
@@ -70 +74 @@
  * @param       string
  * @return      str
- */             
+ */
 function plural($str)
 {
-        $str = strtolower(trim($str));
+        $str = trim(rtrim($str));
         $end = substr($str, -1);
+        $low = (strcmp($end, strtolower($end)) === 0) ? TRUE : FALSE;
 
-        if ($end == 'y')
+        if (preg_match('/[sxz]$/i', $str) OR preg_match('/[^aeioudgkprt]h$/i', $str))
         {
-                $str = substr($str, 0, strlen($str)-1).'ies';
+                $end = 'es';
+                $str .= ($low == FALSE) ? strtoupper($end) : $end;
         }
-        elseif ($end != 's')
+        elseif (preg_match('/[^aeiou]y$/i', $str))
         {
-                $str .= 's';
+                $end = 'ies';
+                $end = ($low == FALSE) ? strtoupper($end) : $end;
+                $str = substr_replace($str, $end, -1)
+        }
+        else
+        {
+                $end = 's';
+                $str .= ($low == FALSE) ? strtoupper($end) : $end;
         }
 
-        return $str;    
+        return $str;
 }
 
@@ -98 +111 @@
  * @param       string
  * @return      str
- */             
+ */
 function camelize($str)
-{               
+{
         $str = 'x'.strtolower(trim($str));
         $str = ucwords(preg_replace('/[\s_]+/', ' ', $str));
@@ -116 +129 @@
  * @param       string
  * @return      str
- */             
+ */
 function underscore($str)
 {
@@ -132 +145 @@
  * @param       string
  * @return      str
- */             
+ */
 function humanize($str)
 {
         return ucwords(preg_replace('/[_]+/', ' ', strtolower(trim($str))));
 }
-        
+
 ?>