Fixed tests

Author: dantleech

.gitignore

@@ -0,0 +1,2 @@
+/vendor/
+/Tests/Functional/app/cache/

Resources/config/auto_route.xml

@@ -6,7 +6,7 @@
     <parameters>
         <parameter key="symfony_cmf_routing_auto_route.phpcrodm_auto_route_subscriber_class">Symfony\Cmf\Bundle\RoutingAutoRouteBundle\Subscriber\AutoRouteSubscriber</parameter>
         <parameter key="symfony_cmf_routing_auto_route.auto_route_manager_class">Symfony\Cmf\Bundle\RoutingAutoRouteBundle\AutoRoute\AutoRouteManager</parameter>
-        <parameter key="symfony_cmf_routing_auto_route.basepath"></parameter>
+        <parameter key="symfony_cmf_routing_auto_route.base_path"></parameter>
         <parameter key="symfony_cmf_routing_auto_route.auto_route_by_class"></parameter>
     </parameters>
 
@@ -25,7 +25,7 @@
             <argument type="service" id="doctrine_phpcr.odm.default_document_manager"/>
             <argument>%symfony_cmf_routing_auto_route.auto_route_by_class%</argument>
             <argument type="service" id="symfony_cmf_routing_auto_route.slugifier"/>
-            <argument>%symfony_cmf_routing_auto_route.basepath%</argument>
+            <argument>%symfony_cmf_routing_auto_route.base_path%</argument>
         </service>
 
         <service id="symfony_cmf_routing_auto_route.phpcrodm_auto_route_subscriber" class="%symfony_cmf_routing_auto_route.phpcrodm_auto_route_subscriber_class%">

Resources/config/doctrine/AutoRoute.phpcr.xml

@@ -0,0 +1,9 @@
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/phpcr/doctrine-mapping"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+      <document 
+          name="Symfony\Cmf\Bundle\RoutingAutoRouteBundle\Document\AutoRoute" 
+          referenceable="true"/>
+
+</doctrine-mapping>
+

Subscriber/AutoRouteSubscriber.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace Symfony\Cmf\Bundle\RoutingAutoRouteBundle\Subscriber;
+
+use Doctrine\Common\EventSubscriber;
+use Doctrine\ODM\PHPCR\Event;
+use Symfony\Cmf\Bundle\RoutingAutoRouteBundle\AutoRoute\AutoRouteManager;
+use Doctrine\ODM\PHPCR\Event\LifecycleEventArgs;
+use Doctrine\ODM\PHPCR\Event\PostFlushEventArgs;
+use Doctrine\ODM\PHPCR\Event\OnFlushEventArgs;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Doctrine PHPCR ODM Subscriber for maintaining automatic routes.
+ *
+ * @author Daniel Leech <[email protected]>
+ */
+class AutoRouteSubscriber implements EventSubscriber
+{
+    protected $persistQueue = array();
+    protected $removeQueue = array();
+
+    public function __construct(ContainerInterface $container)
+    {
+        $this->container = $container;
+    }
+
+    public function getSubscribedEvents()
+    {
+        return array(
+            Event::onFlush,
+        );
+    }
+
+    protected function getArm()
+    {
+        return $this->container->get('symfony_cmf_routing_auto_route.auto_route_manager');
+    }
+
+    public function onFlush(OnFlushEventArgs $args)
+    {
+        $dm = $args->getDocumentManager();
+        $uow = $dm->getUnitOfWork();
+
+        $scheduledInserts = $uow->getScheduledInserts();
+        $scheduledUpdates = $uow->getScheduledUpdates();
+        $updates = array_merge($scheduledInserts, $scheduledUpdates);
+
+        foreach ($updates as $document) {
+            if ($this->getArm()->isAutoRouteable($document)) {
+                $route = $this->getArm()->updateAutoRouteForDocument($document);
+                $uow->computeSingleDocumentChangeSet($route);
+            }
+        }
+
+        $removes = $uow->getScheduledRemovals();
+
+        foreach ($removes as $document) {
+            if ($this->getArm()->isAutoRouteable($document)) {
+                $routes = $this->getArm()->fetchAutoRoutesForDocument($document);
+                foreach ($routes as $route) {
+                    $uow->scheduleRemove($route);
+                }
+            }
+        }
+    }
+}
+

Tests/AutoRoute/AutoRouteManagerTest.php

@@ -10,14 +10,20 @@ class AutoRouteManagerTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
+        $this->phpcrSession = $this->getMock('PHPCR\SessionInterface');
         $this->dm = $this->getMockBuilder('Doctrine\ODM\PHPCR\DocumentManager')
             ->disableOriginalConstructor()
             ->getMock();
+        $this->dm->expects($this->once())
+            ->method('getPhpcrSession')
+            ->will($this->returnValue($this->phpcrSession));
+
         $this->slugifier = $this->getMock('Symfony\Cmf\Bundle\CoreBundle\Slugifier\SlugifierInterface');
         $this->mapping = array(
             'Symfony\Cmf\Bundle\RoutingAutoRouteBundle\Tests\AutoRoute\TestDocument' => array(
                 'base_path' => null,
-                'route_method_name' => 'getRouteName'
+                'route_method_name' => 'getRouteName',
+                'base_path_auto_create' => false
             )
         );
 
@@ -27,7 +33,6 @@ public function setUp()
         $this->odmMetadata = new ClassMetadata(
             'Symfony\Cmf\Bundle\RoutingAutoRouteBundle\Tests\Routing\TestDocument'
         );
-        $this->phpcrSession = $this->getMock('PHPCR\SessionInterface');
 
         $this->autoRouteManager = new AutoRouteManager(
             $this->dm,
@@ -50,11 +55,6 @@ protected function bootstrapRouteMetadata()
 
     protected function bootstrapExistingDocument($isExisting)
     {
-        // isExistingDocument ...
-        $this->dm->expects($this->once())
-            ->method('getPhpcrSession')
-            ->will($this->returnValue($this->phpcrSession));
-
         $this->phpcrSession->expects($this->once())
             ->method('nodeExists')
             ->will($this->returnValue($isExisting));

Tests/Functional/AutoRoute/AutoRouteManagerTest.php

@@ -30,9 +30,10 @@ public function testContainer()
         $res = $prop->getValue($this->arm);
 
         $this->assertEquals(array(
-            'Symfony\Cmf\Bundle\AutoRouteBundle\Tests\Functional\app\Document\Post' => array(
-                'base_path' => '/test/posts/test-post',
-                'route_method_name' => 'getTitle'
+            'Symfony\Cmf\Bundle\RoutingAutoRouteBundle\Tests\Functional\app\Document\Post' => array(
+                'base_path' => '/test/auto-route/posts',
+                'route_method_name' => 'getTitle',
+                'base_path_auto_create' => true
             )
         ), $res);
     }