Merge pull request #15 from DiversityTemplating/proper-order

Proper ordering of dependecies

lib/Collection.php

@@ -59,15 +59,32 @@ public function renderStyleTags() {
     return $tags;
   }
 
+  /**
+   * Return an ordered array of all components. Dependencies up front before their dependees.
+   */
   public function getAllComponents() {
     $all_components = array();
 
     foreach ($this->components as $component) {
-      $all_components = array_merge($all_components, $component->getDependencies());
       $all_components[$component->name] = $component;
+      $all_components = array_merge($all_components, $component->getDependencies());
+    }
+
+    // First we reverse the list to get the correct dependency oredering, i.e. deps upfront
+    $all_components = array_reverse($all_components);
+
+    // Then we need to remove duplicate components, while keeping order.
+    $lookup = array();
+    $filtered = array();
+
+    foreach ($all_components as $component) {
+      if (!isset($lookup[$component->name])) {
+        $lookup[$component->name] = true;
+        $filtered[] = $component;
+      }
     }
 
-    return $all_components;
+    return $filtered;
   }
 
   public function needsAngular() {

lib/Component.php

@@ -34,6 +34,11 @@ public function __construct(Factory $factory, $component_data) {
     }
   }
 
+  /**
+   * Get all the dependencies of a component, and their dependencies, in an ordered array.
+   * Duplicates may occur when two different dependencies in
+   * turn depends on the same component.
+   */
   public function getDependencies() {
     $dependencies = array();
 
@@ -42,7 +47,7 @@ public function getDependencies() {
     foreach ($this->spec->dependencies as $name => $spec) {
       // Assume $spec is a version.
       $component = $this->factory->get($name, $spec);
-      $dependencies[$name] = $component;
+      $dependencies[] = $component;
 
       // Add the dependent components dependencies.
       $dependencies = array_merge($dependencies, $component->getDependencies());

test/unit/ComponentTest.php

@@ -19,7 +19,7 @@ public function testDependencies() {
     $component = self::$factory->get('test_3');
     $dependencies = $component->getDependencies();
 
-    $this->assertEquals('test_1', $dependencies['test_1']->name);
+    $this->assertEquals('test_1', $dependencies[0]->name);
   }
 
   public function testGetStyles() {