Merge branch 'master' into 5.2

Author: Shashank Jain

README.md

@@ -6,8 +6,6 @@
 
 This package provides a powerful Rest API functionality for your Laravel project, with minimum code required for you to write.
 
-**Note**: This package is under development and not recommended for use in production.
-
 ## Documentation
 For full documentation please refer to [plugin's wiki](https://github.com/Froiden/laravel-rest-api/wiki).
 

src/ApiController.php

@@ -164,7 +164,7 @@ public function index()
      *
      * @return mixed
      */
-    public function show()
+    public function show(...$args)
     {
         // We need to do this in order to support multiple parameter resource routes. For example,
         // if we map route /user/{user}/comments/{comment} to a controller, Laravel will pass `user`
@@ -216,7 +216,7 @@ public function store()
         return ApiResponse::make("Resource created successfully", [ "id" => $object->id ], $meta);
     }
 
-    public function update()
+    public function update(...$args)
     {
         \DB::beginTransaction();
 
@@ -254,7 +254,7 @@ public function update()
         return ApiResponse::make("Resource updated successfully", [ "id" => $object->id ], $meta);
     }
 
-    public function destroy()
+    public function destroy(...$args)
     {
         \DB::beginTransaction();
 
@@ -436,7 +436,13 @@ protected function addIncludes()
                         // need to be attached
                         if ($q instanceof BelongsTo) {
                             $fields[] = $q->getOtherKey();
-//                            $relations[$key]["foreign"] = $q->getOtherKey();
+
+                            if (strpos($key, ".") !== false) {
+                                $parts = explode(".", $key);
+                                array_pop($parts);
+
+                                $relation["limit"] = $relations[implode(".", $parts)]["limit"];
+                            }
                         }
                         else if ($q instanceof HasOne) {
                             $fields[] = $q->getForeignKey();
@@ -448,6 +454,8 @@ protected function addIncludes()
                         else if ($q instanceof HasMany) {
                             $fields[] = $q->getForeignKey();
                             $relations[$key]["foreign"] = $q->getForeignKey();
+
+                            $q->orderBy($primaryKey, ($relation["order"] == "chronological") ? "ASC" : "DESC");
                         }
 
                         $q->select($fields);
@@ -694,7 +702,7 @@ protected function getMetaData($single = false)
             \DB::disableQueryLog();
 
             $meta["queries"] = count($log);
-//            $meta["queries_list"] = $log;
+           $meta["queries_list"] = $log;
         }
 
         return $meta;
@@ -770,7 +778,7 @@ protected function isUpdate()
      */
     protected function isDelete()
     {
-        return in_array("delete", explode(".", request()->route()->getName()));
+        return in_array("destroy", explode(".", request()->route()->getName()));
     }
 
     /**

src/Middleware/ApiMiddleware.php

@@ -5,6 +5,7 @@
 use Closure;
 use Froiden\RestAPI\ApiResponse;
 use Froiden\RestAPI\Exceptions\UnauthorizedException;
+use Illuminate\Support\Str;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class ApiMiddleware
@@ -15,7 +16,7 @@ public function handle($request, Closure $next)
         // Add CORS headers
         $response = $next($request);
 
-        if ($response->getStatusCode() == 403 && $response->getContent() == "Forbidden") {
+        if ($response->getStatusCode() == 403 && ($response->getContent() == "Forbidden" || Str::contains($response->getContent(), ['HttpException', 'authorized']))) {
             $response = ApiResponse::exception(new UnauthorizedException());
         }
 

src/RequestParser.php

@@ -22,7 +22,7 @@ class RequestParser
     /**
      * Extracts fields parts
      */
-    const FIELD_PARTS_REGEX = "/([^{.]+)(.limit\\(([0-9]+)\\)|.offset\\(([0-9]+)\\)|.order\\(([A-Za-z]+)\\))*(\\{((?>[^{}]+)|(?R))*\\})?/i";
+    const FIELD_PARTS_REGEX = "/([^{.]+)(.limit\\(([0-9]+)\\)|.offset\\(([0-9]+)\\)|.order\\(([A-Za-z_]+)\\))*(\\{((?>[^{}]+)|(?R))*\\})?/i";
 
     /**
      * Checks if filters are correctly specified
@@ -456,8 +456,6 @@ private function parseFields($fields)
                         else {
                             $this->relations[$parent]["fields"][] = $singular;
                         }
-
-                        \Log::debug($this->relations[$parent]);
                     }
                     else {
 

tests/TestCase.php

@@ -116,7 +116,7 @@ public function createTables()
         Schema::create('dummy_users', function (Blueprint $table) {
             $table->increments('id');
             $table->string('name');
-            $table->string('email')->unique();
+            $table->string('email', 100)->unique();
             $table->integer('age');
             $table->timestamps();
         });