making sure listItems works

Author: dmolsen

src/PatternLab/Data.php

@@ -23,7 +23,7 @@
 class Data {
 
 	protected static $store        = array();
-	protected static $reservedKeys = array("listItems","cacheBuster","link","patternSpecific","patternLabHead","patternLabFoot");
+	protected static $reservedKeys = array("cacheBuster","link","patternSpecific","patternLabHead","patternLabFoot");
 
 	/**
 	* Clear all of the data in the $store
@@ -76,7 +76,7 @@ public static function gather($options = array()) {
 			$data          = array();
 			$fileName      = $file->getFilename();
 			$hidden        = ($fileName[0] == "_");
-			$isListItems   = strpos("listitems",$fileName);
+			$isListItems   = strpos($fileName,"listitems");
 			$pathName      = $file->getPathname();
 			$pathNameClean = str_replace($sourceDir."/","",$pathName);
 
@@ -113,7 +113,7 @@ public static function gather($options = array()) {
 
 				} else if ($isListItems !== false) {
 
-					$data = ($ext == "json") ? self::getListItems("data/listitems.json") : self::getListItems("data/listitems.yaml","yaml");
+					$data = ($ext == "json") ? self::getListItems("_data/".$fileName) : self::getListItems("_data/".$fileName,"yaml");
 
 					if (!isset(self::$store["listItems"])) {
 						self::$store["listItems"] = array();
@@ -159,7 +159,7 @@ public static function get() {
 	*
 	* @return {Array}        the final set of list items
 	*/
-	protected static function getListItems($filepath,$ext = "json") {
+	public static function getListItems($filepath,$ext = "json") {
 
 		// set-up the dispatcher
 		$dispatcherInstance = Dispatcher::getInstance();

src/PatternLab/PatternData/Rules/PatternInfoListItemsRule.php

@@ -51,18 +51,18 @@ public function run($depth, $ext, $path, $pathName, $name) {
 
 			$patternStoreData = array("category" => "pattern");
 
-			$data = Data::getListItems($pathName,$ext);
+			$data = Data::getListItems("_patterns/".$pathName,$ext);
 			$patternStoreData["listItems"] = $data;
 
+			// create a key for the data store
+			$patternStoreKey = $patternPartial;
+			
+			// if the pattern data store already exists make sure it is merged and overwrites this data
+			$patternStoreData = (PatternData::checkOption($patternStoreKey)) ? array_replace_recursive(PatternData::getOption($patternStoreKey),$patternStoreData) : $patternStoreData;
+			PatternData::setOption($patternStoreKey, $patternStoreData);
+			
 		}
 
-		// create a key for the data store
-		$patternStoreKey = $patternPartial;
-		
-		// if the pattern data store already exists make sure it is merged and overwrites this data
-		$patternStoreData = (PatternData::checkOption($patternStoreKey)) ? array_replace_recursive(PatternData::getOption($patternStoreKey),$patternStoreData) : $patternStoreData;
-		PatternData::setOption($patternStoreKey, $patternStoreData);
-		
 	}
 
 }

src/PatternLab/PatternData/Rules/PatternInfoRule.php

@@ -30,7 +30,7 @@ public function __construct($options) {
 		$this->isDirProp  = false;
 		$this->isFileProp = true;
 		$this->searchProp = "";
-		$this->ignoreProp = "~";
+		$this->ignoreProp = "~||listitems";
 
 	}