More tests pass..

Author: dantleech

AutoRoute/Adapter/PhpcrOdmAdapter.php

@@ -17,6 +17,7 @@
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
 use PHPCR\Util\NodeHelper;
 use Symfony\Cmf\Bundle\RoutingAutoBundle\Model\AutoRoute;
+use PHPCR\InvalidItemStateException;
 
 /**
  * Abstraction adapter for PHPCR-ODM
@@ -52,30 +53,47 @@ public function translateObject($contentDocument, $locale)
         return $contentDocument;
     }
 
-    public function createRoute($url, $contentDocument)
+    public function removeDefunctRoute($route, $canonicalRoute)
     {
-        $path = $this->getPathFromUrl($url);
-        $pathElements = explode('/', $path);
-        $headName = array_pop($pathElements);
-        $parentPath = implode('/', $pathElements);
-
-        // bypass the ODM ... but changes will still only be
-        // persisted when the PHPCR session is saved in the ODMs flush().
-        NodeHelper::createPath($this->dm->getPhpcrSession(), $parentPath);
+        $session = $this->dm->getPhpcrSession();
+        try {
+            $node = $this->dm->getNodeForDocument($route);
+            $canonicalNode = $this->dm->getNodeForDocument($canonicalRoute);
+            $nodeChildren = $node->getNodes();
+            foreach ($nodeChildren as $nodeChild) {
+                $session->move($nodeChild->getPath(), $canonicalNode->getPath() . '/' . $nodeChild->getName());
+            }
+            $session->removeItem($node->getPath());
+        } catch (InvalidItemStateException $e) {
+            // nothing ..
+        }
 
-        $autoRouteParent = $this->dm->find(null, $parentPath);
+        $session->save();
+    }
 
-        if (!$autoRouteParent) {
-            throw new \RuntimeException(sprintf(
-                'Hmph, could not find parent path "%s", this really should not have happened.',
-                $parentPath
-            ));
+    public function createRoute($url, $contentDocument)
+    {
+        $path = $this->baseRoutePath;
+        $parentDocument = $this->dm->find(null, $path);
+
+        $segments = preg_split('#/#', $url, null, PREG_SPLIT_NO_EMPTY);
+        $headName = array_pop($segments);
+        foreach ($segments as $segment) {
+            $path .= '/' . $segment;
+            $document = $this->dm->find(null, $path);
+
+            if (null === $document) {
+                $document = new Generic();
+                $document->setParent($parentDocument);
+                $document->setNodeName($segment);
+                $this->dm->persist($document);
+            }
         }
 
         $headRoute = new AutoRoute();
         $headRoute->setContent($contentDocument);
         $headRoute->setName($headName);
-        $headRoute->setParent($autoRouteParent);
+        $headRoute->setParent($document);
 
         return $headRoute;
     }
@@ -113,3 +131,4 @@ private function getPathFromUrl($url)
         return $this->baseRoutePath . $url;
     }
 }
+

AutoRoute/AutoRouteManager.php

@@ -26,6 +26,8 @@ class AutoRouteManager
     protected $urlGenerator;
     protected $defunctRouteHandler;
 
+    private $defunctRouteStack = array();
+
     /**
      * @param AdapterInterface             $adapter             Database adapter
      * @param UrlGeneratorInterface        $urlGenerator        Routing auto URL generator
@@ -66,11 +68,20 @@ public function buildOperationStack(OperationStack $operationStack, $document)
             $operationStack->pushNewRoute($newRoute);
         }
 
-        $this->defunctRouteHandler->handleDefunctRoutes($document, $operationStack);
+        $this->defunctRouteStack[] = array($document, $operationStack);
 
+        // do we really need the operation stack now? We can just persist...
         return $operationStack;
     }
 
+    public function handleDefunctRoutes()
+    {
+        while ($defunctRoute = array_pop($this->defunctRouteStack)) {
+            list ($document, $operationStack) = $defunctRoute;
+            $this->defunctRouteHandler->handleDefunctRoutes($document, $operationStack);
+        }
+    }
+
     private function getUrlsForDocument($document)
     {
         $urls = array();

AutoRoute/DefunctRouteHandler.php

@@ -3,6 +3,9 @@
 namespace Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute;
 
 use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\OperationStack;
+use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\Mapping\MetadataFactory;
+use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\Adapter\AdapterInterface;
+use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\ServiceRegistry;
 
 /**
  * Class which takes actions on routes which are left behind
@@ -25,7 +28,7 @@ class DefunctRouteHandler implements DefunctRouteHandlerInterface
      * @param AdapterInterface auto routing backend adapter
      * @param MetadataFactory  auto routing metadata factory
      */
