Merge remote-tracking branch 'refs/remotes/origin/dev-2.0-core' into load-engines

Author: geoffp

.travis.yml

@@ -2,9 +2,8 @@ language: node_js
 
 node_js:
   - stable
+  - 5.0
   - 4.0
-  - 0.12
-  - 0.11
 
 before_install:
   - phantomjs --version
@@ -18,3 +17,11 @@ branches:
     - dev
     - pattern-engines
     - dev-2.0-core
+
+notifications:
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/a14f537f16b0756d9470
+    on_success: always
+    on_failure: always
+    on_start: never

Gruntfile.js

@@ -1,167 +1,41 @@
 module.exports = function (grunt) {
 
-  var path = require('path');
-
-  function paths() {
-    return require('./patternlab-config.json').paths;
-  }
-
-  // Project configuration.
+  /******************************
+   * Project configuration.
+   * Should only be needed if you are developing against core, running tests, linting and want to run tests or increment package numbers
+   *****************************/
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
     concat: {
       options: {
         stripBanners: true,
-        banner: '/* \n * <%= pkg.name %> - v<%= pkg.version %> - <%= grunt.template.today("yyyy") %> \n * \n * <%= pkg.author %>, and the web community.\n * Licensed under the <%= pkg.license %> license. \n * \n * Many thanks to Brad Frost and Dave Olsen for inspiration, encouragement, and advice. \n *\n */\n\n',
+        banner: '/* \n * <%= pkg.name %> - v<%= pkg.version %> - <%= grunt.template.today("yyyy") %> \n * \n * <%= pkg.author.name %>, <%= pkg.contributors[0].name %>, and the web community.\n * Licensed under the <%= pkg.license %> license. \n * \n * Many thanks to Brad Frost and Dave Olsen for inspiration, encouragement, and advice. \n *\n */\n\n',
       },
       patternlab: {
         src: './core/lib/patternlab.js',
         dest: './core/lib/patternlab.js'
-      },
-      object_factory: {
-        src: './core/lib/object_factory.js',
-        dest: './core/lib/object_factory.js'
-      },
-      lineage: {
-        src: './core/lib/lineage_hunter.js',
-        dest: './core/lib/lineage_hunter.js'
-      },
-      media_hunter: {
-        src: './core/lib/media_hunter.js',
-        dest: './core/lib/media_hunter.js'
-      },
-      patternlab_grunt: {
-        src: './core/lib/patternlab_grunt.js',
-        dest: './core/lib/patternlab_grunt.js'
-      },
-      patternlab_gulp: {
-        src: './core/lib/patternlab_gulp.js',
-        dest: './core/lib/patternlab_gulp.js'
-      },
-      parameter_hunter: {
-        src: './core/lib/parameter_hunter.js',
-        dest: './core/lib/parameter_hunter.js'
-      },
-      pattern_exporter: {
-        src: './core/lib/pattern_exporter.js',
-        dest: './core/lib/pattern_exporter.js'
-      },
-      pattern_assembler: {
-        src: './core/lib/pattern_assembler.js',
-        dest: './core/lib/pattern_assembler.js'
-      },
-      pseudopattern_hunter: {
-        src: './core/lib/pseudopattern_hunter.js',
-        dest: './core/lib/pseudopattern_hunter.js'
-      },
-      list_item_hunter: {
-        src: './core/lib/list_item_hunter.js',
-        dest: './core/lib/list_item_hunter.js'
-      },
-      style_modifier_hunter: {
-        src: './core/lib/style_modifier_hunter.js',
-        dest: './core/lib/style_modifier_hunter.js'
-      }
-    },
-    copy: {
-      main: {
-        files: [
-          { expand: true, cwd: path.resolve(paths().source.js), src: '*.js', dest: path.resolve(paths().public.js) },
-          { expand: true, cwd: path.resolve(paths().source.css), src: '*.css', dest: path.resolve(paths().public.css) },
-          { expand: true, cwd: path.resolve(paths().source.images), src: ['**/*.png', '**/*.jpg', '**/*.gif', '**/*.jpeg'], dest: path.resolve(paths().public.images) },
-          { expand: true, cwd: path.resolve(paths().source.fonts), src: '*', dest: path.resolve(paths().public.fonts) },
-          { expand: true, cwd: path.resolve(paths().source.data), src: 'annotations.js', dest: path.resolve(paths().public.data) }
-        ]
-      },
-      styleguide: {
-        files: [
-          { expand: true, cwd: path.resolve(paths().source.styleguide), src: ['*.*', '**/*.*'], dest: path.resolve(paths().public.styleguide) }
-        ]
-      }
-    },
-    watch: {
-      all: {
-        files: [
-          path.resolve(paths().source.css + '**/*.css'),
-          path.resolve(paths().source.styleguide + 'css/*.css'),
-          path.resolve(paths().source.patterns + '**/*'),
-          path.resolve(paths().source.fonts + '/*'),
-          path.resolve(paths().source.images + '/*'),
-          path.resolve(paths().source.data + '*.json'),
-          path.resolve(paths().source.js + '/*.js')
-        ],
-        tasks: ['default', 'bsReload:css']
       }
     },
     nodeunit: {
       all: ['test/*_tests.js']
     },
-    browserSync: {
-      dev: {
-        options: {
-          server:  path.resolve(paths().public.root),
-          watchTask: true,
-          watchOptions: {
-            ignoreInitial: true,
-            ignored: '*.html'
-          },
-          snippetOptions: {
-            // Ignore all HTML files within the templates folder
-            blacklist: ['/index.html', '/', '/?*']
-          },
-          plugins: [
-            {
-              module: 'bs-html-injector',
-              options: {
-                files: [path.resolve(paths().public.root + '/index.html'), path.resolve(paths().public.styleguide + '/styleguide.html')]
-              }
-            }
-          ],
-          notify: {
-            styles: [
-              'display: none',
-              'padding: 15px',
-              'font-family: sans-serif',
-              'position: fixed',
-              'font-size: 1em',
-              'z-index: 9999',
-              'bottom: 0px',
-              'right: 0px',
-              'border-top-left-radius: 5px',
-              'background-color: #1B2032',
-              'opacity: 0.4',
-              'margin: 0',
-              'color: white',
-              'text-align: center'
-            ]
-          }
-        }
-      }
-    },
     eslint: {
       options: {
         configFile: './.eslintrc'
       },
       target: ['./core/lib/*']
-    },
-    bsReload: {
-      css: path.resolve(paths().public.root + '**/*.css')
     }
   });
 
   // load all grunt tasks
