PSR-0 compliance

* Renamed class files
* closed #8

.gitignore

@@ -3,4 +3,6 @@
 *.DS_Store
 application/logs/*
 application/cache/*
-application/config/*.php
+application/config/*.php
+
+core.ignorecase=true

application/classes/controller/api/forms.php → application/classes/Controller/Api/Forms.php

@@ -14,7 +14,7 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU General Public License Version 3 (GPLv3)
  */
 
-class Controller_API_Forms extends Ushahidi_API {
+class Controller_Api_Forms extends Ushahidi_Api {
 
 	/**
 	 * Create A Form
@@ -27,7 +27,7 @@ public function action_post_index_collection()
 	{
 		$post = $this->_request_payload;
 
-		$form = ORM::factory('form')->values($post);
+		$form = ORM::factory('Form')->values($post);
 		// Validation - cycle through nested models 
 		// and perform in-model validation before
 		// saving
@@ -42,7 +42,7 @@ public function action_post_index_collection()
 				// Yes, loop through and validate each group
 				foreach ($post['groups'] as $group)
 				{
-					$_group = ORM::factory('form_group')->values($group);
+					$_group = ORM::factory('Form_Group')->values($group);
 					$_group->check();
 
 					// Are form attributes defined?
@@ -51,7 +51,7 @@ public function action_post_index_collection()
 						// Yes, loop through and validate each form attribute
 						foreach ($group['attributes'] as $attribute)
 						{
-							$_attribute = ORM::factory('form_attribute')->values($attribute);
+							$_attribute = ORM::factory('Form_Attribute')->values($attribute);
 							$_attribute->check();
 						}
 					}
@@ -68,7 +68,7 @@ public function action_post_index_collection()
 			{
 				foreach ($post['groups'] as $group)
 				{
-					$_group = ORM::factory('form_group');
+					$_group = ORM::factory('Form_Group');
 					if ( isset($group['label']) )
 					{
 						$_group->label = $group['label'];
@@ -85,7 +85,7 @@ public function action_post_index_collection()
 					{
 						foreach ($group['attributes'] as $attribute)
 						{
-							$_attribute = ORM::factory('form_attribute');
+							$_attribute = ORM::factory('Form_Attribute');
 							$_attribute->values($attribute, array(
 								'key', 'label', 'input', 'type'
 								));
@@ -121,7 +121,7 @@ public function action_get_index_collection()
 	{
 		$results = array();
 
-		$forms = ORM::factory('form')
+		$forms = ORM::factory('Form')
 			->order_by('created', 'ASC')
 			->find_all();
 
@@ -151,7 +151,7 @@ public function action_get_index()
 		$form_id = $this->request->param('id', 0);
 
 		// Respond with form
-		$form = ORM::factory('form', $form_id);
+		$form = ORM::factory('Form', $form_id);
 		$this->_response_payload = $this->form($form);
 	}
 
@@ -178,7 +178,7 @@ public function action_put_index()
 	public function action_delete_index()
 	{
 		$form_id = $this->request->param('id', 0);
-		$form = ORM::factory('form', $form_id);
+		$form = ORM::factory('Form', $form_id);
 		if ( $form->loaded() )
 		{
 			$form->delete();

application/classes/controller/api/forms/attributes.php → application/classes/Controller/Api/Forms/Attributes.php

@@ -14,7 +14,7 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU General Public License Version 3 (GPLv3)
  */
 
-class Controller_API_Forms_Attributes extends Ushahidi_API {
+class Controller_Api_Forms_Attributes extends Ushahidi_Api {
 
 	/**
 	 * Retrieve An attribute

application/classes/controller/api/posts.php → application/classes/Controller/Api/Posts.php

@@ -14,7 +14,7 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU General Public License Version 3 (GPLv3)
  */
 
-class Controller_API_Posts extends Ushahidi_API {
+class Controller_Api_Posts extends Ushahidi_Api {
 
 	/**
 	 * @var int Post Parent ID
@@ -37,7 +37,7 @@ public function action_post_index_collection()
 	{
 		$post = $this->_request_payload;
 
-		$_post = ORM::factory('post')->values($post);
+		$_post = ORM::factory('Post')->values($post);
 		// Validation - cycle through nested models 
 		// and perform in-model validation before
 		// saving
@@ -53,12 +53,12 @@ public function action_post_index_collection()
 				// to the form_attribute
 				foreach ($post['values'] as $key => $value)
 				{
-					$attribute = ORM::factory('form_attribute')
+					$attribute = ORM::factory('Form_Attribute')
 						->where('form_id', '=', $post['form_id'])
 						->where('key', '=', $key)
 						->find();
 
-					$_value = ORM::factory('post_'.$attribute->type)->values(array(
+					$_value = ORM::factory('Post_'.ucfirst($attribute->type))->values(array(
 						'value' => $value
 						));
 					$_value->check();
@@ -78,14 +78,14 @@ public function action_post_index_collection()
 			{
 				foreach ($post['values'] as $key => $value)
 				{
-					$attribute = ORM::factory('form_attribute')
+					$attribute = ORM::factory('Form_Attribute')
 						->where('form_id', '=', $post['form_id'])
 						->where('key', '=', $key)
 						->find();
 
 					if ( $attribute->loaded() )
 					{
-						$_value = ORM::factory('post_'.$attribute->type);
+						$_value = ORM::factory('Post_'.ucfirst($attribute->type));
 						$_value->post_id = $_post->id;
 						$_value->form_attribute_id = $attribute->id;
 						$_value->value = $value;
@@ -117,7 +117,7 @@ public function action_get_index_collection()
 	{
 		$results = array();
 
-		$posts = ORM::factory('post')
+		$posts = ORM::factory('Post')
 			->order_by('created', 'ASC')
 			->find_all();
 
@@ -147,7 +147,7 @@ public function action_get_index()
 		$post_id = $this->request->param('id', 0);
 
 		// Respond with post
-		$post = ORM::factory('post', $post_id);
+		$post = ORM::factory('Post', $post_id);
 		$this->_response_payload = $this->post($post);
 	}
 
@@ -173,7 +173,7 @@ public function action_put_index()
 	public function action_delete_index()
 	{
 		$post_id = $this->request->param('id', 0);
-		$post = ORM::factory('post', $post_id);
+		$post = ORM::factory('Post', $post_id);
 		if ( $post->loaded() )
 		{
 			$post->delete();
@@ -259,6 +259,14 @@ public function post($post = NULL)
 				$response['values'][$result['key']] = $result['value'];
 			}
 		}
+		else
+		{
+			$response = array(
+				'errors' => array(
+					'Post does not exist'
+					)
+				);
+		}
 
 		return $response;
 	}

application/classes/controller/api/posts/streams.php → application/classes/Controller/Api/Posts/Streams.php

@@ -14,7 +14,7 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU General Public License Version 3 (GPLv3)
  */
 
-class Controller_API_Posts_Streams extends Controller_API_Posts {
+class Controller_Api_Posts_Streams extends Controller_Api_Posts {
 
 
 	public function before()

application/classes/model/form.php → application/classes/Model/Form.php

@@ -26,7 +26,7 @@ class Model_Form extends ORM {
 		'form_groups' => array(),
 
 		'children' => array(
-			'model'  => 'form',
+			'model'  => 'Form',
 			'foreign_key' => 'parent_id',
 			),
 		);

application/classes/model/post.php → application/classes/Model/Post.php

@@ -39,7 +39,7 @@ class Model_Post extends ORM {
 		'tags' => array('through' => 'posts_tags'),
 
 		'children' => array(
-			'model'  => 'post',
+			'model'  => 'Post',
 			'foreign_key' => 'parent_id',
 			),
 		);
@@ -109,7 +109,7 @@ public function rules()
 	 */
 	public function form_exists($validation, $field, $value)
 	{
-		$form = ORM::factory('form')
+		$form = ORM::factory('Form')
 			->where('id', '=', $value)
 			->find();
 

application/classes/model/post/comment.php → application/classes/Model/Post/Comment.php

@@ -22,7 +22,7 @@ class Model_Post_Comment extends ORM {
 	 */
 	protected $_has_many = array(
 		'children' => array(
-			'model'  => 'post_comment',
+			'model'  => 'Post_Comment',
 			'foreign_key' => 'parent_id',
 			),
 		);

application/classes/model/tag.php → application/classes/Model/Tag.php

@@ -25,7 +25,7 @@ class Model_Tags extends ORM {
 		'posts' => array('through' => 'posts_tags'),
 
 		'children' => array(
-			'model' => 'tag',
+			'model' => 'Tag',
 			'foreign_key' => 'parent_id'
 			)
 		);
@@ -37,7 +37,7 @@ class Model_Tags extends ORM {
 	 */
 	protected $_belongs_to = array(
 		'parent' => array(
-			'model'  => 'tag',
+			'model'  => 'Tag',
 			'foreign_key' => 'parent_id',
 			),
 		);

application/classes/model/task.php → application/classes/Model/Task.php

@@ -22,7 +22,7 @@ class Model_Task extends ORM {
 	 */
 	protected $_has_many = array(
 		'children' => array(
-			'model' => 'task',
+			'model' => 'Task',
 			'foreign_key' => 'parent_id',
 			),
 		);
@@ -36,15 +36,15 @@ class Model_Task extends ORM {
 	protected $_belongs_to = array(
 		'post' => array(),
 		'parent' => array(
-			'model'  => 'task',
+			'model'  => 'Task',
 			'foreign_key' => 'parent_id',
 			),
 		'assignor' => array(
-			'model' => 'user',
+			'model' => 'User',
 			'foreign_key' => 'assignor',
 			),
 		'assignee' => array(
-			'model' => 'user',
+			'model' => 'User',
 			'foreign_key' => 'assignee',
 			),
 		);

application/classes/model/user.php → application/classes/Model/User.php

@@ -31,11 +31,11 @@ class Model_User extends Model_Auth_User {
 
 		// Task Assignor / Assignee relationship
 		'assignors' => array(
-			'model' => 'task',
+			'model' => 'Task',
 			'foreign_key' => 'assignor',
 			),
 		'assignees' => array(
-			'model' => 'task',
+			'model' => 'Task',
 			'foreign_key' => 'assignee'
 			),
 	);

application/classes/ushahidi/api.php → application/classes/Ushahidi/Api.php

@@ -14,7 +14,7 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU General Public License Version 3 (GPLv3)
  */
 
-class Ushahidi_API extends Controller {
+class Ushahidi_Api extends Controller {
 
 	protected $version = '2.0.0';
 

application/config/database.template

@@ -18,7 +18,7 @@ return array
 (
 	'default' => array
 	(
-		'type'       => 'mysql',
+		'type'       => 'MySQL',
 		'connection' => array(
 			'hostname'   => 'localhost',
 			'database'   => 'database',