Merge branch 'master' of https://github.com/robinscholz/better-rest

.gitignore

@@ -7,7 +7,7 @@
 /tests/logs
 /tests/media
 /tests/site/accounts
-/tests/site/session
+/tests/site/sessions
 /tests/site/cache
 
 # files of Composer dependencies that are not needed for the plugin

README.md

@@ -57,7 +57,7 @@ composer require robinscholz/better-rest
 git submodule add https://github.com/robinscholz/better-rest.git site/plugins/better-rest
 ```
 
-### Credits
+## Credits
 A big thanks to [@bnomei](https://github.com/bnomei) who refactored the initial source code into something extendable and future proof. If you are using this plugin please consider buying a Kirby license through his [affiliate link](https://a.paddle.com/v2/click/1129/35731?link=1170)!
 
 ## License

classes/Betterrest.php

@@ -69,13 +69,15 @@ public function contentFromRequest(?\Kirby\Http\Request $request = null): ?array
         $request = $request ?? $this->kirby->request();
         $path = preg_replace('/rest/', '', (string)$request->path(), 1);
 
+        // @codeCoverageIgnoreStart
         // auto detect language
         if (! \Kirby\Toolkit\A::get($this->options, 'language')) {
             $language = $request->header('x-language');
             if ($language) {
                 $this->options['language'] = $language;
             }
         }
+        // @codeCoverageIgnoreEnd
 
         // if has language and is multilang setup...
         $language = \Kirby\Toolkit\A::get($this->options, 'language');
@@ -146,7 +148,7 @@ public function applyKirbytags(?string $value): string
 
     /**
      * @param $value
-     * @return string
+     * @return array
      */
     public function applySrcSet($value): array
     {

composer.json

@@ -2,7 +2,7 @@
   "name": "robinscholz/better-rest",
   "description": "Kirby Plugin for better REST requests",
   "type": "kirby-plugin",
-  "version": "1.0.1",
+  "version": "1.1.1",
   "license": "MIT",
   "authors": [
     {

tests/BetterrestTest.php

@@ -65,10 +65,16 @@ public function testContentModification()
         $this->assertNull($rest->modifyContent([]));
 
         $data = $rest->modifyContent($rest->content);
+
+        $this->assertIsArray($rest->getOptions()['srcset']);
+        $this->assertRegExp(
+            '/^\/media\/pages\/test\/.*(375w,).*(667w,).*(1024w,).*(1680w)$/',
+            $data['data']['content']['testimage'][0]['srcset']
+        );
+
+        $this->assertIsArray($data);
         $rest->setData($data);
         $this->assertTrue($rest->getData() === $data);
-
-        $this->assertIsArray($rest->data);
     }
 
     public function testNoDataResponse()

tests/IndexTest.php

@@ -39,10 +39,14 @@ public function testFindsTestPage()
         $this->assertRegExp('/media\/pages\/test\/.*-.*\/test.jpeg/', $response->body());
     }
 
-//    public function testFindsRoute()
+//    public function testFindsRouteFromTestConfig()
 //    {
-//        $response = kirby()->response('de/path/test');
+//        $response = kirby()->render('en/path/pages/test');
 //        $this->assertTrue($response->code() === 200);
 //        $this->assertTrue('application/json' === $response->type());
+//        $this->assertStringContainsString(
+//            'pages/test',
+//            json_decode($response->body())->path
+//        );
 //    }
 }

tests/site/blueprints/pages/default.yml

@@ -8,4 +8,4 @@ sections:
     type: fields
     fields:
       testimage:
-        type: image
+        type: files

tests/site/config/config.php

@@ -18,8 +18,8 @@
             [
                 'pattern' => 'path/(:all)',
                 'method' => 'GET',
-                'language' => '*',
-                'action' => function (string $path = null) {
+                'language' => 'en',
+                'action' => function ($language, string $path = null) {
                     return ['path' => $path];
                 },
             ],