Amend request body workings (#10)

* [f] correct method calls

* [f#5] change how response body is hydrated

closes #5

* [ch] add test run on git push

* [f] add post for test

* [ch] move `rewind` method to `end` event -

The resource should have the file pointer reset after the request has
finished but was left in the wrong place in error and pointed out by
@kelunik.

refs #10

* Change what gets called after install (#13)

* [ch] remove linter and docker cmd's from install

* [f] update with new method calls

* [ch] update docker commands for ease of use

* [f] update composer  script

* [ch] try to run tests via composer

Author: NigelGreenway

captainhook.json

@@ -16,6 +16,10 @@
     },
     "pre-push": {
         "enabled": false,
-        "actions": []
+        "actions": [
+            {
+                "action": "composer test"
+            }
+        ]
     }
 }

src/Server.php

@@ -93,21 +93,31 @@ public function run()
                 $response->writeHead(['Content-Type' => $request->getHeaders()['Accept'][0]]);
                 $response->end($body);
             } else {
-                $psr7Request = new ServerRequest(
-                    [],
-                    [],
-                    $request->getPath(),
-                    $request->getMethod(),
-                    (new Stream('php://input', 'w+')),
-                    $request->getHeaders(),
-                    $request->getHeader('cookie'),
-                    $request->getQueryParams()
-                );
-
-                $slimResponse = $this->slimInstance->process($psr7Request, new SlimResponse());
-                $response->writeHead($slimResponse->getStatusCode(), $slimResponse->getHeaders());
-                $slimResponse->getBody()->rewind();
-                $response->end($slimResponse->getBody()->getContents());
+                $stream = new Stream('php://memory', 'w+');
+
+                $request->on('data', function ($data) use ($stream) {
+                    $stream->write($data);
+                });
+
+                $request->on('end', function () use ($request, $response, $stream) {
+                    $stream->rewind();
+
+                    $psr7Request = new ServerRequest(
+                        [],
+                        [],
+                        $request->getPath(),
+                        $request->getMethod(),
+                        $stream,
+                        $request->getHeaders(),
+                        $request->getHeader('cookie'),
+                        $request->getQueryParams()
+                    );
+
+                    $slimResponse = $this->slimInstance->process($psr7Request, new SlimResponse());
+                    $response->writeHead($slimResponse->getStatusCode(), $slimResponse->getHeaders());
+                    $slimResponse->getBody()->rewind();
+                    $response->end($slimResponse->getBody()->getContents());
+                });
             }
         });
 

test/Integration/ServerStub.php

@@ -12,6 +12,15 @@
         ->write('<h1>Welcome to ReactiveSlim</h1>');
 });
 
+$slim->post('/json-post', function(\Psr\Http\Message\RequestInterface $req, \Psr\Http\Message\ResponseInterface $res) {
+   return $res
+       ->withHeader('Content-Type', 'application/json')
+       ->getBody()
+       ->write(
+           $req->getBody()->getContents()
+       );
+});
+
 (new \ReactiveSlim\Server($slim))
     ->setHost('0.0.0.0')
     ->setPort(1351)

test/Integration/ServerTest.php

@@ -15,4 +15,25 @@ public function test_response_body_is_as_expected()
         $response = $this->client->get($this->makeURL(''));
         $this->assertEquals('<h1>Welcome to ReactiveSlim</h1>', $response->getBody());
     }
+
+    public function test_Json_data_is_returned_in_the_body()
+    {
+        $data = json_encode(['name' => 'Jason']);
+        $headers = [
+            'Accept: application/json',
+            'Content-Type: application/json',
+        ];
+
+        $ch = curl_init('http://0.0.0.0:1351/json-post');
+        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
+        curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+        curl_setopt($ch, CURLOPT_TIMEOUT, 5);
+        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5);
+        $result = curl_exec($ch);
+        curl_close($ch);
+
+        $this->assertEquals('{"name":"Jason"}', $result);
+    }
 }