Minor fixes

Author: arrilot

src/Generator/ApiMakeCommand.php

@@ -128,7 +128,7 @@ protected function setControllerData()
     {
         $this->stubVariables['controllerName'] = $this->stubVariables['modelName'].'Controller';
         $this->stubVariables['controllerName'] = $this->stubVariables['modelName'].'Controller';
-        $this->stubVariables['controllerNamespace'] = $this->appNamespace.$this->convertSlashes(config('laravel-api-generator.controllers_path'));
+        $this->stubVariables['controllerNamespace'] = $this->appNamespace.$this->convertSlashes(config('laravel-api-generator.controllers_dir'));
         $this->stubVariables['controllerFullName'] = trim($this->stubVariables['controllerNamespace'].'\\'.$this->stubVariables['controllerName'], '\\');
 
         return $this;
@@ -158,7 +158,7 @@ protected function setRouteData()
     protected function setTransformerData()
     {
         $this->stubVariables['transformerName'] = $this->stubVariables['modelName'].'Transformer';
-        $this->stubVariables['transformerNamespace'] = $this->appNamespace.$this->convertSlashes(config('laravel-api-generator.transformers_path'));
+        $this->stubVariables['transformerNamespace'] = $this->appNamespace.$this->convertSlashes(config('laravel-api-generator.transformers_dir'));
         $this->stubVariables['transformerFullName'] = trim($this->stubVariables['transformerNamespace'].'\\'.$this->stubVariables['transformerName'], '\\');
 
         return $this;
@@ -191,14 +191,14 @@ protected function addRoutes()
 
         // read file
         $lines = file($routesFile);
-        $lastLine = $lines[count($lines) - 1];
+        $lastLine = trim($lines[count($lines) - 1]);
 
         // modify file
         if (strcmp($lastLine, '});') === 0) {
             $lines[count($lines) - 1] = '    '.$stub;
-            $lines[] = "\r\n});";
+            $lines[] = "\r\n});\r\n";
         } else {
-            $lines[] = "\r\n".$stub;
+            $lines[] = "$stub\r\n";
         }
 
         // save file

src/Generator/stubs/controller.stub

@@ -24,4 +24,5 @@ class {{controllerName}} extends Controller
     {
         return new {{transformerName}};
     }
+
 }

src/Generator/stubs/transformer.stub

@@ -14,10 +14,9 @@ class {{transformerName}} extends TransformerAbstract
     public function transform({{modelName}} $item)
     {
         return [
-            'id'                      => (int)$item->id,
-            'created_at'              => (string)$item->created_at,
-            'updated_at'              => (string)$item->updated_at,
+            'id'         => (int)$item->id,
+            'created_at' => (string)$item->created_at,
+            'updated_at' => (string)$item->updated_at,
         ];
     }
-
 }

src/Skeleton/BaseController.php

@@ -89,7 +89,6 @@ public function getStatusCode()
      * Setter for statusCode.
      *
      * @param int $statusCode Value to set
-     *
      * @return self
      */
     public function setStatusCode($statusCode)
@@ -104,7 +103,6 @@ public function setStatusCode($statusCode)
      *
      * @param $item
      * @param $callback
-     *
      * @return mixed
      */
     protected function respondWithItem($item, $callback)
@@ -121,7 +119,6 @@ protected function respondWithItem($item, $callback)
      *
      * @param $collection
      * @param $callback
-     *
      * @return mixed
      */
     protected function respondWithCollection($collection, $callback)
@@ -138,7 +135,6 @@ protected function respondWithCollection($collection, $callback)
      *
      * @param array $array
      * @param array $headers
-     *
      * @return mixed
      */
     protected function respondWithArray(array $array, array $headers = [])
@@ -150,7 +146,6 @@ protected function respondWithArray(array $array, array $headers = [])
      * Response with the current error.
      *
      * @param $message
-     *
      * @return mixed
      */
     protected function respondWithError($message)
@@ -167,7 +162,6 @@ protected function respondWithError($message)
      * Prepare root scope and adds meta.
      *
      * @param Item $resource
-     *
      * @return mixed
      */
     protected function prepareRootScope($resource)
@@ -195,7 +189,6 @@ protected function rulesForCreate()
      * Get the validation rules for update.
      *
      * @param $id
-     *
      * @return array
      */
     protected function rulesForUpdate($id)
@@ -219,7 +212,6 @@ public function errorForbidden($message = 'Forbidden')
      * Generate a Response with a 500 HTTP header and a given message.
      *
      * @param $message
-     *
      * @return Response
      */
     public function errorInternalError($message = 'Internal Error')
@@ -243,7 +235,6 @@ public function errorNotFound($message = 'Resource Not Found')
      * Generate a Response with a 401 HTTP header and a given message.
      *
      * @param $message
-     *
      * @return Response
      */
     public function errorUnauthorized($message = 'Unauthorized')
@@ -255,7 +246,6 @@ public function errorUnauthorized($message = 'Unauthorized')
      * Generate a Response with a 400 HTTP header and a given message.
      *
      * @param $message
-     *
      * @return Response
      */
     public function errorWrongArgs($message = 'Wrong Arguments')
@@ -317,7 +307,6 @@ public function store()
      * GET /api/{resource}/{id}.
      *
      * @param int $id
-     *
      * @return Response
      */
     public function show($id)
@@ -337,7 +326,6 @@ public function show($id)
      * PUT /api/{resource}/{id}.
      *
      * @param int $id
-     *
      * @return Response
      */
     public function update($id)
@@ -372,7 +360,6 @@ public function update($id)
      * DELETE /api/{resource}/{id}.
      *
      * @param int $id
-     *
      * @return Response
      */
     public function destroy($id)

src/config/config.php

@@ -1,12 +1,39 @@
 <?php
 
 return [
-    'controllers_path'  => 'Api/Controllers',
-    'transformers_path' => 'Api/Transformers',
-    'routes_file'       => 'Api/routes.php',
-    'models_base_dir'   => 'Models',
 
+    /*
+     * Relative path from the app directory to api controllers directory.
+     */
+    'controllers_dir'  => 'Api/Controllers',
+
+    /*
+     * Relative path from the app directory to transformers directory.
+     */
+    'transformers_dir' => 'Api/Transformers',
+
+    /*
+     * Relative path from the app directory to the api routes file.
+     */
+    'routes_file'      => 'Api/routes.php',
+
+    /*
+     * Relative path from the app directory to the models directory. Typically it's either 'Models' or ''.
+     */
+    'models_base_dir'  => '',
+
+    /*
+     * Relative path from the base directory to the api controller stub.
+     */
     'controller_stub'  => 'vendor/arrilot/laravel-api-generator/src/Generator/stubs/controller.stub',
+
+    /*
+     * Relative path from the base directory to the route stub.
+     */
     'route_stub'       => 'vendor/arrilot/laravel-api-generator/src/Generator/stubs/route.stub',
+
+    /*
+     * Relative path from the base directory to the transformer stub.
+     */
     'transformer_stub' => 'vendor/arrilot/laravel-api-generator/src/Generator/stubs/transformer.stub',
 ];

templates/Api/routes.php

@@ -1,5 +1,5 @@
 <?php
 
-Route::group(['prefix' => 'api/v1'], function () {
+Route::group(['prefix' => 'api/v1', 'namespace' => 'App\Api\Controllers'], function () {
     //
 });