Merge pull request #19 from symfony-cmf/include_body

Include body in case of BodyResource

Author: dantleech

Serializer/Jms/Handler/ResourceHandler.php

@@ -16,6 +16,7 @@
 use JMS\Serializer\Context;
 use PHPCR\NodeInterface;
 use PHPCR\Util\PathHelper;
+use Puli\Repository\Api\Resource\BodyResource;
 use Puli\Repository\Api\Resource\Resource;
 use Symfony\Cmf\Component\Resource\RepositoryRegistryInterface;
 use Symfony\Cmf\Bundle\ResourceRestBundle\Registry\PayloadAliasRegistry;
@@ -101,6 +102,10 @@ private function doSerializeResource(Resource $resource, $depth = 0)
         }
         $data['children'] = $children;
 
+        if ($resource instanceof BodyResource) {
+            $data['body'] = $resource->getBody();
+        }
+
         foreach ($enhancers as $enhancer) {
             $data = $enhancer->enhance($data, $resource);
         }

Tests/Features/Context/ResourceContext.php

@@ -17,6 +17,10 @@ class ResourceContext implements Context, KernelAwareContext
 {
     private $session;
     private $manager;
+
+    /**
+     * @var KernelInterface
+     */
     private $kernel;
 
     /**
@@ -61,15 +65,27 @@ public function beforeScenario(BeforeScenarioScope $scope)
     /**
      * @Given the test application has the following configuration:
      */
-    public function givenTheApplicationHasTheConfiguration(PyStringNode $config)
+    public function setApplicationConfig(PyStringNode $config)
     {
         file_put_contents(self::getConfigurationFile(), $config->getRaw());
     }
 
     /**
-     * @Given there exists a ":class" document at ":path":
+     * @Given there is a file named :filename with:
+     */
+    public function createFile($filename, PyStringNode $content)
+    {
+        $filesytem = new Filesystem();
+        $file = str_replace('%kernel.root_dir%', $this->kernel->getRootDir(), $filename);
+        $filesytem->mkdir(dirname($file));
+
+        file_put_contents($file, (string) $content);
+    }
+
+    /**
+     * @Given there exists a :class document at :path:
      */
-    public function givenThereExistsDocument($class, $path, TableNode $fields)
+    public function createDocument($class, $path, TableNode $fields)
     {
         $class = 'Symfony\\Cmf\\Bundle\\ResourceRestBundle\\Tests\\Resources\\TestBundle\\Document\\' . $class;
         $path = '/tests' . $path;

Tests/Features/resource_api_filesystem.feature

@@ -0,0 +1,37 @@
+Feature: Filesystem resource repository
+    In order to retrieve data from the resource webservice
+    As a webservice user
+    I need to be able to query the webservice
+
+    Background:
+        Given the test application has the following configuration:
+            """
+            cmf_resource:
+                repositories:
+                    default:
+                        type: filesystem
+                        base_dir: "%kernel.root_dir%/Resources/views/snippets"
+            """
+        And there is a file named "%kernel.root_dir%/Resources/views/snippets/snippet1.html" with:
+            """
+            <h1>Snippet 1</h1>
+            """
+
+
+    Scenario: Retrieve filesystem resource
+        When I send a GET request to "/api/default/snippet1.html"
+        Then the response should contain json:
+            """
+            {
+                "repository_alias": "default",
+                "repository_type": "filesystem",
+                "payload_alias": null,
+                "payload_type": null,
+                "path": "\/snippet1.html",
+                "node_name": "snippet1.html",
+                "label": "snippet1.html",
+                "repository_path": "\/snippet1.html",
+                "children": [],
+                "body": "<h1>Snippet 1</h1>"
+            }
+            """

Tests/Features/resource_api_phpcr.feature

@@ -24,9 +24,8 @@ Feature: PHPCR resource repository
         Given there exists a "Article" document at "/cmf/articles/foo":
             | title | Article 1 |
             | body | This is my article |
-        Then I send a GET request to "/api/phpcr_repo/foo"
-        And print response
-        And the response should contain json:
+        When I send a GET request to "/api/phpcr_repo/foo"
+        Then the response should contain json:
             """
             {
                 "repository_alias": "phpcr_repo",

Tests/Features/resource_api_phpcr_odm.feature

@@ -14,7 +14,7 @@ Feature: PHPCR-ODM resource repository
 
             cmf_resource_rest:
                 payload_alias_map:
-                    article: 
+                    article:
                         repository: doctrine_phpcr_odm
                         type: "Symfony\\Cmf\\Bundle\\ResourceRestBundle\\Tests\\Resources\\TestBundle\\Document\\Article"
             """
@@ -24,9 +24,8 @@ Feature: PHPCR-ODM resource repository
         Given there exists a "Article" document at "/cmf/articles/foo":
             | title | Article 1 |
             | body | This is my article |
-        Then I send a GET request to "/api/phpcrodm_repo/foo"
-        And print response
-        And the response code should be 200
+        When I send a GET request to "/api/phpcrodm_repo/foo"
+        Then the response code should be 200
         And the response should contain json:
             """
             {
@@ -52,9 +51,8 @@ Feature: PHPCR-ODM resource repository
         And there exists a "Article" document at "/cmf/articles/foo/boo":
             | title | Article child |
             | body | But this one is mine |
-        Then I send a GET request to "/api/phpcrodm_repo/foo"
-        And print response
-        And the response code should be 200
+        When I send a GET request to "/api/phpcrodm_repo/foo"
+        Then the response code should be 200
         And the response should contain json:
             """
             {

Tests/Resources/app/Resources/views/snippets/snippet1.html

@@ -0,0 +1 @@
+<h1>Snippet 1</h1>