Remove old first parameter from middleware setup.

Return JSON from your Node server to change the variable name passed to your view.

Author: BradEstey

README.md

@@ -86,22 +86,17 @@ In the config file you can change the host and port of the compiler server and c
 
 ---
 
-To change the variable name that will contain the HTML and be passed to your view, use the first parameter of the middleware definition.
-
-``` php
-Route::get('/', ['middleware' => 'react:layout', 'uses' => 'HomeController@index']);
-```
 
 AJAX requests to this route will return the data array passed to your view as plain JSON. So the example above would return:
 
 ``` json
 { "title": "Your title here." }
 ```
 
-To disable the JSON response on AJAX requests, pass "disable_json" to the second parameter.
+To disable the JSON response on AJAX requests, pass "disable_json" to the first parameter.
 
 ``` php
-Route::get('/', ['middleware' => 'react:content,disable_json', 'uses' => 'HomeController@index']);
+Route::get('/', ['middleware' => 'react:disable_json', 'uses' => 'HomeController@index']);
 ```
 
 Merge JSON Response

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "estey/laravel-react-middleware",
-    "description": "Middleware for React server-side rendering in Laravel.",
+    "description": "Middleware for React.js server-side rendering in Laravel.",
     "keywords": ["laravel", "react", "reactjs", "server-side rendering", "middleware"],
     "homepage": "http://www.bradestey.com/projects/laravel-react-middleware",
     "license": "MIT",

src/CompileReact.php

@@ -59,14 +59,12 @@ public function __construct(Config $config)
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  \Closure  $next
-     * @param  string  $contentKey
-     * @param  boolean  $isAjaxRespondWithJson
+     * @param  string  $ajaxRespondsWithJson
      * @return mixed
      */
     public function handle(
         Request $request,
         Closure $next,
-        $contentKey = 'content',
         $ajaxRespondsWithJson = null
     ) {
         $this->path = $request->path();
@@ -85,20 +83,19 @@ public function handle(
             return $this->respondWithJson();
         }
 
-        return $this->compile($contentKey);
+        return $this->compile();
     }
 
     /**
      * Make an HTTP request to the React compiler. Return the
      * compiled view string.
      *
-     * @param  string  $contentKey
      * @return \Illuminate\Http\Response
      */
-    protected function compile($contentKey)
+    protected function compile()
     {
         $content = $this->getResponse();
-        $contents = !is_object($content) ? [$contentKey => $content] : $content;
+        $contents = !is_object($content) ? compact('content') : $content;
 
         foreach ($contents as $key => $value) {
             $this->view->with($key, $value);

test/Unit/CompileReactTest.php

@@ -58,7 +58,6 @@ public function testHandle()
         $mock
             ->shouldReceive('compile')
             ->once()
-            ->with('content')
             ->andReturn('foo bar baz');
 
         $this->assertEquals(
@@ -100,11 +99,10 @@ public function testHandleNoAjax()
         $mock
             ->shouldReceive('compile')
             ->once()
-            ->with('foo')
             ->andReturn('foo bar baz');
 
         $this->assertEquals(
-            $mock->handle($request, $next, 'foo', 'disable_json'),
+            $mock->handle($request, $next, 'disable_json'),
             'foo bar baz'
         );
     }
@@ -192,9 +190,12 @@ public function testHandleException()
 
     /**
      * Helper method for testing the compile() method.
-     * @return [type] [description]
+     *
+     * @param  $shouldRespond  string
+     * @param  $shouldReturn  string
+     * @return void
      */
-    protected function compile($compileKey, $shouldRespond, $shouldReturn)
+    protected function compile($shouldRespond, $shouldReturn)
     {
         $mock = m::mock(
             'Estey\ReactMiddleware\CompileReact[getResponse]',
@@ -218,7 +219,7 @@ protected function compile($compileKey, $shouldRespond, $shouldReturn)
             $this->view
                 ->shouldReceive('with')
                 ->once()
-                ->with($compileKey, $shouldRespond)
+                ->with('content', $shouldRespond)
                 ->andReturn($this->view);
         }
 
@@ -242,10 +243,10 @@ protected function compile($compileKey, $shouldRespond, $shouldReturn)
      */
     public function testCompile()
     {
-        $this->compile('foo', 'foo bar', 'foo bar baz');
-        $this->compile('foo', null, 'foo bar baz');
-        $this->compile('', (object) ['foo' => 'bar'], 'foo bar baz');
-        $this->compile('', (object) ['foo' => 'bar', 'baz' => 'bar'], 'foo bar baz');
+        $this->compile('foo bar', 'foo bar baz');
+        $this->compile(null, 'foo bar baz');
+        $this->compile((object) ['foo' => 'bar'], 'foo bar baz');
+        $this->compile((object) ['foo' => 'bar', 'baz' => 'bar'], 'foo bar baz');
     }
 
     /**
@@ -311,6 +312,8 @@ public function testGetCompilerUrlPrefixPath()
     /**
      * Helper method for testing the getResponse() method.
      *
+     * @param  $shouldRespond  string
+     * @param  $shouldReturn  string
      * @return void
      */
     protected function getResponse($shouldRespond, $shouldReturn)