Merge pull request #25 from jstransformers/update

Update Marko and Boilerplate
jstransformers · Jun 2, 2016 · d20ac0b · d20ac0b
2 parents 49f134a + 70e0792
commit d20ac0b
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 14 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,9 @@
+root = true
+
+[*]
+indent_style = space
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
diff --git a/.gitignore b/.gitignore
@@ -7,9 +7,6 @@ pids
 *.pid
 *.seed
 
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
 # Coverage directory used by tools like istanbul
 coverage
 

diff --git a/.travis.yml b/.travis.yml
@@ -2,9 +2,10 @@ language: node_js
 sudo: false
 
 node_js:
-  - "0.10"
-  - "0.12"
-  - "iojs"
+  #- "0.10"
+  #- "0.12"
+  - "4"
+  - "5"
 
 after_success:
   - npm run coverage

diff --git a/HISTORY.md b/HISTORY.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## v0.1.0: 2016-06-02
+
+- Update to `marko@^3.1.7`
+- Update Boilerplate
+
 ## v0.0.1: 2015-06-02
 
 - Initial release
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 # The MIT License (MIT)
 
-Copyright (c) 2015 [Rob Loach](http://robloach.net)
+Copyright (c) 2015 [JSTransformers Team](https://github.com/orgs/jstransformers/people)
 
 > Permission is hereby granted, free of charge, to any person obtaining a copy
 > of this software and associated documentation files (the "Software"), to deal

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jstransformer-marko",
-  "version": "0.0.2",
+  "version": "0.1.0",
   "description": "Marko support for JSTransformers.",
   "keywords": [
     "jstransformer",
@@ -18,13 +18,19 @@
     "test-jstransformer": "^1.0.0"
   },
   "scripts": {
-    "test": "test-jstransformer",
-    "coverage": "test-jstransformer coverage"
+    "coverage": "test-jstransformer coverage",
+    "test": "test-jstransformer"
+  },
+  "engines": {
+    "node": ">=0.10.36"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/jstransformers/jstransformer-marko.git"
   },
-  "author": "Rob Loach <robloach@gmail.com>",
+  "author": {
+    "name": "JSTransformers Team",
+    "url": "http://github.com/orgs/jstransformers/people"
+  },
   "license": "MIT"
 }
diff --git a/test/expected.html b/test/expected.html
@@ -0,0 +1 @@
+<!DOCTYPE html><html lang="en"><head><title>Marko Templating Engine</title></head><body><h1>Hello World!</h1><ul><li>Blue</li><li>White</li><li>Red</li></ul></body></html>
diff --git a/test/expected.txt b/test/expected.txt
diff --git a/test/input.marko b/test/input.marko
@@ -1 +1,11 @@
-Hello, ${data.name}!
+<!DOCTYPE html>
+html lang="en"
+    head
+        title - Marko Templating Engine
+    body
+        h1 - Hello ${data.name}!
+        ul if(notEmpty(data.colors))
+            li for(color in data.colors)
+                ${color}
+        div else
+            - No colors!
diff --git a/test/locals.json b/test/locals.json
@@ -1,3 +1,8 @@
 {
-  "name": "World"
+  "name": "World",
+  "colors": [
+    "Blue",
+    "White",
+    "Red"
+  ]
 }