Changeset 420

Timestamp:

10/22/07 08:37:24 (1 year ago)

Author:

bermiferrer

Message:

AkInflector::demodulize() has been modified so it converts Module_ClassName or ClassName? and module/path to path. Removed also repeated and unneeded AkInflector::modulize method, use AkInflector::classify instead. Closes #83

Fixing modules path on controller. Closes #82

Fixed un-initialized variable $success in habtm associations.

Files:

• trunk/lib/AkActionController.php (modified) (1 diff)
• trunk/lib/AkActiveRecord.php (modified) (2 diffs)
• trunk/lib/AkActiveRecord/AkHasAndBelongsToMany.php (modified) (4 diffs)
• trunk/lib/AkActiveRecord/AkHasMany.php (modified) (1 diff)
• trunk/lib/AkInflector.php (modified) (3 diffs)
• trunk/lib/AkUnitTest.php (modified) (1 diff)
• trunk/script/migrate (modified) (2 diffs)
• trunk/test/unit/lib/AkInflector.php (modified) (1 diff)

trunk/lib/AkActionController.php

@@ -872 +872 @@
-        foreach (get_included_files() as $file_name){
-            if(strstr($file_name,AK_CONTROLLERS_DIR)){
-modulize(str_replace(array(AK_CONTROLLERS_DIR.DS,'.php'),''
+classify(str_replace(array(AK_CONTROLLERS_DIR.DS,'.php', DS, '//'),array('','','/', '/')
-            }
-        }

trunk/lib/AkActiveRecord.php

@@ -1655 +1655 @@
-         $available_types = array_merge(array($this->getModelName()),$this->getSubclasses());
-         foreach ($available_types as $subclass){
-demodulize($subclass
+humanize(AkInflector::underscore($subclass)
-         }
-         return empty($type_condition) ? '' : '('.join('OR',$type_condition).') ';
@@ -1783 +1783 @@
-            }
-            $value = $this->{'get'.AkInflector::camelize($attribute)}();
-demodulize($value
+humanize(AkInflector::underscore($value)
-        }
-        if(isset($this->$attribute) || (!isset($this->$attribute) && $this->isCombinedAttribute($attribute))){

trunk/lib/AkActiveRecord/AkHasAndBelongsToMany.php

@@ -118 +118 @@
-    {
-        $default_options = array(
-modulize
+classify
-        'table_name' => false,
-        'join_table' => false,
@@ -158 +158 @@
-
-        $options['join_table'] = empty($options['join_table']) ? join('_', $join_tables) : $options['join_table'];
-modulize
+classify
-        $options['foreign_key'] = empty($options['foreign_key']) ? AkInflector::underscore($owner_name).'_id' : $options['foreign_key'];
-        $options['association_foreign_key'] = empty($options['association_foreign_key']) ? AkInflector::underscore($associated_name).'_id' : $options['association_foreign_key'];
@@ -554 +554 @@
-    {
-        if(!$this->Owner->isNewRecord()){
+            $success = true;
-            $options = $this->getOptions($this->association_id);
-            if(strtolower($options['join_class_name']) != strtolower(get_class($this->JoinObject))){
@@ -570 +571 @@
-                    $this->JoinObject =& $this->JoinObject->create(array($options['foreign_key']=> $foreign_key, $options['association_foreign_key']=> $association_foreign_key));
-                    $success = !$this->JoinObject->isNewRecord();
-                }else{
-                    $success = true;
-                }
-            }

trunk/lib/AkActiveRecord/AkHasMany.php

@@ -87 +87 @@
-
-        $default_options = array(
-modulize
+classify
-        'conditions' => false,
-        'order' => false,

trunk/lib/AkInflector.php

@@ -374 +374 @@
-
-    /**
-rail
+Akelo
-    * naming conventions.
-    * 
@@ -426 +426 @@
-    // }}}
-
-
+
+
+
+
+
+
+
-    function demodulize($module_name)
-    {
-
-
-
-
-
-
-
-
-
-
+
+
+
-    /**
-     * Transforms a string to its unaccented version. 
@@ -472 +471 @@
-    function foreignKey($class_name, $separate_class_name_and_id_with_underscore = true)
-    {
-demodulize($class_name
+humanize(AkInflector::underscore($class_name)
-    }
-

trunk/lib/AkUnitTest.php

@@ -81 +81 @@
-                continue;
-            }
-modulize
+classify
-            if($this->instantiateModel($class_name)){
-                $items = Ak::convert('yaml','array',file_get_contents($file));

trunk/script/migrate

@@ -31 +31 @@
-require_once(AK_LIB_DIR.DS.'utils'.DS.'generators'.DS.'AkelosGenerator.php');
-
-
+
+
-$command = count($options) > 0 ? array_shift($options) : 'usage';
-
-
-AkInflector::underscore($installer_name).'
+rtrim(join('/',array_map(array('AkInflector','underscore'), explode('/',$installer.'/'))),'/').'_installer
-
-
+class_
-    $files = Ak::dir(AK_APP_DIR.DS.'installers');
-    if(empty($files)){
@@ -57 +58 @@
-}else{
-    require_once($file);
-
+class_
-        echo Ak::t("\n\n  Could not find load the installer. Class doesn't exists\n\n");
-    }else{
-
+class_
-        if(!method_exists($installer,$command)){
-            echo Ak::t("\n\n  Could not find the method %method for the installer %installer\n\n",
-
+class_
-        }else{
-            $installer->$command($options);

trunk/test/unit/lib/AkInflector.php

@@ -299 +299 @@
-        }
-    }
+    
+    function test_should_demodulize()
+    {
+        $this->assertEqual(AkInflector::demodulize('admin/dashboard_controller'), 'dashboard_controller');
+        $this->assertEqual(AkInflector::demodulize('Admin_DashboardController'), 'DashboardController');
+        $this->assertEqual(AkInflector::demodulize('Admin::Dashboard'), 'Dashboard');
+    }
-
-}