Templates are now outputted in alphabetical order. Tests have been up…

…dated to follow this as well.
krunkosaurus · Sep 19, 2011 · f0f5b61 · f0f5b61
1 parent 24aeee4
commit f0f5b61
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 142 deletions.
diff --git a/index.js b/index.js
@@ -61,7 +61,7 @@ var fs = require('fs'),
             return this;
         },
 
-        // Recursively return an array of all files in a directory.
+        // Recursively return an array of all files (paths) in a directory.
         getFilesFrom: function(dir){
             var filesAr = [];
             var recurse;
@@ -114,17 +114,41 @@ var fs = require('fs'),
         // Update target page with new templates.
         updateIndex: function(){
             var date = new Date();
-            var filesAr = this.getFilesFrom(this.watchFolder);
-            var content = this.stringFromFiles(filesAr);
+            // Ar of sorted ids from each template.
+            var idsAr = [];
+            // Lookup hash of ids to template content.
+            var fileHash = {};
+            // Final concated text content.
+            var content = '';
             var template;
-            var i;
+            var f;
+
+            // For each file get its template id so we can sort alphabetically.
+            _.each(this.getFilesFrom(this.watchFolder), function(file, i, list){
+                var contents = this.getFileContents(file);
+                var id = contents.match(/id=['"](.*)['"]/);
+                if (id){
+                    id = id[1];
+                    // Add to filehash
+                    fileHash[id] = contents;
+                    idsAr.push(id);
+                }else{
+                    throw new Error('Template missing id: ' +  file);
+                }
+            }, this);
+
+            idsAr.sort();
+
+            _.each(idsAr, function(id){
+                content += fileHash[id];
+            });
 
             if (this.outputFile instanceof Array){
-                for (i = 0; i < this.outputFile.length; i++){
-                    template = this.getFileContents(this.inputFile[i]);
+                for (f = 0; f < this.outputFile.length; f++){
+                    template = this.getFileContents(this.inputFile[f]);
                     template = template.replace(this.replacementString, content);
 
-                    this.writeToFile(this.outputFile[i], template);
+                    this.writeToFile(this.outputFile[f], template);
                 }
             }else{
                 template = this.getFileContents(this.inputFile);
@@ -133,7 +157,6 @@ var fs = require('fs'),
                 this.writeToFile(this.outputFile, template);
             }
 
-
             log.info('Completed in ' + ((new Date() - date) / 1000) + ' seconds.');
         }
     });

diff --git a/tests/assets/index.html b/tests/assets/index.html
@@ -6,19 +6,7 @@
     <body>
         <h1>Test Test page</h1>
         <p>My templates below</p>
-        <script type="text/template" id="template-09">
-    This is my template 09.
-</script>
-
-<script type="text/template" id="template-07">
-    This is my template 07.
-</script>
-
-<script type="text/template" id="template-08">
-    This is my template 08.
-</script>
-
-<script type="text/template" id="template-01">
+        <script type="text/template" id="template-01">
 	This is my template 01.
 </script><script type="text/template" id="template-02">
     This is my template 02.
@@ -40,6 +28,18 @@ <h1>Test Test page</h1>
     This is my template 06.
 </script>
 
+<script type="text/template" id="template-07">
+    This is my template 07.
+</script>
+
+<script type="text/template" id="template-08">
+    This is my template 08.
+</script>
+
+<script type="text/template" id="template-09">
+    This is my template 09.
+</script>
+
 
         <p>My templates above</p>
 </body>

diff --git a/tests/node_modules/nodeinterval/index.js b/tests/node_modules/nodeinterval/index.js
diff --git a/tests/node_modules/nodeinterval/index.js b/tests/node_modules/nodeinterval/index.js