Skip to content

Commit 67c193d

Browse files
dmolsendmolsen
committed
processing the header and footer with the patternLoader
1 parent 6c122f8 commit 67c193d

File tree

2 files changed

+43
-19
lines changed

2 files changed

+43
-19
lines changed

‎src/PatternLab/Builder.php

Lines changed: 41 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
use \PatternLab\PatternData\Exporters\NavItemsExporter;
2222
use \PatternLab\PatternData\Exporters\PatternPartialsExporter;
2323
use \PatternLab\PatternData\Exporters\PatternPathDestsExporter;
24+
use \PatternLab\PatternData\Exporters\PatternPathSrcExporter;
2425
use \PatternLab\PatternData\Exporters\ViewAllPathsExporter;
2526
use \PatternLab\PatternEngine;
2627
use \PatternLab\Template;
@@ -261,6 +262,15 @@ protected function generateStyleguide() {
261262
// default var
262263
$publicDir = Config::getOption("publicDir");
263264

265+
// load the pattern loader
266+
$ppdExporter = new PatternPathSrcExporter();
267+
$patternPathSrc = $ppdExporter->run();
268+
$options = array();
269+
$options["patternPaths"] = $patternPathSrc;
270+
$patternEngineBasePath = PatternEngine::getInstance()->getBasePath();
271+
$patternLoaderClass = $patternEngineBasePath."\Loaders\PatternLoader";
272+
$patternLoader = new $patternLoaderClass($options);
273+
264274
// check directories i need
265275
if (!is_dir($publicDir."/styleguide/")) {
266276
mkdir($publicDir."/styleguide/");
@@ -271,24 +281,26 @@ protected function generateStyleguide() {
271281
}
272282

273283
// grab the partials into a data object for the style guide
274-
$ppExporter = new PatternPartialsExporter();
275-
$partials = $ppExporter->run();
284+
$ppExporter = new PatternPartialsExporter();
285+
$partials = $ppExporter->run();
276286

277287
// add the pattern data so it can be exported
278288
$patternData = array();
279289

280290
// add the pattern lab specific mark-up
281-
$filesystemLoader = Template::getFilesystemLoader();
282-
$stringLoader = Template::getStringLoader();
291+
$filesystemLoader = Template::getFilesystemLoader();
292+
$stringLoader = Template::getStringLoader();
283293

284-
$partials["patternLabHead"] = $stringLoader->render(array("string" => Template::getHTMLHead(), "data" => array("cacheBuster" => $partials["cacheBuster"])));
285-
$partials["patternLabFoot"] = $stringLoader->render(array("string" => Template::getHTMLFoot(), "data" => array("cacheBuster" => $partials["cacheBuster"], "patternData" => json_encode($patternData))));
294+
$globalData = Data::get();
295+
$globalData["patternLabHead"] = $stringLoader->render(array("string" => Template::getHTMLHead(), "data" => array("cacheBuster" => $partials["cacheBuster"])));
296+
$globalData["patternLabFoot"] = $stringLoader->render(array("string" => Template::getHTMLFoot(), "data" => array("cacheBuster" => $partials["cacheBuster"], "patternData" => json_encode($patternData))));
297+
$globalData["viewall"] = true;
286298

287-
$header = $stringLoader->render(array("string" => Template::getPatternHead(), "data" => $partials));
288-
$code = $filesystemLoader->render(array("template" => "viewall", "data" => $partials));
289-
$footer = $stringLoader->render(array("string" => Template::getPatternFoot(), "data" => $partials));
299+
$header = $patternLoader->render(array("pattern" => Template::getPatternHead(), "data" => $globalData));
300+
$code = $filesystemLoader->render(array("template" => "viewall", "data" => $partials));
301+
$footer = $patternLoader->render(array("pattern" => Template::getPatternFoot(), "data" => $globalData));
290302

291-
$styleGuidePage = $header.$code.$footer;
303+
$styleGuidePage = $header.$code.$footer;
292304

293305
file_put_contents($publicDir."/styleguide/html/styleguide.html",$styleGuidePage);
294306

@@ -316,6 +328,19 @@ protected function generateViewAllPages() {
316328
$patternFoot = Template::getPatternFoot();
317329
$filesystemLoader = Template::getFilesystemLoader();
318330
$stringLoader = Template::getStringLoader();
331+
$globalData = Data::get();
332+
333+
// load the pattern loader
334+
$ppdExporter = new PatternPathSrcExporter();
335+
$patternPathSrc = $ppdExporter->run();
336+
$options = array();
337+
$options["patternPaths"] = $patternPathSrc;
338+
$patternEngineBasePath = PatternEngine::getInstance()->getBasePath();
339+
$patternLoaderClass = $patternEngineBasePath."\Loaders\PatternLoader";
340+
$patternLoader = new $patternLoaderClass($options);
341+
342+
// make sure view all is set
343+
$globalData["viewall"] = true;
319344

320345
// make sure the pattern dir exists
321346
if (!is_dir($patternPublicDir)) {
@@ -338,14 +363,13 @@ protected function generateViewAllPages() {
338363
$patternData = array();
339364
$patternData["patternPartial"] = "viewall-".$patternStoreData["typeDash"]."-".$patternStoreData["nameDash"];
340365

341-
// add the pattern lab specific mark-up
342-
$partials["patternLabHead"] = $stringLoader->render(array("string" => $htmlHead, "data" => array("cacheBuster" => $partials["cacheBuster"])));
343-
$partials["patternLabFoot"] = $stringLoader->render(array("string" => $htmlFoot, "data" => array("cacheBuster" => $partials["cacheBuster"], "patternData" => json_encode($patternData))));
366+
$globalData["patternLabHead"] = $stringLoader->render(array("string" => Template::getHTMLHead(), "data" => array("cacheBuster" => $partials["cacheBuster"])));
367+
$globalData["patternLabFoot"] = $stringLoader->render(array("string" => Template::getHTMLFoot(), "data" => array("cacheBuster" => $partials["cacheBuster"], "patternData" => json_encode($patternData))));
344368

345369
// render the parts and join them
346-
$header = $stringLoader->render(array("string" => $patternHead, "data" => $partials));
370+
$header = $patternLoader->render(array("pattern" => $patternHead, "data" => $globalData));
347371
$code = $filesystemLoader->render(array("template" => "viewall", "data" => $partials));
348-
$footer = $stringLoader->render(array("string" => $patternFoot, "data" => $partials));
372+
$footer = $patternLoader->render(array("pattern" => $patternFoot, "data" => $globalData));
349373
$viewAllPage = $header.$code.$footer;
350374

351375
// if the pattern directory doesn't exist create it
@@ -376,9 +400,9 @@ protected function generateViewAllPages() {
376400
$partials["patternLabFoot"] = $stringLoader->render(array("string" => $htmlFoot, "data" => array("cacheBuster" => $partials["cacheBuster"], "patternData" => json_encode($patternData))));
377401

378402
// render the parts and join them
379-
$header = $stringLoader->render(array("string" => $patternHead, "data" => $partials));
403+
$header = $patternLoader->render(array("pattern" => $patternHead, "data" => $globalData));
380404
$code = $filesystemLoader->render(array("template" => "viewall", "data" => $partials));
381-
$footer = $stringLoader->render(array("string" => $patternFoot, "data" => $partials));
405+
$footer = $patternLoader->render(array("pattern" => $patternFoot, "data" => $globalData));
382406
$viewAllPage = $header.$code.$footer;
383407

384408
// if the pattern directory doesn't exist create it

‎src/PatternLab/PatternData/Helpers/PatternCodeHelper.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ public function run() {
8585

8686
if (isset($patternStoreData["patternRaw"])) {
8787

88-
$header = (!$this->exportClean) ? $stringLoader->render(array("string" => $patternHead, "data" => $data)) : "";
88+
$header = (!$this->exportClean) ? $patternLoader->render(array("pattern" => $patternHead, "data" => $data)) : "";
8989
$code = $patternLoader->render(array("pattern" => $patternStoreData["patternRaw"], "data" => $data));
90-
$footer = (!$this->exportClean) ? $stringLoader->render(array("string" => $patternFoot, "data" => $data)) : "";
90+
$footer = (!$this->exportClean) ? $patternLoader->render(array("pattern" => $patternFoot, "data" => $data)) : "";
9191

9292
PatternData::setPatternOption($patternStoreKey,"header",$header);
9393
PatternData::setPatternOption($patternStoreKey,"code",$code);

0 commit comments

Comments
 (0)