Changeset 318

Timestamp:

08/23/07 13:23:14 (1 year ago)

Author:

bermiferrer

Message:

Implementing AkInflector::is_singular and AkInflector::is_plural.
Validating that if ./script/generate model Posts warns about using a plural for the model.
Simplifying generated model tests.

Files:

• trunk/lib/AkInflector.php (modified) (1 diff)
• trunk/script/generators/model/model_generator.php (modified) (3 diffs)
• trunk/script/generators/scaffold/templates/model_unit_test.tpl (modified) (3 diffs)
• trunk/test/unit/lib/AkInflector.php (modified) (1 diff)

trunk/lib/AkInflector.php

@@ -507 +507 @@
-    }
-
+    function is_singular($singular)
+    {
+        return AkInflector::singularize(AkInflector::pluralize($singular)) == $singular;
+    }
+    
+    function is_plural($plural)
+    {
+        return AkInflector::pluralize(AkInflector::singularize($plural)) == $plural;
+    }
-
-}

trunk/script/generators/model/model_generator.php

@@ -30 +30 @@
-        $this->installer_path = 'app'.DS.'installers'.DS.$this->underscored_model_name.'_installer.php';
-    }
-
+
-    function hasCollisions()
-    {
-        $this->_preloadPaths();
-
+
-        $this->collisions = array();
+
+        if(AkInflector::is_plural($this->class_name)){
+            $this->collisions[] = Ak::t('%class_name should be a singular noun',array('%class_name'=>$this->class_name));
+        }
-
-        $files = array(
@@ -55 +59 @@
-    {
-        $this->_preloadPaths();
-
+
-        $this->class_name = AkInflector::camelize($this->class_name);
-
@@ -68 +72 @@
-            $this->save($file_path, $this->render($template));
-        }
-
+
-        $installer_path = AK_APP_DIR.DS.'installers'.DS.$this->underscored_model_name.'_installer.php';
-        if(!file_exists($installer_path)){
-            $this->save($installer_path, $this->render('installer'));
-        }
-
+
-        $unit_test_runner = AK_TEST_DIR.DS.'unit.php';
-        if(!file_exists($unit_test_runner)){
-            Ak::file_put_contents($unit_test_runner, file_get_contents(AK_FRAMEWORK_DIR.DS.'test'.DS.'app.php'));
-        }
-
+
-    }
-
+
-    function cast()
-    {

trunk/script/generators/scaffold/templates/model_unit_test.tpl

@@ -3 +3 @@
-defined('AK_TEST_DATABASE_ON') ? null : define('AK_TEST_DATABASE_ON', true);
-require_once(dirname(__FILE__).'/../../../fixtures/config/config.php');
-
-
-
+
+
+
-
-class <?php  echo $model_name?>Test extends  AkUnitTest
@@ -11 +11 @@
-    function test_setup()
-    {
-
-
-
-
+
-    }
-
+
-    function test_<?php  echo $model_name?>()
-    {
@@ -23 +20 @@
-}
-
-
-ak_test('<?php  echo $model_name?>Test',true);
-

trunk/test/unit/lib/AkInflector.php

@@ -285 +285 @@
-        $this->assertEqual(AkInflector::singularize('camiones'), 'camión');
-    }
+    
+    function test_should_detect_singulars()
+    {
+        foreach (array_keys($this->SingularToPlural) as $singular){
+            $this->assertTrue(AkInflector::is_singular($singular), $singular.' is not detected as singular');
+        }
+    }
+    
+    function test_should_detect_plurals()
+    {
+        foreach (array_values($this->SingularToPlural) as $plural){
+            $this->assertTrue(AkInflector::is_plural($plural), $plural.' is not detected as plural');
+        }
+    }
-
-}