Merge remote-tracking branch 'base/master' into patch-1

Author: rodrigopedra

readme.md

@@ -43,19 +43,6 @@ If you'd like to use a different root view, you can change it using `Inertia::se
 Inertia\Inertia::setRootView('name');
 ~~~
 
-## Add Inertia middleware
-
-Next, add the `Inertia\Middleware` middleware to your `web` middleware group, found in the `/app/Http/Kernel.php` file. This middleware monitors for asset changes, and also fixes an edge case with 302 redirects. Be sure to include this middleware *after* any session related middleware.
-
-~~~php
-protected $middlewareGroups = [
-    'web' => [
-        // ...
-        \Inertia\Middleware::class,
-    ]
-];
-~~~
-
 ## Making Inertia responses
 
 To make an Inertia response, use `Inertia::render()`. This function takes two arguments, the component name, and the component data (props).

src/Controller.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Inertia;
+
+class Controller
+{
+    public function __invoke($component, $props)
+    {
+        return Inertia::render($component, $props);
+    }
+}

src/ServiceProvider.php

@@ -2,20 +2,38 @@
 
 namespace Inertia;
 
+use Illuminate\Routing\Router;
+use Illuminate\Contracts\Http\Kernel;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\ServiceProvider as BaseServiceProvider;
 
 class ServiceProvider extends BaseServiceProvider
 {
-    /**
-     * Perform post-registration booting of services.
-     *
-     * @return void
-     */
     public function boot()
+    {
+        $this->registerBladeDirective();
+        $this->registerRouterMacro();
+        $this->registerMiddleware();
+    }
+
+    protected function registerBladeDirective()
     {
         Blade::directive('inertia', function () {
             return '<div id="app" data-page="{{ json_encode($page) }}"></div>';
         });
     }
+
+    protected function registerRouterMacro()
+    {
+        Router::macro('inertia', function ($uri, $component, $props = []) {
+            return $this->match(['GET', 'HEAD'], $uri, '\Inertia\Controller')
+                ->defaults('component', $component)
+                ->defaults('props', $props);
+        });
+    }
+
+    protected function registerMiddleware()
+    {
+        $this->app[Kernel::class]->pushMiddleware(Middleware::class);
+    }
 }

tests/ControllerTest.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Inertia\Tests;
+
+use Inertia\Response;
+use Inertia\Controller;
+use Illuminate\Http\Request;
+
+class ControllerTest extends TestCase
+{
+    public function test_controller_returns_an_inertia_response()
+    {
+        $response = (new Controller())('User/Edit', ['user' => ['name' => 'Jonathan']]);
+
+        $this->assertInstanceOf(Response::class, $response);
+        $this->assertEquals([
+            'page' => [
+                'component' => 'User/Edit',
+                'props' => ['user' => ['name' => 'Jonathan']],
+                'url' => '',
+                'version' => null,
+            ],
+        ], $response->toResponse(new Request())->getData());
+    }
+}

tests/HelperTest.php

@@ -15,7 +15,7 @@ public function test_the_helper_function_returns_an_instance_of_the_response_fac
 
     public function test_the_helper_function_returns_a_response_instance()
     {
-        $this->assertInstanceOf(Response::class, inertia('User/Edit', ['user' => ['name' => 'George']]));
+        $this->assertInstanceOf(Response::class, inertia('User/Edit', ['user' => ['name' => 'Jonathan']]));
     }
 
     public function test_the_instance_is_the_same_as_the_facade_instance()

tests/ServiceProviderTest.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace Inertia\Tests;
+
+use Inertia\Middleware;
+use Illuminate\Support\Facades\App;
+use Illuminate\Contracts\Http\Kernel;
+use Illuminate\Support\Facades\Blade;
+use Illuminate\Support\Facades\Route;
+
+class ServiceProviderTest extends TestCase
+{
+    public function test_blade_directive_is_registered()
+    {
+        $directives = Blade::getCustomDirectives();
+
+        $this->assertArrayHasKey('inertia', $directives);
+        $this->assertEquals('<div id="app" data-page="{{ json_encode($page) }}"></div>', $directives['inertia']());
+    }
+
+    public function test_route_macro_is_registered()
+    {
+        $route = Route::inertia('/', 'User/Edit', ['user' => ['name' => 'Jonathan']]);
+        $routes = Route::getRoutes();
+
+        $this->assertNotEmpty($routes->getRoutes());
+        $this->assertEquals($route, $routes->getRoutes()[0]);
+        $this->assertEquals(['GET', 'HEAD'], $route->methods);
+        $this->assertEquals('/', $route->uri);
+        $this->assertEquals(['uses' => '\Inertia\Controller@__invoke', 'controller' => '\Inertia\Controller'], $route->action);
+        $this->assertEquals(['component' => 'User/Edit', 'props' => ['user' => ['name' => 'Jonathan']]], $route->defaults);
+    }
+
+    public function test_middleware_is_registered()
+    {
+        $kernel = App::make(Kernel::class);
+
+        $this->assertTrue($kernel->hasMiddleware(Middleware::class));
+    }
+}