making breadcrumb an array

Author: dmolsen

src/PatternLab/PatternData/Rules/PatternRule.php

@@ -77,7 +77,7 @@ public function run($depth, $ext, $path, $pathName, $name) {
 								  "nameClean"        => $patternClean,
 								  "type"             => $patternType,
 								  "typeDash"         => $patternTypeDash,
-								  "breadcrumb"       => $patternTypeClean,
+								  "breadcrumb"       => array("patternType" => $patternTypeClean),
 								  "state"            => $patternState,
 								  "hidden"           => $hidden,
 								  "noviewall"        => $noviewall,
@@ -97,7 +97,7 @@ public function run($depth, $ext, $path, $pathName, $name) {
 		if ($depth > 1) {
 			$patternStoreData["subtype"]     = $patternSubtype;
 			$patternStoreData["subtypeDash"] = $patternSubtypeDash;
-			$patternStoreData["breadcrumb"]  = $patternTypeClean." > ".$patternSubtypeClean;
+			$patternStoreData["breadcrumb"]  = array("patternType" => $patternTypeClean, "patternSubtype" => $patternSubtypeClean);
 		}
 
 		// if the pattern data store already exists make sure it is merged and overwrites this data

src/PatternLab/PatternData/Rules/PatternSubtypeRule.php

@@ -45,7 +45,7 @@ public function run($depth, $ext, $path, $pathName, $name) {
 		$patternSubtypePath     = $pathName;                                    // 00-atoms/02-blocks
 		$patternSubtypePathDash = str_replace($dirSep,"-",$patternSubtypePath); // 00-atoms-02-blocks (file path)
 
-		$patternPartial         = "viewall-".$patternTypeDash."-".$patternSubtypeDash;    
+		$patternPartial         = "viewall-".$patternTypeDash."-".$patternSubtypeDash;
 
 		// create a key for the data store
 		$patternStoreKey        = $patternTypeDash."-".$patternSubtypeDash."-plsubtype";
@@ -58,7 +58,7 @@ public function run($depth, $ext, $path, $pathName, $name) {
 										"partial"    => $patternPartial,
 										"type"       => $patternType,
 										"typeDash"   => $patternTypeDash,
-										"breadcrumb" => $patternTypeClean,
+										"breadcrumb" => array("patternType" => $patternTypeClean),
 										"depth"      => $depth,
 										"ext"        => $ext,
 										"path"       => $path,

src/PatternLab/PatternData/Rules/PseudoPatternRule.php

@@ -37,12 +37,14 @@ public function __construct($options) {
 	public function run($depth, $ext, $path, $pathName, $name) {
 
 		// load default vars
-		$patternSubtype     = PatternData::getPatternSubtype();
-		$patternSubtypeDash = PatternData::getPatternSubtypeDash();
-		$patternType        = PatternData::getPatternType();
-		$patternTypeDash    = PatternData::getPatternTypeDash();
-		$dirSep             = PatternData::getDirSep();
-		$frontMeta          = PatternData::getFrontMeta();
+		$patternSubtype      = PatternData::getPatternSubtype();
+		$patternSubtypeClean = PatternData::getPatternSubtypeClean();
+		$patternSubtypeDash  = PatternData::getPatternSubtypeDash();
+		$patternType         = PatternData::getPatternType();
+		$patternTypeClean    = PatternData::getPatternTypeClean();
+		$patternTypeDash     = PatternData::getPatternTypeDash();
+		$dirSep              = PatternData::getDirSep();
+		$frontMeta           = PatternData::getFrontMeta();
 
 		// should this pattern get rendered?
 		$hidden             = ($name[0] == "_");
@@ -95,7 +97,7 @@ public function run($depth, $ext, $path, $pathName, $name) {
 									"nameClean"    => $patternClean,
 									"type"         => $patternType,
 									"typeDash"     => $patternTypeDash,
-									"breadcrumb"   => $patternType,
+									"breadcrumb"   => array("patternType" => $patternTypeClean),
 									"state"        => $patternState,
 									"hidden"       => $hidden,
 									"noviewall"    => $noviewall,
@@ -115,12 +117,12 @@ public function run($depth, $ext, $path, $pathName, $name) {
 		if ($depth > 1) {
 			$patternStoreData["subtype"]     = $patternSubtype;
 			$patternStoreData["subtypeDash"] = $patternSubtypeDash;
-			$patternStoreData["breadcrumb"]  = $patternType." > ".$patternSubtype;
+			$patternStoreData["breadcrumb"]  = array("patternType" => $patternTypeClean, "patternSubtype" => $patternSubtypeClean);
 		}
 
 		$patternDataBase = array();
-		if (file_exists(Config::getOption("patternSourceDir")."/".$path."/".$patternBaseData)) {
-			$data = file_get_contents(Config::getOption("patternSourceDir")."/".$path."/".$patternBaseData);
+		if (file_exists(Config::getOption("patternSourceDir").DIRECTORY_SEPARATOR.$path.DIRECTORY_SEPARATOR.$patternBaseData)) {
+			$data = file_get_contents(Config::getOption("patternSourceDir").DIRECTORY_SEPARATOR.$path.DIRECTORY_SEPARATOR.$patternBaseData);
 			if ($ext == "json") {
 				$patternDataBase = json_decode($data,true);
 				if ($jsonErrorMessage = JSON::hasError()) {
@@ -144,7 +146,7 @@ public function run($depth, $ext, $path, $pathName, $name) {
 		}
 
 		// get the data for the pseudo-pattern
-		$data = file_get_contents(Config::getOption("patternSourceDir")."/".$pathName);
+		$data = file_get_contents(Config::getOption("patternSourceDir").DIRECTORY_SEPARATOR.$pathName);
 		if ($ext == "json") {
 			$patternData = json_decode($data,true);
 			if ($jsonErrorMessage = JSON::hasError()) {