Merge pull request #6 from ezra-obiwale/wip

WIP

src/Controllers/Traits/Api.php

@@ -13,45 +13,68 @@ trait Api
 {
     use Crud;
 
+    /**
+     * Called when an action is successfully processed.
+     *
+     * @param mixed $response
+     * @param integer $code
+     * @return Response
+     */
+	protected function success($response, $code = 200) {
+		$resp = [
+			'status' => array_key_exists('status', $response) ?
+				$response['status'] : 'ok'
+		];
+		if (is_array($response)) {
+			$resp = array_merge($resp, $response);
+		}
+		else if (is_string($response)) {
+			$resp['message'] = $response;
+		}
+		else {
+			$resp['data'] = $response;
+		}
+
+		return response()->json($resp, $code);
+	}
+
     protected function indexResponse($data)
     {
         return $this->paginatedList($data->toArray());
     }
 
     protected function storeResponse(Model $data)
     {
-        return response()->json($data, 201);
+        return $this->success($data, 201);
     }
 
     protected function showResponse(Model $data)
     {
-        return response()->json($data, 200);
+        return $this->success($data, 200);
     }
 
     protected function updateResponse(Model $data)
     {
-        return response()->json($data, 202);
+        return $this->success($data, 202);
     }
 
     protected function destroyResponse(Model $data)
     {
-        return response()->json($data, 202);
+        return $this->success($data, 202);
     }
 
     protected function forceDestroyResponse(Model $data)
     {
-        return response()->json($data, 202);
+        return $this->success($data, 202);
     }
 
     protected function destroyManyResponse($deletedCount)
     {
-        return response()->json([
-            "message" => "$deletedCount item(s) deleted successfully"
-        ], 202);
+		return $this->success("$deletedCount item(s) deleted successfully", 202);
     }
 
     protected function restoreDestroyedResponse(Model $data)
     {
-        return response()->json($data, 202);
+        return $this->success($data, 202);
     }
 }

src/Controllers/Traits/Respond.php

@@ -18,6 +18,7 @@ trait Respond
     protected function error($message, $errors = null, $code = 400)
     {
         $resp = [
+			"status" => "error",
             "message" => $message
         ];
         if ($errors) $resp["errors"] = $errors;
@@ -40,7 +41,7 @@ protected function paginatedList(array $items, $code = 200) {
             $meta['pagination'] = $items;
             $resp['meta']['pagination'] = $items;
         }
-        return response()->json($resp, $code);
+		return $this->success($resp, $code);
     }
 
     /**

src/Controllers/Traits/Web.php

@@ -8,6 +8,16 @@
 trait Web
 {
     use Crud;
+
+    /**
+     * Called when an action is successfully processed.
+     *
+     * @param string $message
+     * @return Response
+     */
+	protected function success($status) {
+		return back()->withStatus($status);
+	}
 
     protected function error($message, $errors = null, $code = 400)
     {
@@ -20,31 +30,31 @@ protected function error($message, $errors = null, $code = 400)
 
     protected function storeResponse(Model $data)
     {
-        return back()->withStatus('Create successful');
+        return $this->success('Create successful');
     }
 
     protected function updateResponse(Model $data)
     {
-        return back()->withStatus('Update successful');
+        return $this->success('Update successful');
     }
 
     protected function destroyResponse(Model $data)
     {
-        return back()->withStatus('Delete successful');
+        return $this->success('Delete successful');
     }
 
     protected function forceDestroyResponse(Model $data)
     {
-        return back()->withStatus('Permanent delete successful');
+        return $this->success('Permanent delete successful');
     }
 
     protected function destroyManyResponse($deletedCount)
     {
-        return back()->withStatus("Deleted $deletedCount item(s) successfully");
+        return $this->success("Deleted $deletedCount item(s) successfully");
     }    
 
     protected function restoreDestroyedResponse(Model $data)
     {
-        return back()->withStatus('Restoration successful');
+        return $this->success('Restoration successful');
     }
 }

src/Models/Model.php

@@ -0,0 +1,24 @@
+<?php
+namespace Laraquick\Models;
+
+use Illuminate\Database\Eloquent\Model as iModel;
+
+abstract class Model extends iModel
+{
+
+    public function toArray()
+    {
+        $fillable = $this->fillable;
+        $fillable[] = 'id';
+		// Show only fillables
+        $array = collect(parent::toArray())
+            ->only($fillable)
+            ->all();
+		// Add loaded relations
+		foreach (array_keys($this->relations) as $relation) {
+			$array[$relation] = $this->$relation;
+		}
+		return $array;
+    }
+
+}

src/Models/WithSoftDeletes.php

@@ -1,7 +1,7 @@
 <?php
+
 namespace Laraquick\Models;
 
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 abstract class WithSoftDeletes extends Model
@@ -10,12 +10,4 @@ abstract class WithSoftDeletes extends Model
 
     protected $dates = ['deleted_at'];
 
-    public function toArray()
-    {
-        $fillable = $this->fillable;
-        $fillable[] = 'id';
-        return collect(parent::toArray())
-            ->only($fillable)
-            ->all();
-    }
 }