Refactored application to follow current suggested directory structur…

…e and best practices
weierophinney · Sep 26, 2008 · f26e5d4 · f26e5d4
1 parent 9ecd189
commit f26e5d4
Show file tree

Hide file tree

Showing 42 changed files with 171 additions and 197 deletions.
diff --git a/application/bootstrap.php b/application/bootstrap.php
@@ -4,6 +4,8 @@
 defined('APPLICATION_STATE') 
     or define('APPLICATION_STATE', 'development');
 
+require_once APPLICATION_PATH . '/plugins/Initialize.php';
+
 $front = Zend_Controller_Front::getInstance();
 $front->registerPlugin(new Bugapp_Plugin_Initialize(APPLICATION_STATE, APPLICATION_PATH))
       ->addControllerDirectory(APPLICATION_PATH . '/controllers');
diff --git a/application/config/development.php b/application/config/development.php
diff --git a/application/config/production.php b/application/config/production.php
diff --git a/application/config/site.ini b/application/config/site.ini
@@ -0,0 +1,9 @@
+[production]
+showExceptions = false
+db.adapter = "pdo_sqlite"
+db.params.dbname = APPLICATION_PATH "/../data/db/bugs.db"
+
+[development : production]
+showExceptions = true
+
+[test : production]
diff --git a/application/config/site.php b/application/config/site.php
diff --git a/application/config/test.php b/application/config/test.php
diff --git a/library/Bugapp/Helper/GetForm.php → application/controllers/helpers/GetForm.php b/library/Bugapp/Helper/GetForm.php → application/controllers/helpers/GetForm.php
@@ -1,8 +1,28 @@
 <?php
 class Bugapp_Helper_GetForm extends Zend_Controller_Action_Helper_Abstract
 {
+    /**
+     * @var array Form instances
+     */
     protected $_forms = array();
 
+    /**
+     * @var Zend_Loader_PluginLoader
+     */
+    protected $_loader;
+
+    /**
+     * Initialize plugin loader for forms
+     * 
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->_loader = new Zend_Loader_PluginLoader(array(
+            'Bugapp_Form' => APPLICATION_PATH . '/forms',
+        ));
+    }
+
     /**
      * Load and return a form object
      * 
@@ -12,12 +32,11 @@ class Bugapp_Helper_GetForm extends Zend_Controller_Action_Helper_Abstract
      */
     public function getForm($form, $config = null)
     {
-        $form = ucfirst($form);
-        $class = 'Bugapp_Form_' . $form;
-        if (!array_key_exists($class, $this->_forms)) {
-            $this->_forms[$class] = new $class($config);
+        if (!array_key_exists($form, $this->_forms)) {
+            $class = $this->_loader->load($form);
+            $this->_forms[$form] = new $class($config);
         }
-        return $this->_forms[$class];
+        return $this->_forms[$form];
     }
 
     /**

diff --git a/application/controllers/helpers/GetModel.php b/application/controllers/helpers/GetModel.php
@@ -0,0 +1,43 @@
+<?php
+class Bugapp_Helper_GetModel extends Zend_Controller_Action_Helper_Abstract
+{
+    /**
+     * @var Zend_Loader_PluginLoader
+     */
+    protected $_loader;
+
+    /**
+     * Initialize plugin loader for models
+     * 
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->_loader = new Zend_Loader_PluginLoader(array(
+            'Bugapp' => APPLICATION_PATH . '/models',
+        ));
+    }
+
+    /**
+     * Load a model class and return an object instance
+     * 
+     * @param  string $model 
+     * @return object
+     */
+    public function getModel($model)
+    {
+        $class = $this->_loader->load($model);
+        return new $class;
+    }
+
+    /**
+     * Proxy to getModel()
+     * 
+     * @param  string $model 
+     * @return object
+     */
+    public function direct($model)
+    {
+        return $this->getModel($model);
+    }
+}
diff --git a/library/Bugapp/Form/Bug.php → application/forms/Bug.php b/library/Bugapp/Form/Bug.php → application/forms/Bug.php
diff --git a/library/Bugapp/Form/Comment.php → application/forms/Comment.php b/library/Bugapp/Form/Comment.php → application/forms/Comment.php
diff --git a/library/Bugapp/Form/Login.php → application/forms/Login.php b/library/Bugapp/Form/Login.php → application/forms/Login.php
diff --git a/library/Bugapp/Form/Register.php → application/forms/Register.php b/library/Bugapp/Form/Register.php → application/forms/Register.php
@@ -3,17 +3,16 @@ class Bugapp_Form_Register extends Zend_Form
 {
     public function init()
     {
-        $root = Bugapp_Plugin_Initialize::getConfig()->root;
-        require_once $root . '/models/User.php';
+        require_once APPLICATION_PATH . '/models/User.php';
 
-        $this->addElementPrefixPath('Bugapp_Validate', 'Bugapp/Validate/', 'validate');
+        $this->addElementPrefixPath('Bugapp_Validate', APPLICATION_PATH . '/models/Validate/', 'validate');
 
         $username = $this->addElement('text', 'username', array(
             'filters'    => array('StringTrim', 'StringToLower'),
             'validators' => array(
                 'Alpha',
                 array('StringLength', true, array(3, 20)),
-                array('UniqueUsername', false, array(new Model_User())),
+                array('UniqueUsername', false, array(new Bugapp_User())),
             ),
             'required'   => true,
             'label'      => 'Desired username:',
@@ -32,7 +31,7 @@ public function init()
             'filters'    => array('StringTrim'),
             'validators' => array(
                 array('EmailAddress', true),
-                array('UniqueUsername', true, array(new Model_User())),
+                array('UniqueUsername', true, array(new Bugapp_User())),
             ),
             'required'   => false,
             'label'      => 'Your email address:',

diff --git a/library/Bugapp/Acl/Resource/Bug.php → application/models/Acl/Resource/Bug.php b/library/Bugapp/Acl/Resource/Bug.php → application/models/Acl/Resource/Bug.php
diff --git a/library/Bugapp/Acl/Resource/Comment.php → application/models/Acl/Resource/Comment.php b/library/Bugapp/Acl/Resource/Comment.php → application/models/Acl/Resource/Comment.php
diff --git a/library/Bugapp/Acl/Role/Developer.php → application/models/Acl/Role/Developer.php b/library/Bugapp/Acl/Role/Developer.php → application/models/Acl/Role/Developer.php
diff --git a/library/Bugapp/Acl/Role/Guest.php → application/models/Acl/Role/Guest.php b/library/Bugapp/Acl/Role/Guest.php → application/models/Acl/Role/Guest.php
diff --git a/library/Bugapp/Acl/Role/Manager.php → application/models/Acl/Role/Manager.php b/library/Bugapp/Acl/Role/Manager.php → application/models/Acl/Role/Manager.php
diff --git a/library/Bugapp/Acl/Role/User.php → application/models/Acl/Role/User.php b/library/Bugapp/Acl/Role/User.php → application/models/Acl/Role/User.php
diff --git a/application/models/Bug.php b/application/models/Bug.php
@@ -1,5 +1,5 @@
 <?php
-require_once dirname(__FILE__) . '/AModel.php';
+require_once dirname(__FILE__) . '/Model.php';
 
 /**
  * Bug application model
@@ -10,7 +10,7 @@
  * @license   New BSD {@link http://framework.zend.com/license/new-bsd}
  * @version   $Id: $
  */
-class Model_Bug extends Model_AModel
+class Bugapp_Bug extends Bugapp_Model
 {
     /**
      * Primary table for operations
@@ -38,7 +38,7 @@ class Model_Bug extends Model_AModel
      * 
      * @param  string $field 
      * @param  string $direction 
-     * @return Model_Bug
+     * @return Bugapp_Bug
      */
     public function setSortOrder($field, $direction)
     {
@@ -51,7 +51,7 @@ public function setSortOrder($field, $direction)
      * 
      * @param  string $field 
      * @param  string $direction 
-     * @return Model_Bug
+     * @return Bugapp_Bug
      */
     public function addSortOrder($field, $direction)
     {
@@ -391,7 +391,7 @@ protected function _getSelect()
      * @param  Zend_Db_Table_Select $select 
      * @param  int|null $limit 
      * @param  int|null $offset 
-     * @return Model_Bug
+     * @return Bugapp_Bug
      */
     protected function _setLimit(Zend_Db_Table_Select $select, $limit, $offset)
     {
@@ -409,7 +409,7 @@ protected function _setLimit(Zend_Db_Table_Select $select, $limit, $offset)
      * Set sort order on select object
      * 
      * @param  Zend_Db_Table_Select $select 
-     * @return Model_Bug
+     * @return Bugapp_Bug
      */
     protected function _setSort(Zend_Db_Table_Select $select)
     {

diff --git a/application/models/Comment.php b/application/models/Comment.php
@@ -1,5 +1,5 @@
 <?php
-require_once dirname(__FILE__) . '/AModel.php';
+require_once dirname(__FILE__) . '/Model.php';
 
 /**
  * Comment model
@@ -10,7 +10,7 @@
  * @license   New BSD {@link http://framework.zend.com/license/new-bsd}
  * @version   $Id: $
  */
-class Model_Comment extends Model_AModel
+class Bugapp_Comment extends Bugapp_Model
 {
     /**
      * Primary table for operations

diff --git a/application/models/Table/Bug.php → application/models/DbTable/Bug.php b/application/models/Table/Bug.php → application/models/DbTable/Bug.php
@@ -5,30 +5,30 @@
 require_once dirname(__FILE__) . '/ResolutionType.php';
 require_once dirname(__FILE__) . '/PriorityType.php';
 
-class Model_Table_Bug extends Zend_Db_Table
+class Bugapp_DbTable_Bug extends Zend_Db_Table
 {
     protected $_name    = 'bug';
     protected $_primary = 'id';
 
     protected $_dependentTables = array(
-        'Model_Table_BugRelation',
-        'Model_Table_Comment',
+        'Bugapp_DbTable_BugRelation',
+        'Bugapp_DbTable_Comment',
     );
 
     protected $_referenceMap = array(
         'IssueType' => array(
             'columns'       => 'type_id',
-            'refTableClass' => 'Model_Table_IssueType',
+            'refTableClass' => 'Bugapp_DbTable_IssueType',
             'refColumns'    => 'id',
         ),
         'ResolutionType' => array(
             'columns'       => 'resolution_id',
-            'refTableClass' => 'Model_Table_ResolutionType',
+            'refTableClass' => 'Bugapp_DbTable_ResolutionType',
             'refColumns'    => 'id',
         ),
         'PriorityType' => array(
             'columns'       => 'priority_id',
-            'refTableClass' => 'Model_Table_PriorityType',
+            'refTableClass' => 'Bugapp_DbTable_PriorityType',
             'refColumns'    => 'id',
         ),
     );

diff --git a/application/models/Table/BugRelation.php → application/models/DbTable/BugRelation.php b/application/models/Table/BugRelation.php → application/models/DbTable/BugRelation.php
@@ -2,25 +2,25 @@
 require_once dirname(__FILE__) . '/Bug.php';
 require_once dirname(__FILE__) . '/RelationType.php';
 
-class Model_Table_BugRelation extends Zend_Db_Table
+class Bugapp_DbTable_BugRelation extends Zend_Db_Table
 {
     protected $_name    = 'bug_relation';
     protected $_primary = 'id';
 
     protected $_referenceMap = array(
         'BugChildren' => array(
             'columns'       => 'related_id',
-            'refTableClass' => 'Model_Table_Bug',
+            'refTableClass' => 'Bugapp_DbTable_Bug',
             'refColumns'    => 'id',
         ),
         'BugParent' => array(
             'columns'       => 'bug_id',
-            'refTableClass' => 'Model_Table_Bug',
+            'refTableClass' => 'Bugapp_DbTable_Bug',
             'refColumns'    => 'id',
         ),
         'RelationType' => array(
             'columns'       => 'relation_type',
-            'refTableClass' => 'Model_Table_RelationType',
+            'refTableClass' => 'Bugapp_DbTable_RelationType',
             'refColumns'    => 'id',
         ),
     );

diff --git a/application/models/Table/Comment.php → application/models/DbTable/Comment.php b/application/models/Table/Comment.php → application/models/DbTable/Comment.php
@@ -2,20 +2,20 @@
 require_once dirname(__FILE__) . '/User.php';
 require_once dirname(__FILE__) . '/Bug.php';
 
-class Model_Table_Comment extends Zend_Db_Table
+class Bugapp_DbTable_Comment extends Zend_Db_Table
 {
     protected $_name    = 'comment';
     protected $_primary = 'id';
 
     protected $_referenceMap = array(
         'User' => array(
             'columns'       => 'user_id',
-            'refTableClass' => 'Model_Table_User',
+            'refTableClass' => 'Bugapp_DbTable_User',
             'refColumns'    => 'id',
         ),
         'Bug' => array(
             'columns'       => 'bug_id',
-            'refTableClass' => 'Model_Table_Bug',
+            'refTableClass' => 'Bugapp_DbTable_Bug',
             'refColumns'    => 'id',
         ),
     );

diff --git a/application/models/Table/IssueType.php → application/models/DbTable/IssueType.php b/application/models/Table/IssueType.php → application/models/DbTable/IssueType.php
@@ -1,12 +1,12 @@
 <?php
 require_once dirname(__FILE__) . '/Bug.php';
 
-class Model_Table_IssueType extends Zend_Db_Table
+class Bugapp_DbTable_IssueType extends Zend_Db_Table
 {
     protected $_name    = 'issue_type';
     protected $_primary = 'id';
 
     protected $_dependentTables = array(
-        'Model_Table_Bug',
+        'Bugapp_DbTable_Bug',
     );
 }
diff --git a/application/models/Table/PriorityType.php → application/models/DbTable/PriorityType.php b/application/models/Table/PriorityType.php → application/models/DbTable/PriorityType.php
@@ -1,12 +1,12 @@
 <?php
 require_once dirname(__FILE__) . '/Bug.php';
 
-class Model_Table_PriorityType extends Zend_Db_Table
+class Bugapp_DbTable_PriorityType extends Zend_Db_Table
 {
     protected $_name    = 'priority_type';
     protected $_primary = 'id';
 
     protected $_dependentTables = array(
-        'Model_Table_Bug',
+        'Bugapp_DbTable_Bug',
     );
 }
diff --git a/application/models/Table/RelationType.php → application/models/DbTable/RelationType.php b/application/models/Table/RelationType.php → application/models/DbTable/RelationType.php
@@ -1,12 +1,12 @@
 <?php
 require_once dirname(__FILE__) . '/BugRelation.php';
 
-class Model_Table_RelationType extends Zend_Db_Table
+class Bugapp_DbTable_RelationType extends Zend_Db_Table
 {
     protected $_name    = 'relation_type';
     protected $_primary = 'id';
 
     protected $_dependentTables = array(
-        'Model_Table_BugRelation',
+        'Bugapp_DbTable_BugRelation',
     );
 }
diff --git a/application/models/Table/ResolutionType.php → ...ication/models/DbTable/ResolutionType.php b/application/models/Table/ResolutionType.php → ...ication/models/DbTable/ResolutionType.php
@@ -1,12 +1,12 @@
 <?php
 require_once dirname(__FILE__) . '/Bug.php';
 
-class Model_Table_ResolutionType extends Zend_Db_Table
+class Bugapp_DbTable_ResolutionType extends Zend_Db_Table
 {
     protected $_name    = 'resolution_type';
     protected $_primary = 'id';
 
     protected $_dependentTables = array(
-        'Model_Table_Bug',
+        'Bugapp_DbTable_Bug',
     );
 }