-  require('matchdep').filterDev('grunt-*').forEach(grunt.loadNpmTasks);
-
-  //load the patternlab task
-  require('./core/lib/patternlab_grunt')(grunt);
-
-  grunt.registerTask('default', ['patternlab', 'copy:main', 'copy:styleguide']);
+  grunt.loadNpmTasks('grunt-contrib-concat');
+  grunt.loadNpmTasks('grunt-eslint');
+  grunt.loadNpmTasks('grunt-contrib-nodeunit');
 
   //travis CI task
   grunt.registerTask('travis', ['nodeunit', 'eslint']);
 
-  grunt.registerTask('serve', ['patternlab', 'copy:main', 'copy:styleguide', 'browserSync', 'watch:all']);
-
+  //to be run prior to releasing a version
   grunt.registerTask('build', ['nodeunit', 'eslint', 'concat']);
 
 };

core/lib/annotation_exporter.js

@@ -4,15 +4,19 @@ var annotations_exporter = function (pl) {
   var path = require('path'),
     fs = require('fs-extra'),
     JSON5 = require('json5'),
+    _ = require('lodash'),
+    md = require('markdown-it')(),
     paths = pl.config.paths;
 
-  // HELPER FUNCTIONS
+  /*
+  Returns the array of comments that used to be wrapped in raw JS.
+   */
   function parseAnnotationsJS() {
     //attempt to read the file
     try {
       var oldAnnotations = fs.readFileSync(path.resolve(paths.source.annotations, 'annotations.js'), 'utf8');
     } catch (ex) {
-      console.log(ex, 'This may be expected.');
+      console.log(ex, 'annotations.js file missing from ' + paths.source.annotations + '. This may be expected.');
     }
 
     //parse as JSON by removing the old wrapping js syntax. comments and the trailing semi-colon
@@ -23,17 +27,81 @@ var annotations_exporter = function (pl) {
       console.log('There was an error parsing JSON for ' + paths.source.annotations + 'annotations.js');
       console.log(ex);
     }
-    return oldAnnotationsJSON;
+    return oldAnnotationsJSON.comments;
+  }
+
+  /*
+   Converts the annotations.md file yaml list into an array of annotations
+   */
+  function parseAnnotationsMD() {
+    var annotations = [];
+
+    //attempt to read the file
+    var annotationsMD = '';
+    try {
+      annotationsMD = fs.readFileSync(path.resolve(paths.source.annotations, 'annotations.md'), 'utf8');
+    } catch (ex) {
+      console.log(ex, 'annotations.md file missing from ' + paths.source.annotations + '. This may be expected.');
+    }
+
+    //take the annotation snippets and split them on our custom delimiter
+    var annotationsYAML = annotationsMD.split('~*~');
+    for (var i = 0; i < annotationsYAML.length; i++) {
+      var annotation = {};
+
+      //for each annotation process the yaml frontmatter and markdown
+      var annotationSnippet = annotationsYAML[i];
+      var annotationsRE = /---\r?\n{1}([\s\S]*)---\r?\n{1}([\s\S]*)+/gm;
+      var chunks = annotationsRE.exec(annotationSnippet);
+      if (chunks && chunks[1] && chunks[2]) {
+
+        //convert each yaml frontmatter key into an object key
+        var frontmatter = chunks[1];
+        var frontmatterLines = frontmatter.split(/\n/gm);
+        for (var j = 0; j < frontmatterLines.length; j++) {
+          var frontmatterLine = frontmatterLines[j];
+          if (frontmatterLine.length > 0) {
+            var frontmatterLineChunks = frontmatterLine.split(':'); //test this
+            var frontmatterKey = frontmatterLineChunks[0].toLowerCase().trim();
+            var frontmatterValueString = frontmatterLineChunks[1].trim();
+            var frontmatterValue = frontmatterValueString.substring(1, frontmatterValueString.length - 1);
+            if (frontmatterKey === 'el' || frontmatterKey === 'selector') {
+              annotation.el = frontmatterValue;
+            }
+            if (frontmatterKey === 'title') {
+              annotation.title = frontmatterValue;
+            }
+          }
+        }
+
+        //set the comment to the parsed markdown
+        var annotationMarkdown = chunks[2];
+        annotation.comment = md.render(annotationMarkdown);
+
+        annotations.push(annotation);
+      } else {
+        console.log('annotations.md file not formatted as expected. Error parsing frontmatter and markdown out of ' + annotationSnippet);
+      }
+    }
+    return annotations;
   }
 
   function gatherAnnotations() {
-    //todo: merge markdown too https://github.com/pattern-lab/patternlab-php-core/blob/c2c4bc6a8bda2b2f9c08b197669ebc94c025e7c6/src/PatternLab/Annotations.php
-    return parseAnnotationsJS();
+    var annotationsJS = parseAnnotationsJS();
+    var annotationsMD = parseAnnotationsMD();
+    var mergedAnnotations = _.unionBy(annotationsJS, annotationsMD, 'el');
+    return mergedAnnotations;
   }
 
   return {
     gather: function () {
       return gatherAnnotations();
+    },
+    gatherJS: function () {
+      return parseAnnotationsJS();
+    },
+    gatherMD: function () {
+      return parseAnnotationsMD();
     }
   };
 

core/lib/lineage_hunter.js

@@ -1,13 +1,3 @@
-/*
- * patternlab-node - v1.3.0 - 2016
- *
- * Brian Muenzenmeyer, and the web community.
- * Licensed under the MIT license.
- *
- * Many thanks to Brad Frost and Dave Olsen for inspiration, encouragement, and advice.
- *
- */
-
 "use strict";
 
 var lineage_hunter = function () {
@@ -112,7 +102,7 @@ var lineage_hunter = function () {
               < patternlab.config.patternStateCascade.indexOf(lineageRPattern.patternState))) {
 
               if (patternlab.config.debug) {
-                console.log('Found a lower common denominator pattern state: ' + pattern.patternState + ' on ' + pattern.key + '. Setting reverse lineage pattern ' + lineageRPattern.patternPartial + ' from ' + (lineageRPattern.patternState === '' ? '<<blank>>' : lineageRPattern.patternState));
+                console.log('Found a lower common denominator pattern state: ' + pattern.patternState + ' on ' + pattern.patternPartial + '. Setting reverse lineage pattern ' + lineageRPattern.patternPartial + ' from ' + (lineageRPattern.patternState === '' ? '<<blank>>' : lineageRPattern.patternState));
               }
 
               lineageRPattern.patternState = pattern.patternState;

core/lib/list_item_hunter.js

@@ -1,13 +1,3 @@
-/*
- * patternlab-node - v1.3.0 - 2016
- *
- * Brian Muenzenmeyer, and the web community.
- * Licensed under the MIT license.
- *
- * Many thanks to Brad Frost and Dave Olsen for inspiration, encouragement, and advice.
- *
- */
-
 "use strict";
 
 var list_item_hunter = function () {
@@ -17,7 +7,7 @@ var list_item_hunter = function () {
     pa = require('./pattern_assembler'),
     smh = require('./style_modifier_hunter'),
     plutils = require('./utilities'),
-    of = require('./object_factory');
+    Pattern = require('./object_factory').Pattern;
 
   var pattern_assembler = new pa(),
     style_modifier_hunter = new smh(),
@@ -54,7 +44,7 @@ var list_item_hunter = function () {
         try {
           listData = JSON5.parse(JSON5.stringify(patternlab.listitems));
         } catch (err) {
-          console.log('There was an error parsing JSON for ' + pattern.abspath);
+          console.log('There was an error parsing JSON for ' + pattern.relPath);
           console.log(err);
         }
         listData = plutils.mergeData(listData, pattern.listitems);
@@ -73,7 +63,7 @@ var list_item_hunter = function () {
             globalData = JSON5.parse(JSON5.stringify(patternlab.data));
             localData = JSON5.parse(JSON5.stringify(pattern.jsonFileData));
           } catch (err) {
-            console.log('There was an error parsing JSON for ' + pattern.abspath);
+            console.log('There was an error parsing JSON for ' + pattern.relPath);
             console.log(err);
           }
 
@@ -82,7 +72,7 @@ var list_item_hunter = function () {
           allData.link = extend({}, patternlab.data.link);
 
           //check for partials within the repeated block
-          var foundPartials = of.oPattern.createEmpty({'template': thisBlockTemplate}).findPartials();
+          var foundPartials = Pattern.createEmpty({'template': thisBlockTemplate}).findPartials();
 
           if (foundPartials && foundPartials.length > 0) {
 
@@ -97,7 +87,7 @@ var list_item_hunter = function () {
               try {
                 cleanPartialPattern = JSON5.parse(JSON5.stringify(partialPattern));
               } catch (err) {
-                console.log('There was an error parsing JSON for ' + pattern.abspath);
+                console.log('There was an error parsing JSON for ' + pattern.relPath);
                 console.log(err);
               }