Started some refactoring

Author: dantleech

AutoRoute/Builder.php

@@ -21,14 +21,12 @@ public function __construct(PhpcrSession $phpcrSession)
 
     public function build(BuilderUnitInterface $builderUnit, BuilderContext $context)
     {
+        $routeStack = new RouteStack;
         $builderUnit->pathAction($context);
 
         $exists = $this->phpcrSession->nodeExists($context->getPath()); 
 
         if ($exists) {
-            // todo: check to see if the existing node references 
-            //       this content... i.e. allow updates to pass.
-            
             $builderUnit->existsAction($context);
         } else {
             $builderUnit->notExistsAction($context);

AutoRoute/BuilderContext.php

@@ -5,63 +5,31 @@
 use Symfony\Cmf\Bundle\RoutingExtraBundle\Document\Route;
 
 /**
+ * @todo: Should this be renamed to RouteStack?
+ *
+ *        A route stack would have all of route components l
  * @author Daniel Leech <[email protected]>
  */
 class BuilderContext
 {
-    protected $pathStack = array();
-    protected $routeStack = array();
+    protected $routeStacks = array();
+    protected $object;
 
-    protected $isLastBuilder = false;
-
-    public function addPath($part)
-    {
-        $this->pathStack[] = $part;
-    }
-
-    public function getLastPath()
-    {
-        return end($this->pathStack);
-    }
-
-    public function replaceLastPath($path)
-    {
-        array_pop($this->pathStack);
-        $this->pathStack[] = $path;
-    }
-
-    public function getPathStack()
+    public function addRouteStack($routeStack)
     {
-        return $this->pathStack;
-    }
-
-    public function addRoute($route)
-    {
-        $this->routeStack[]= $route;
-    }
-
-    public function getRouteStack()
-    {
-        return $this->routeStack;
-    }
-
-    public function getLastRoute()
-    {
-        return end($this->routeStack);
-    }
+        if (!$routeStack->isClosed()) {
+            throw new \RuntimeException('Cannot add closed route stack to context');
+        }
 
-    public function getPath()
-    {
-        return implode('/', $this->pathStack);
+        $this->routeStacks[] = $routeStack;
     }
 
-    public function isLastBuilder($isLastBuilder = null)
+    public function getRouteNodes()
     {
-        if (null === $isLastBuilder) {
-            return $this->isLastBuilder;
+        $routes = array();
+        foreach ($this->routeStacks as $routeStack) {
+            $routes = array_merge($routes, $routeStack->getRouteNodes());
         }
-
-        $this->isLastBuilder = $isLastBuilder;
     }
 
     public function setObject($object)

AutoRoute/BuilderUnitChain.php

@@ -27,14 +27,7 @@ public function executeChain(BuilderContext $context)
         $i = 1;
 
         foreach ($this->builderUnitChain as $name => $builderUnit) {
-
-            if ($i++ == count($this->builderUnitChain)) {
-                $context->isLastBuilder(true);
-            } else {
-                // This may seem redundant, but it helps the unit test...
-                $context->isLastBuilder(false);
-            }
-
+            $routeStack = new RouteStack;
             $this->builder->build($builderUnit, $context);
         }
     }

AutoRoute/RouteMaker/GenericMaker.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RoutePatcher;
+
+use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RoutePatcherInterface;
+use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\BuilderContext;
+use Doctrine\ODM\PHPCR\DocumentManager;
+use Doctrine\ODM\PHPCR\Document\Generic;
+use Symfony\Cmf\Bundle\RoutingAutoBundle\Document\AutoRoute;
+
+/**
+ * This class will make the Route classes using
+ * Generic documents using.
+ *
+ * @todo: Make this use PHPCR\Util\NodeHelper:makePath
+ *
+ * @author Daniel Leech <[email protected]>
+ */
+class GenericPatcher implements RoutePatcherInterface
+{
+    public function __construct(DocumentManager $dm)
+    {
+        $this->dm = $dm;
+    }
+
+    public function makeRoutes(BuilderUnitContext $buc)
+    {
+        $components = $buc->getPathComponents();
+
+        foreach ($components as $i => $component) {
+
+            $path .= '/'.$component;
+
+            $doc = $this->dm->find(null, $path);
+
+            if (null === $doc) {
+                $parent = $context->getLastRoute();
+
+                if (null === $parent) {
+                    $parent = $this->dm->find(null, '/');
+                }
+
+                // otherwise create a generic document
+                $doc = new Generic;
+                $doc->setNodename($component);
+                $doc->setParent($parent);
+                    var_dump($parent);
+                }
+            }
+
+            $context->addRoute($doc);
+        }
+    }
+}

AutoRoute/RouteMakerInterface.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute;
+
+/**
+ * Classes implementing this interface "patch" 
+ * any missing comonents in/a/routes/path
+ *
+ * @author Daniel Leech <[email protected]>
+ */
+interface RoutePatcherInterface
+{
+    public function patch(BuilderContext $context);
+}

AutoRoute/RoutePatcher/GenericPatcher.php

@@ -0,0 +1,87 @@
+<?php
+
+namespace Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute;
+
+/**
+ * @author Daniel Leech <[email protected]>
+ */
+class RouteStack
+{
+    protected $pathElements;
+    protected $routeNodes = array();
+
+    protected $closed = false;
+
+    public function addPathElements(array $pathElements)
+    {
+        foreach ($pathElements as $pathElement) {
+            $this->addPathElement($pathElement);
+        }
+    }
+
+    public function addPathElement($pathElement)
+    {
+        if (true === $this->closed) {
+            throw new \RuntimeException('Cannot add path elements to a closed route stack.');
+        }
+
+        $this->pathElements[] = $pathElement;
+    }
+
+    public function getPathElements()
+    {
+        return $this->pathElements;
+    }
+
+    public function getPaths()
+    {
+        $tmp = array();
+
+        foreach ($this->pathElements as $pathElement) {
+            $tmp[] = $pathElement;
+            $paths[] = '/'.implode('/', $tmp);
+        }
+
+        return $paths;
+    }
+
+    public function addRouteNode($routeNode)
+    {
+        if (true === $this->closed) {
+            throw new \RuntimeException('Cannot add path elements to a closed route stack.');
+        }
+
+        $this->routeNodes[] = $routeNode;
+    }
+
+    public function close()
+    {
+        if (count($this->routeNodes) != count($this->pathElements)) {
+            throw new \RuntimeException(sprintf(
+                'Attempting to close route stack but the number of path elements (%d) '.
+                'does not match number of route elements (%d). Registered path elements: "%s"',
+                count($this->pathElements),
+                count($this->routeNodes),
+                implode(',', $this->pathElements)
+            ));
+        }
+
+        $this->closed = true;
+    }
+
+    public function getRouteNodes()
+    {
+        if (false === $this->closed) {
+            throw new \RuntimeException(
+                'You must close the route stack before retrieving the route nodes.'
+            );
+        }
+
+        return $this->routeNodes;
+    }
+
+    public function isClosed()
+    {
+        return $this->closed;
+    }
+}