Have the constructor for Pattern take a patternlab object as its third

parameter so it can construct correct pattern links based on the
configure outputFilePaths in the user config

Author: geoffp

core/lib/object_factory.js

@@ -6,7 +6,7 @@ var extend = require('util')._extend;
 
 // Pattern properties
 
-var Pattern = function (relPath, data) {
+var Pattern = function (relPath, data, patternlab) {
   // We expect relPath to be the path of the pattern template, relative to the
   // root of the pattern tree. Parse out the path parts and save the useful ones.
   var pathObj = path.parse(path.normalize(relPath));
@@ -44,6 +44,10 @@ var Pattern = function (relPath, data) {
   // the joined pattern group and subgroup directory
   this.flatPatternPath = this.subdir.replace(/[\/\\]/g, '-'); // '00-atoms-00-global'
 
+  // calculated path from the root of the public directory to the generated
+  // (rendered!) html file for this pattern, to be shown in the iframe
+  this.patternLink = patternlab ? this.getPatternLink(patternlab, 'rendered') : null;
+
   // The canonical "key" by which this pattern is known. This is the callable
   // name of the pattern. UPDATE: this.key is now known as this.patternPartial
   this.patternPartial = this.patternGroup + '-' + this.patternBaseName;
@@ -88,11 +92,6 @@ Pattern.prototype = {
     var suffixConfig = patternlab.config.outputFileSuffixes;
     var suffix = suffixType ? suffixConfig[suffixType] : suffixConfig.rendered;
 
-    if (this.patternLink) {
-      // Someone or something has explicitly set a patternLink on this pattern.
-      // We had better respect that.
-      return this.patternLink;
-    }
     return this.name + path.sep + this.name + suffix + '.html';
   },
 
@@ -123,16 +122,16 @@ Pattern.prototype = {
 
 // factory: creates an empty Pattern for miscellaneous internal use, such as
 // by list_item_hunter
-Pattern.createEmpty = function (customProps) {
-  var pattern = new Pattern('', null);
+Pattern.createEmpty = function (customProps, patternlab) {
+  var pattern = new Pattern('', null, patternlab);
   return extend(pattern, customProps);
 };
 
 // factory: creates an Pattern object on-demand from a hash; the hash accepts
 // parameters that replace the positional parameters that the Pattern
 // constructor takes.
-Pattern.create = function (relPath, data, customProps) {
-  var newPattern = new Pattern(relPath || '', data || null);
+Pattern.create = function (relPath, data, customProps, patternlab) {
+  var newPattern = new Pattern(relPath || '', data || null, patternlab);
   return extend(newPattern, customProps);
 };
 

core/lib/pattern_assembler.js

@@ -213,7 +213,7 @@ var pattern_assembler = function () {
         if (proposedDirectoryStats.isDirectory()) {
           var subTypeMarkdownFileContents = fs.readFileSync(proposedDirectory + '.md', 'utf8');
           var subTypeMarkdown = markdown_parser.parse(subTypeMarkdownFileContents);
-          var subTypePattern = new Pattern(relPath);
+          var subTypePattern = new Pattern(relPath, null, patternlab);
           subTypePattern.patternSectionSubtype = true;
           subTypePattern.patternLink = subTypePattern.name + '/index.html';
           subTypePattern.patternDesc = subTypeMarkdown.markdown;
@@ -244,7 +244,7 @@ var pattern_assembler = function () {
     if (!patternEngines.isPatternFile(filename, patternlab)) { return null; }
 
     //make a new Pattern Object
-    var currentPattern = new Pattern(relPath);
+    var currentPattern = new Pattern(relPath, null, patternlab);
 
     //if file is named in the syntax for variants
     if (patternEngines.isPseudoPatternJSON(filename)) {

core/lib/ui_builder.js

@@ -154,7 +154,8 @@ var ui_builder = function () {
         engine: null,
         flatPatternPath: pattern.flatPatternPath,
         isDocPattern: true
-      }
+      },
+      patternlab
     );
     return docPattern;
   }

test/ui_builder_tests.js

@@ -16,7 +16,12 @@ function createFakePatternLab(customProps) {
         }
       },
       styleGuideExcludes: [ 'templates' ],
-      debug: false
+      debug: false,
+      outputFileSuffixes: {
+        rendered: '.rendered',
+        rawTemplate: '',
+        markupOnly: '.markup-only'
+      }
     }
   };
   return extend(pl, customProps);