Merge branch 'dev' into dev-3.0

# Conflicts:
#	README.md
#	core/lib/patternlab.js
#	package.json
#	test/files/_patterns/00-test/01-bar.md
#	test/parameter_hunter_tests.js

Author: bmuenzenmeyer

CODE_OF_CONDUCT.md

@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

README.md

@@ -8,6 +8,16 @@ This repository contains the core functionality for Pattern Lab Node. Pattern La
 
 [Online Demo of Pattern Lab Output](http://demo.patternlab.io/)
 
+## Support for Pattern Lab Node
+
+Pattern Lab Node wouldn't be what it is today without the support of the community. It will always be free and open source. Continued development is made possible in part from the support of [these wonderful project supporters](https://github.com/pattern-lab/patternlab-node/wiki/Thanks). If you want to learn more about supporting the project, visit the [Pattern Lab Node Patreon page](https://www.patreon.com/patternlab).   
+
+**:100: Thanks for support from the following:** 
+
+* **[Brad Frost](http://bradfrost.com/)**
+* [Marcos Peebles](https://twitter.com/marcospeebles)
+* [Susan Simkins](https://twitter.com/susanmsimkins)
+
 ## Installation
 
 Pattern Lab Node Core is designed to be consumed, and by default is included as a dependency within two example [Node Editions](https://github.com/pattern-lab?utf8=%E2%9C%93&query=edition-node).
@@ -80,19 +90,10 @@ Please read the guidelines: https://github.com/pattern-lab/patternlab-node/blob/
 
 The Pattern Lab Node team uses [our gitter.im channel, pattern-lab/node](https://gitter.im/pattern-lab/node) to keep in sync, share updates, and talk shop. Please stop by to say hello or as a first place to turn if stuck. Other channels in the Pattern Lab organization can be found on gitter too.
 
-There is also a dedicated Pattern Lab channel on the [design system slack](designsystems.herokuapp.com) run by [@jina](https://twitter.com/jina).
+There is also a dedicated Pattern Lab channel on the [design system slack](http://designsystems.herokuapp.com) run by [@jina](https://twitter.com/jina).
 
 Ask or answer Pattern Lab questions on Stack Overflow: http://stackoverflow.com/questions/tagged/patternlab.io
 
-## Support Pattern Lab Node
-
-Pattern Lab Node is on [Patreon account](https://www.patreon.com/patternlab) to allow users and organizations to directly support continued work on the Pattern Lab Node project.
-
-I (Brian talking) need help and support to make Pattern Lab Node a sustained success. I devote a lot of free time and would-be sleep to make the project what it is, but nothing compares to hearing back from users. It means the world to me when people find value in Pattern Lab Node. I am ridiculously humbled to hear and see what you all build with it.
-
-If you find yourself here and balk and the idea of supporting open source software monetarily - I understand.  Carry on, but please do share what you build - we all learn more together.
-- [Pattern Lab on Patreon](https://www.patreon.com/patternlab)
-
 ## License
 
 [MIT](https://github.com/pattern-lab/patternlab-node/blob/master/LICENSE)

core/lib/parameter_hunter.js

@@ -270,6 +270,9 @@ const parameter_hunter = function () {
         let allData = _.merge(globalData, localData);
         allData = _.merge(allData, paramData);
 
+        //if the partial has pattern parameters itself, we need to handle those
+        findparameters(partialPattern, patternlab);
+
         //if partial has style modifier data, replace the styleModifier value
         if (pattern.stylePartials && pattern.stylePartials.length > 0) {
           style_modifier_hunter.consume_style_modifier(partialPattern, pMatch, patternlab);

core/lib/pattern_assembler.js

@@ -154,6 +154,9 @@ const pattern_assembler = function () {
         currentPattern.patternDescExists = true;
         currentPattern.patternDesc = markdownObject.markdown;
 
+        //Add all markdown to the currentPattern, including frontmatter
+        currentPattern.allMarkdown = markdownObject;
+
         //consider looping through all keys eventually. would need to blacklist some properties and whitelist others
         if (markdownObject.state) {
           currentPattern.patternState = markdownObject.state;
@@ -170,6 +173,9 @@ const pattern_assembler = function () {
         if (markdownObject.tags) {
           currentPattern.tags = markdownObject.tags;
         }
+        if (markdownObject.title) {
+          currentPattern.patternName = markdownObject.title;
+        }
         if (markdownObject.links) {
           currentPattern.links = markdownObject.links;
         }

core/lib/patternlab.js

@@ -1,5 +1,5 @@
 /*
- * patternlab-node - v2.8.0 - 2017
+ * patternlab-node - v2.10.0 - 2017
  *
  * Brian Muenzenmeyer, Geoff Pursell, Raphael Okon, tburny and the web community.
  * Licensed under the MIT license.
@@ -411,6 +411,13 @@ const patternlab_engine = function (config) {
 
     // stringify this data for individual pattern rendering and use on the styleguide
     // see if patternData really needs these other duped values
+
+    // construct our extraOutput dump
+    var extraOutput = Object.assign({}, pattern.extraOutput, pattern.allMarkdown);
+    delete(extraOutput.title);
+    delete(extraOutput.state);
+    delete(extraOutput.markdown);
+
     pattern.patternData = JSON.stringify({
       cssEnabled: false,
       patternLineageExists: pattern.patternLineageExists,
@@ -433,7 +440,7 @@ const patternlab_engine = function (config) {
       patternPartial: pattern.patternPartial,
       patternState: pattern.patternState,
       patternEngineName: pattern.engine.engineName,
-      extraOutput: {}
+      extraOutput: extraOutput
     });
 
     //set the pattern-specific footer by compiling the general-footer with data, and then adding it to the meta footer
@@ -560,6 +567,10 @@ const patternlab_engine = function (config) {
 
       patternlab.events.emit('patternlab-pattern-iteration-end', patternlab);
 
+      //now that all the main patterns are known, look for any links that might be within data and expand them
+      //we need to do this before expanding patterns & partials into extendedTemplates, otherwise we could lose the data -> partial reference
+      pattern_assembler.parse_data_links(patternlab);      
+
       //diveSync again to recursively include partials, filling out the
       //extendedTemplate property of the patternlab.patterns elements
       // TODO we can reduce the time needed by only processing changed patterns and their partials
@@ -569,10 +580,6 @@ const patternlab_engine = function (config) {
       processHeadPattern();
       processFootPattern();
 
-      //now that all the main patterns are known, look for any links that might be within data and expand them
-      //we need to do this before expanding patterns & partials into extendedTemplates, otherwise we could lose the data -> partial reference
-      pattern_assembler.parse_data_links(patternlab);
-
       //cascade any patternStates
       lineage_hunter.cascade_pattern_states(patternlab);
 
@@ -593,11 +600,6 @@ const patternlab_engine = function (config) {
       // rebuild all patterns
       let patternsToBuild = null;
 
-      //set the pattern-specific header by compiling the general-header with data, and then adding it to the meta header
-      patternlab.data.patternLabHead = pattern_assembler.renderPattern(patternlab.header, {
-        cacheBuster: patternlab.cacheBuster
-      });
-
       // If deletePatternDir == true or graph needs to be updated
       // rebuild all patterns
       patternsToBuild = null;
@@ -621,13 +623,8 @@ const patternlab_engine = function (config) {
         }
       }
 
-      //set the pattern-specific header by compiling the general-header with data, and then adding it to the meta header
-      patternlab.data.patternLabHead = pattern_assembler.renderPattern(patternlab.header, {
-        cacheBuster: patternlab.cacheBuster
-      });
-
-      //render all patterns last, so lineageR works
-      patternsToBuild.forEach(pattern => renderSinglePattern(pattern, head));
+    //render all patterns last, so lineageR works
+    patternsToBuild.forEach(pattern => renderSinglePattern(pattern, head));
 
       // Saves the pattern graph when all files have been compiled
       PatternGraph.storeToFile(patternlab);

test/files/_data/listitems.json

@@ -1,4 +1,11 @@
 {
-  "test_list_item" : "izzn thizzle"
+  "1": {
+    "title": "Nullizzle shizznit velizzle, hizzle, suscipit own yo', gravida vizzle, arcu."
+  },
+  "2": {
+    "title": "Veggies sunt bona vobis, proinde vos postulo"
+  },
+  "3": {
+    "title": "Bacon ipsum dolor sit amet turducken strip steak beef ribs shank"
+  }
 }
-

test/files/_meta/_00-head.mustache

@@ -1,5 +1,7 @@
 ---
-state: complete
+status: complete
+title: An Atom Walks Into a Bar
+joke: bad
 ---
 ## A Simple Bit of Markup
 

test/files/_meta/_01-foot.mustache

@@ -0,0 +1,4 @@
+<b>a</b>
+{{ #a }}
+<i>a!</i>
+{{ /a }}