-    public function __consturct(
+    public function __construct(
         MetadataFactory $metadataFactory,
         AdapterInterface $adapter,
         ServiceRegistry $serviceRegistry
@@ -41,5 +44,13 @@ public function __consturct(
      */
     public function handleDefunctRoutes($document, OperationStack $operationStack)
     {
+        $referrerCollection = $this->adapter->getReferringRoutes($document);
+
+        foreach ($referrerCollection as $referrer) {
+            if (!$operationStack->containsRoute($referrer)) {
+                $canonicalRoutes = $operationStack->getPersistStack();
+                $this->adapter->removeDefunctRoute($referrer, $canonicalRoutes[0]);
+            }
+        }
     }
 }

AutoRoute/OperationStack.php

@@ -17,4 +17,15 @@ public function getPersistStack()
     {
         return $this->persistStack;
     }
+
+    public function containsRoute(RouteObjectInterface $targetRoute)
+    {
+        foreach ($this->persistStack as $route) {
+            if ($route === $targetRoute) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }

Doctrine/Phpcr/AutoRouteListener.php

@@ -88,6 +88,12 @@ public function onFlush(ManagerEventArgs $args)
         }
     }
 
+    public function postFlush()
+    {
+        $arm = $this->getAutoRouteManager();
+        $arm->handleDefunctRoutes();
+    }
+
     private function isAutoRouteable($document)
     {
         return $this->getMetadataFactory()->getMetadataForClass(get_class($document));

Resources/config/auto_route.xml

@@ -67,6 +67,7 @@
         <service id="cmf_routing_auto.phpcrodm_auto_route_listener" class="%cmf_routing_auto.phpcrodm_auto_route_listener.class%">
             <argument type="service" id="service_container"/>
             <tag name="doctrine_phpcr.event_listener" event="onFlush"/>
+            <tag name="doctrine_phpcr.event_listener" event="postFlush"/>
         </service>
 
         <!-- Metadata -->

Tests/Functional/BaseTestCase.php

@@ -26,6 +26,7 @@ public function setUp(array $options = array(), $routebase = null)
 
         if (!$session->nodeExists('/test')) {
             $session->getRootNode()->addNode('test', 'nt:unstructured');
+            $session->getNode('/test')->addNode('auto-route');
         }
 
         $session->save();

Tests/Functional/EventListener/AutoRouteListenerTest.php

@@ -95,6 +95,8 @@ public function testUpdateRenameBlog($withPosts = false)
             $this->assertNotNull($post);
 
             $routes = $post->routes;
+
+            $this->assertNotNull($routes[0]);
             $this->getDm()->refresh($routes[0]);
 
             $this->assertEquals('/test/auto-route/blog/foobar/2013/03/21/this-is-a-post-title', $routes[0]->getId());

sr Yl CmSele RootSiteSelector.php

@@ -0,0 +1,115 @@
+<?php
+
+/*
+ * This file is part of the Symfony CMF package.
+ *
+ * (c) 2011-2013 Symfony CMF
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\Adapter;
+
+use Doctrine\ODM\PHPCR\DocumentManager;
+use Doctrine\ODM\PHPCR\Document\Generic;
+use Doctrine\Common\Util\ClassUtils;
+use Symfony\Cmf\Component\Routing\RouteObjectInterface;
+use PHPCR\Util\NodeHelper;
+use Symfony\Cmf\Bundle\RoutingAutoBundle\Model\AutoRoute;
+
+/**
+ * Abstraction adapter for PHPCR-ODM
+ *
+ * This class will eventually encapsulate all of the PHPCR-ODM
+ * specific logic to enable support for multiple backends.
+ */
+class PhpcrOdmAdapter implements AdapterInterface
+{
+    protected $dm;
+    protected $baseRoutePath;
+
+    public function __construct(DocumentManager $dm, $routeBasePath)
+    {
+        $this->dm = $dm;
+        $this->baseRoutePath = $routeBasePath;
+    }
+
+    public function getLocales($contentDocument)
+    {
+        if ($this->dm->isDocumentTranslatable($contentDocument)) {
+            return $this->dm->getLocalesFor($contentDocument);
+        }
+
+        return array();
+    }
+
+    public function translateObject($contentDocument, $locale)
+    {
+        $meta = $this->dm->getMetadataFactory()->getMetadataFor(get_class($contentDocument));
+        $contentDocument = $this->dm->findTranslation($meta->getName(), $meta->getIdentifierValue($contentDocument), $locale);
+
+        return $contentDocument;
+    }
+
+    public function createRoute($url, $contentDocument)
+    {
+        $path = $this->getPathFromUrl($url);
+        $pathElements = explode('/', $path);
+        $headName = array_pop($pathElements);
+        $parentPath = implode('/', $pathElements);
+
+        // bypass the ODM ... but changes will still only be
+        // persisted when the PHPCR session is saved in the ODMs flush().
+        NodeHelper::createPath($this->dm->getPhpcrSession(), $parentPath);
+
+        $autoRouteParent = $this->dm->find(null, $parentPath);
+
+        if (!$autoRouteParent) {
+            throw new \RuntimeException(sprintf(
+                'Hmph, could not find parent path "%s", this really should not have happened.',
+                $parentPath
+            ));
+        }
+
+        $headRoute = new AutoRoute();
+        $headRoute->setContent($contentDocument);
+        $headRoute->setName($headName);
+        $headRoute->setParent($autoRouteParent);
+
+        return $headRoute;
+    }
+
+    public function getRealClassName($className)
+    {
+        return ClassUtils::getRealClass($className);
+    }
+
+    public function compareRouteContent(RouteObjectInterface $route, $contentDocument)
+    {
+        if ($route->getContent() === $contentDocument) {
+            return true;
+        }
+
+        return false;
+    }
+
+    public function getReferringRoutes($contentDocument)
+    {
+         return $this->dm->getReferrers($contentDocument, null, null, null, 'Symfony\Cmf\Component\Routing\RouteObjectInterface');
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function findRouteForUrl($url)
+    {
+        $path = $this->getPathFromUrl($url);
+        return $this->dm->find(null, $path);
+    }
+
+    private function getPathFromUrl($url)
+    {
+        return $this->baseRoutePath . $url;
+    }
+}