[WIP] move, rename delete resource of editable repository

.travis.yml

@@ -5,7 +5,7 @@ php:
   - 5.6
   - 7.0
   - hhvm
-  
+
 sudo: false
 
 cache:

Controller/ResourceController.php

@@ -11,10 +11,15 @@
 
 namespace Symfony\Cmf\Bundle\ResourceRestBundle\Controller;
 
+use PHPCR\Util\PathHelper;
+use Puli\Repository\Api\EditableRepository;
+use Puli\Repository\Api\ResourceRepository;
 use Symfony\Cmf\Component\Resource\RepositoryRegistryInterface;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use JMS\Serializer\SerializerInterface;
 use JMS\Serializer\SerializationContext;
+use Symfony\Component\Routing\Exception\RouteNotFoundException;
 
 class ResourceController
 {
@@ -29,7 +34,8 @@ class ResourceController
     private $serializer;
 
     /**
-     * @param RepositoryInterface
+     * @param SerializerInterface         $serializer
+     * @param RepositoryRegistryInterface $registry
      */
     public function __construct(
         SerializerInterface $serializer,
@@ -39,11 +45,104 @@ public function __construct(
         $this->registry = $registry;
     }
 
-    public function resourceAction($repositoryName, $path)
+    public function getResourceAction($repositoryName, $path)
     {
         $repository = $this->registry->get($repositoryName);
         $resource = $repository->get('/'.$path);
 
+        return $this->createResponse($resource);
+    }
+
+    /**
+     * There are two different changes that can currently be done on a cmf resource:
+     *
+     * - move
+     * - rename
+     *
+     * changing payload properties isn't supported yet.
+     *
+     * @param string $repositoryName
+     * @param string $path
+     * @param Request $request
+     *
+     * @return Response
+     */
+    public function patchResourceAction($repositoryName, $path, Request $request)
+    {
+        $repository = $this->registry->get($repositoryName);
+        $this->failOnNotEditable($repository, $repositoryName);
+
+        $resourcePath = $request->get('path');
+        $resourceName = $request->get('name');
+
+        $targetPath = null;
+        if ($path !== $resourcePath) {
+            $targetPath = $resourcePath;
+        } elseif ($resourceName !== PathHelper::getNodeName($path)) {
+            $targetPath = $targetPath = PathHelper::absolutizePath($repositoryName, PathHelper::getParentPath($path));
+        }
+
+        if (null == $targetPath) {
+            return $this->badRequestRespons('Move and rename is supported only.');
+        }
+
+        try {
+            $repository->move($path, $targetPath);
+        } catch (\InvalidArgumentException $e) {
+            return $this->badRequestResponse($e->getMessage());
+        }
+
+        $resource = $repository->get($targetPath);
+
+        return $this->createResponse($resource);
+    }
+
+    /**
+     * Delete a resource of a repository.
+     *
+     * @param string $repositoryName
+     * @param string $path
+     *
+     * @return Response
+     */
+    public function deleteResourceAction($repositoryName, $path)
+    {
+        $repository = $this->registry->get($repositoryName);
+        $this->failOnNotEditable($repository, $repositoryName);
+
+        try {
+            $repository->remove($path);
+        } catch (\InvalidArgumentException $e) {
+            return $this->badRequestResponse($e->getMessage());
+        }
+
+        return $this->createResponse('', Response::HTTP_NO_CONTENT);
+    }
+
+    private function failOnNotEditable(ResourceRepository $repository, $repositoryName)
+    {
+        if (!$repository instanceof EditableRepository) {
+            throw new RouteNotFoundException(sprintf('Repository %s is not editable.', $repositoryName));
+        }
+    }
+
+    /**
+     * @param string $message
+     *
+     * @return Response
+     */
+    private function badRequestResponse($message)
+    {
+        return $this->createResponse(['message' => $message], Response::HTTP_BAD_REQUEST);
+    }
+
+    /**
+     * @param object|array $resource
+     * @param int $httpStatusCode
+     * @return Response
+     */
+    private function createResponse($resource, $httpStatusCode = Response::HTTP_OK)
+    {
         $context = SerializationContext::create();
         $context->enableMaxDepthChecks();
         $context->setSerializeNull(true);
@@ -53,7 +152,7 @@ public function resourceAction($repositoryName, $path)
             $context
         );
 
-        $response = new Response($json);
+        $response = new Response($json, $httpStatusCode);
         $response->headers->set('Content-Type', 'application/json');
 
         return $response;

Enhancer/EnhancerInterface.php

@@ -11,8 +11,7 @@
 
 namespace Symfony\Cmf\Bundle\ResourceRestBundle\Enhancer;
 
-use JMS\Serializer\Context;
-use Puli\Repository\Api\Resource\PuliResource;
+use Puli\Repository\Api\Resource\Resource;
 
 /**
  * Enhancer classes enhance the REST response for resources.
@@ -28,8 +27,8 @@ interface EnhancerInterface
      *
      *     $context->addData('foobar', 'Some value');
      *
-     * @param Context Serialization context
-     * @param resource The resource being serialized
+     * @param []       $data        Context Serialization context
+     * @param Resource $resource    The resource being serialized
      */
-    public function enhance(array $data, PuliResource $resource);
+    public function enhance(array $data, Resource $resource);
 }

Enhancer/PayloadEnhancer.php

@@ -11,7 +11,7 @@
 
 namespace Symfony\Cmf\Bundle\ResourceRestBundle\Enhancer;
 
-use Puli\Repository\Api\Resource\PuliResource;
+use Puli\Repository\Api\Resource\Resource;
 
 /**
  * Serialize the payload.
@@ -23,7 +23,7 @@ class PayloadEnhancer implements EnhancerInterface
     /**
      * {@inheritdoc}
      */
-    public function enhance(array $data, PuliResource $resource)
+    public function enhance(array $data, Resource $resource)
     {
         $payload = $resource->getPayload();
         $data['payload'] = $payload;

Enhancer/SonataAdminEnhancer.php

@@ -14,7 +14,7 @@
 use Sonata\AdminBundle\Admin\Pool;
 use Doctrine\Common\Util\ClassUtils;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Puli\Repository\Api\Resource\PuliResource;
+use Puli\Repository\Api\Resource\Resource;
 
 /**
  * Add links and meta-info from Sonata Admin.
@@ -48,7 +48,7 @@ public function __construct(Pool $pool, UrlGeneratorInterface $urlGenerator)
     /**
      * {@inheritdoc}
      */
-    public function enhance(array $data, PuliResource $resource)
+    public function enhance(array $data, Resource $resource)
     {
         $object = $resource->getPayload();
 

README.md

@@ -1,6 +1,6 @@
 # Symfony CMF Resource REST API Bundle
 
-[![Build Status](https://secure.travis-ci.org/symfony-cmf/ResourceRestBundle.png?branch=master)](http://travis-ci.org/symfony-cmf/ResourceRestBundle)
+[![Build Status](https://travis-ci.org/symfony-cmf/resource-rest-bundle.svg?branch=master)](https://travis-ci.org/symfony-cmf/resource-rest-bundle)
 [![StyleCI](https://styleci.io/repos/29090266/shield)](https://styleci.io/repos/29090266)
 [![Latest Stable Version](https://poser.pugx.org/symfony-cmf/resource-rest-bundle/version.png)](https://packagist.org/packages/symfony-cmf/resource-rest-bundle)
 [![Total Downloads](https://poser.pugx.org/symfony-cmf/resource-rest-bundle/d/total.png)](https://packagist.org/packages/symfony-cmf/resource-rest-bundle)

Registry/EnhancerRegistry.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Cmf\Bundle\ResourceRestBundle\Registry;
 
+use Symfony\Cmf\Bundle\ResourceRestBundle\Enhancer\EnhancerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -65,7 +66,8 @@ public function getEnhancers($repositoryAlias)
         }
 
         $aliases = $this->enhancerMap[$repositoryAlias];
-
+        $enhancers = [];
+
         foreach ($aliases as $alias) {
             if (!isset($this->aliasMap[$alias])) {
                 throw new \InvalidArgumentException(sprintf(

Registry/PayloadAliasRegistry.php

@@ -11,9 +11,9 @@
 
 namespace Symfony\Cmf\Bundle\ResourceRestBundle\Registry;
 
+use Puli\Repository\Api\Resource\Resource;
 use Symfony\Cmf\Component\Resource\RepositoryRegistryInterface;
 use Symfony\Cmf\Component\Resource\Repository\Resource\CmfResource;
-use Puli\Repository\Api\Resource\PuliResource;
 
 /**
  * Registry for resource payload aliases.
@@ -54,11 +54,11 @@ public function __construct(
     /**
      * Return the alias for the given PHPCR resource.
      *
-     * @param resource $resource
+     * @param Resource $resource
      *
      * @return string
      */
-    public function getPayloadAlias(PuliResource $resource)
+    public function getPayloadAlias(Resource $resource)
     {
         $repositoryType = $this->repositoryRegistry->getRepositoryType(
             $resource->getRepository()

Resources/config/routing.yml

@@ -1,7 +1,26 @@
-_cmf_resource:
+_delete_cmf_resource:
     path: /api/{repositoryName}/{path}
+    methods: ['delete']
     requirements:
         path: .*
     defaults:
-        _controller: cmf_resource_rest.controller.resource:resourceAction
+        _controller: cmf_resource_rest.controller.resource:deleteResourceAction
+        _format: json
+
+_patch_cmf_resource:
+    path: /api/{repositoryName}/{path}
+    methods: ['patch']
+    requirements:
+        path: .*
+    defaults:
+        _controller: cmf_resource_rest.controller.resource:patchResourceAction
+        _format: json
+
+_get_cmf_resource:
+    path: /api/{repositoryName}/{path}
+    methods: ['get']
+    requirements:
+        path: .*
+    defaults:
+        _controller: cmf_resource_rest.controller.resource:getResourceAction
         _format: json

Serializer/Jms/EventSubscriber/ResourceSubscriber.php

@@ -14,8 +14,7 @@
 use JMS\Serializer\EventDispatcher\EventSubscriberInterface;
 use JMS\Serializer\EventDispatcher\Events;
 use JMS\Serializer\EventDispatcher\PreSerializeEvent;
-use Puli\Repository\Api\ResourceCollection;
-use Puli\Repository\Api\Resource\PuliResource;
+use Puli\Repository\Api\Resource\Resource;
 
 /**
  * Force instaces of ResourceCollection to type "ResourceCollection".
@@ -41,8 +40,8 @@ public function onPreSerialize(PreSerializeEvent $event)
     {
         $object = $event->getObject();
 
-        if ($object instanceof PuliResource) {
-            $event->setType('Puli\Repository\Api\Resource\PuliResource');
+        if ($object instanceof Resource) {
+            $event->setType('Puli\Repository\Api\Resource\Resource');
         }
     }
 }

Serializer/Jms/Handler/ResourceHandler.php

@@ -22,7 +22,7 @@
 use Symfony\Cmf\Bundle\ResourceRestBundle\Registry\PayloadAliasRegistry;
 use Symfony\Cmf\Bundle\ResourceRestBundle\Registry\EnhancerRegistry;
 use Symfony\Cmf\Component\Resource\Repository\Resource\CmfResource;
-use Puli\Repository\Api\Resource\PuliResource;
+use Puli\Repository\Api\Resource\Resource;
 
 /**
  * Handle PHPCR resource serialization.
@@ -51,7 +51,7 @@ public static function getSubscribingMethods()
             array(
                 'event' => GraphNavigator::DIRECTION_SERIALIZATION,
                 'format' => 'json',
-                'type' => 'Puli\Repository\Api\Resource\PuliResource',
+                'type' => 'Puli\Repository\Api\Resource\Resource',
                 'method' => 'serializeResource',
             ),
         );
@@ -65,15 +65,15 @@ public static function getSubscribingMethods()
      */
     public function serializeResource(
         JsonSerializationVisitor $visitor,
-        PuliResource $resource,
+        Resource $resource,
         array $type,
         Context $context
     ) {
         $data = $this->doSerializeResource($resource);
         $context->accept($data);
     }
 
-    private function doSerializeResource(PuliResource $resource, $depth = 0)
+    private function doSerializeResource(Resource $resource, $depth = 0)
     {
         $data = array();
         $repositoryAlias = $this->registry->getRepositoryAlias($resource->getRepository());

Tests/Resources/app/config/config.php

@@ -10,6 +10,7 @@
  */
 
 $container->setParameter('cmf_testing.bundle_fqn', 'Symfony\Cmf\Bundle\ResourceRestBundle');
+$container->setParameter('kernel.environment', 'test');
 $loader->import(CMF_TEST_CONFIG_DIR.'/dist/parameters.yml');
 $loader->import(CMF_TEST_CONFIG_DIR.'/dist/framework.php');
 $loader->import(CMF_TEST_CONFIG_DIR.'/dist/monolog.yml');

Tests/Unit/Registry/PayloadAliasRegistryTest.php

@@ -15,7 +15,9 @@
 
 class PayloadAliasRegistryTest extends \PHPUnit_Framework_TestCase
 {
-    private $registry;
+    private $repositoryRegistry;
+    private $resource;
+    private $repository;
 
     public function setUp()
     {

Tests/Unit/Serializer/Jms/Handler/ResourceHandlerTest.php

@@ -64,7 +64,7 @@ public function testHandler()
         $this->enhancerRegistry->getEnhancers('repo')->willReturn(array(
             $this->enhancer,
         ));
-        $this->enhancer->enhance(Argument::type('array'), Argument::type('Puli\Repository\Api\Resource\PuliResource'))
+        $this->enhancer->enhance(Argument::type('array'), Argument::type('Puli\Repository\Api\Resource\Resource'))
             ->will(function ($data, $resource) {
                 return $data[0];
             });

composer.json

@@ -9,11 +9,20 @@
             "homepage": "https://github.com/symfony-cmf/symfony-cmf/contributors"
         }
     ],
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/ElectricMaxxx/resource-bundle.git"
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/ElectricMaxxx/resource.git"
+        }
+    ],
     "minimum-stability": "dev",
-    "prefer-stable": true,
     "require": {
         "php": "^5.5.6|^7.0",
-        "symfony-cmf/resource-bundle": "1.*",
+        "symfony-cmf/resource-bundle": "dev-test_move_add_remove",
         "jms/serializer-bundle": "1.*"
     },
     "require-dev": {