Merge pull request #5 from tvararu/master

Add jade template parser through templatizer.

.gitignore

@@ -6,4 +6,5 @@ dist
 npm-debug.log
 .tmp
 coverage
+app/js/lib/templates.js
 

app/js/main.js

@@ -3,9 +3,10 @@
 require('famous-polyfills');
 
 var _ = require('lodash');
-var cordova = require('./cordova-shim');
 var $ = require('jquery');
+var cordova = require('./cordova-shim');
 var maps = require('./maps');
+var templates = require('./lib/templates');
 
 module.exports = {
   launch: _.once(function () {

app/js/maps.js

@@ -1,4 +1,4 @@
-var ol = require('./ol');
+var ol = require('./lib/ol');
 
 var Maps = {
   createMap: function (opts) {
@@ -20,6 +20,7 @@ var Maps = {
       extent: extent
     });
 
+    /* istanbul ignore next */
     mapLayer.on('precompose', function(event) {
       var ctx = event.context;
       ctx.save();
@@ -43,6 +44,7 @@ var Maps = {
       ctx.setTransform(1, 0, 0, 1, 0, 0);
     });
 
+    /* istanbul ignore next */
     mapLayer.on('postcompose', function(event) {
       var ctx = event.context;
       ctx.restore();

app/templates/article.jade

@@ -0,0 +1,6 @@
+include mixins
+
+p Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
++do-stuff()
+

app/templates/mixins.jade

@@ -0,0 +1,3 @@
+mixin do-stuff()
+  p stuff!
+

app/templates/test/ceva.jade

@@ -0,0 +1,7 @@
+include ../mixins
+
++do-stuff()
+
+p loremus ipsumus
+
+

gulp/build.js

@@ -12,8 +12,8 @@ var exec = require('child_process').exec;
 var source = require('vinyl-source-stream');
 var browserify = require('browserify');
 var istanbul = require('browserify-istanbul');
-
 var browserSync = require('browser-sync');
+var templatizer = require('templatizer');
 
 gulp.task('clean', function () {
   return gulp.src(paths.tmp, { read: false })
@@ -34,15 +34,15 @@ gulp.task('index.html', function () {
     .pipe(browserSync.reload({stream: true}));
 });
 
-gulp.task('jade', function () {
-  return gulp.src(paths.app + '/*.html')
-    .pipe(gulp.dest(paths.tmp))
-    .pipe(browserSync.reload({stream: true}));
+gulp.task('templates', function () {
+  templatizer(paths.app + '/templates', paths.app + '/js/lib/templates.js');
 });
 
-gulp.task('js', function () {
+gulp.task('js', ['templates'], function () {
   var bundleStream = browserify(paths.app + '/js/main.js')
-    .transform(istanbul)
+    .transform(istanbul({
+      ignore: ['**/lib/**'] 
+    }))
     .bundle();
 
   return bundleStream

gulp/watch.js

@@ -10,7 +10,7 @@ var browserSync = require('browser-sync');
 
 gulp.task('watch:common', ['build'], function () {
   gulp.watch(paths.app + '/index.jade', ['index.html']);
-  gulp.watch(paths.app + '/templates/*.jade', ['jade']);
+  gulp.watch(paths.app + '/templates/*.jade', ['templates']);
   gulp.watch(paths.app + '/**/*.js', ['js:no-istanbul']);
   gulp.watch(paths.app + '/**/*.css', ['css']);
 });

package.json

@@ -62,6 +62,7 @@
     "psi": "^0.1.1",
     "require-dir": "^0.1.0",
     "should": "^4.0.4",
+    "templatizer": "^0.3.6",
     "vinyl-source-stream": "^0.1.1",
     "when": "^3.4.3"
   }