listItems blocks are only parsed when they contain a partial themselves. now they work for markup, global listitems, local listitems, mustache, and partials

fixes #177

Author: bmuenzenmeyer

builder/list_item_hunter.js

@@ -35,7 +35,6 @@
 					var loopNumberString = liMatch.split('.')[1].split('}')[0].trim();
 					var end = liMatch.replace('#', '/');
 					var patternBlock = pattern.template.substring(pattern.template.indexOf(liMatch) + liMatch.length, pattern.template.indexOf(end)).trim();
-
 					//build arrays that repeat the block, however large we need to
 					var repeatedBlockTemplate = [];
 					var repeatedBlockHtml = '';
@@ -45,7 +44,7 @@
 
 					//check for a local listitems.json file
 					var listData = JSON.parse(JSON.stringify(patternlab.listitems));
-					listData = pattern_assembler.merge_data(listData, pattern.patternSpecificListJson);
+					listData = pattern_assembler.merge_data(listData, pattern.listitems);
 
 					//iterate over each copied block, rendering its contents along with pattenlab.listitems[i]
 					for(var i = 0; i < repeatedBlockTemplate.length; i++){
@@ -59,7 +58,7 @@
 						var localData = JSON.parse(JSON.stringify(pattern.jsonFileData));
 
 						var allData = pattern_assembler.merge_data(globalData, localData);
-						allData = pattern_assembler.merge_data(allData, itemData[i]);
+						allData = pattern_assembler.merge_data(allData, itemData != undefined ? itemData[i] : {}); //itemData could be undefined if the listblock contains no partial, just markup
 						allData.link = extend({}, patternlab.data.link);
 
 						//check for partials within the repeated block

builder/pattern_assembler.js

@@ -41,7 +41,7 @@
     }
 
     function findListItems(pattern){
-      var matches = pattern.template.match(/({{#( )?)(listItems.)(one|two|three|four|five|six|seven|eight|nine|ten|eleven|twelve|thirteen|fourteen|fifteen|sixteen|seventeen|eighteen|nineteen|twenty)( )?}}/g);
+      var matches = pattern.template.match(/({{#( )?)(list(I|i)tems.)(one|two|three|four|five|six|seven|eight|nine|ten|eleven|twelve|thirteen|fourteen|fifteen|sixteen|seventeen|eighteen|nineteen|twenty)( )?}}/g);
       return matches;
     }
 
@@ -134,7 +134,8 @@
       //look for a listitems.json file for this template
       try {
         var listJsonFileName = patternlab.config.patterns.source + currentPattern.subdir + '/' + currentPattern.fileName  + ".listitems.json";
-        currentPattern.patternSpecificListJson = fs.readJSONSync(listJsonFileName.substring(2));
+        currentPattern.listitems = fs.readJSONSync(listJsonFileName.substring(2));
+        buildListItems(currentPattern);
         if(patternlab.config.debug){
           console.log('found pattern-specific listitems.json for ' + currentPattern.key);
         }
@@ -198,7 +199,7 @@
           console.log('found partials for ' + currentPattern.key);
         }
 
-        //find any listItem partials
+        //find any listItem blocks
         list_item_hunter.process_list_item_partials(currentPattern, patternlab);
 
         //determine if the template contains any pattern parameters. if so they must be immediately consumed
@@ -234,6 +235,9 @@
 
         }
 
+      } else{
+        //find any listItem blocks that within the pattern, even if there are no partials
+        list_item_hunter.process_list_item_partials(currentPattern, patternlab);
       }
 
       //find pattern lineage
@@ -293,25 +297,25 @@
       return obj2;
     }
 
-    function buildListItems(patternlab){
+    function buildListItems(container){
       //combine all list items into one structure
       var list = [];
-      for (var item in patternlab.listitems) {
-        if( patternlab.listitems.hasOwnProperty(item)) {
-          list.push(patternlab.listitems[item]);
+      for (var item in container.listitems) {
+        if( container.listitems.hasOwnProperty(item)) {
+          list.push(container.listitems[item]);
         }
       }
-      patternlab.listItemArray = shuffle(list);
+      container.listItemArray = shuffle(list);
 
-      for(var i = 1; i <= patternlab.listItemArray.length; i++){
+      for(var i = 1; i <= container.listItemArray.length; i++){
         var tempItems = [];
         if( i === 1){
-          tempItems.push(patternlab.listItemArray[0]);
-          patternlab.listitems['' + i ] = tempItems;
+          tempItems.push(container.listItemArray[0]);
+          container.listitems['' + i ] = tempItems;
         } else{
           for(var c = 1; c <= i; c++){
-            tempItems.push(patternlab.listItemArray[c - 1]);
-            patternlab.listitems['' + i ] = tempItems;
+            tempItems.push(container.listItemArray[c - 1]);
+            container.listitems['' + i ] = tempItems;
           }
         }
       }

source/_data/listitems.json

@@ -779,4 +779,4 @@
 		},
 		"seconds": "56"
 	}
-}
+}

test/list_item_hunter_tests.js

@@ -41,7 +41,51 @@
 
       //act
       list_item_hunter.process_list_item_partials(currentPattern, patternlab);
-      
+
+      //assert
+      test.equals(currentPattern.extendedTemplate, "FooBar" );
+
+      test.done();
+    },
+
+    'process_list_item_partials listitems with lowercase name' : function(test){
+      //arrange
+      //setup current pattern from what we would have during execution
+      var currentPattern = {
+         "template": "{{#listitems.two}}{{ title }}{{/listitems.two}}",
+         "extendedTemplate" : "{{#listitems.two}}{{ title }}{{/listitems.two}}",
+         "key": "test-patternName",
+         "jsonFileData" : {}
+      };
+
+      var patternlab = {
+        "listitems": {
+          "1": [
+             {
+                "title": "Foo"
+             }
+          ],
+          "2": [
+             {
+                "title": "Foo"
+             },
+             {
+                "title": "Bar"
+             }
+          ]
+        },
+        "data": {
+          "link": {},
+          "partials": []
+        },
+        "config": {"debug": false}
+      };
+
+      var list_item_hunter = new lih();
+
+      //act
+      list_item_hunter.process_list_item_partials(currentPattern, patternlab);
+
       //assert
       test.equals(currentPattern.extendedTemplate, "FooBar" );
 
@@ -93,7 +137,7 @@
 
       //act
       list_item_hunter.process_list_item_partials(currentPattern, patternlab);
-      
+
       //assert
       test.equals(currentPattern.extendedTemplate, "FooBar" );