Merge pull request #8 from superwolff/update-tests

Update tests
metalsmith · Jul 19, 2015 · 2c1f118 · 2c1f118
2 parents fc5e6d8 + afdf946
commit 2c1f118
Show file tree

Hide file tree

Showing 39 changed files with 90 additions and 169 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,19 @@
+# For more information about the properties used in
+# this file, please see the EditorConfig documentation:
+# http://editorconfig.org/
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[Makefile]
+indent_style = tab
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,17 @@
+# Automatically normalize line endings for all text-based files
+# http://git-scm.com/docs/gitattributes#_end_of_line_conversion
+* text=auto
+
+# For the following file types, normalize line endings to LF on
+# checkin and prevent conversion to CRLF when they are checked out
+# (this is required in order to prevent newline related issues like,
+# for example, after the build script is run)
+.*      text eol=lf
+*.css   text eol=lf
+*.html  text eol=lf
+*.js    text eol=lf
+*.json  text eol=lf
+*.md    text eol=lf
+*.sh    text eol=lf
+*.txt   text eol=lf
+*.xml   text eol=lf
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,4 @@
+sudo: false
+language: node_js
+node_js:
+  - "0.12"
diff --git a/Makefile b/Makefile
@@ -1,8 +1,14 @@
 
+mocha=node_modules/.bin/mocha --reporter spec
+
 node_modules: package.json
 	@npm install
 
 test: node_modules
-	@./node_modules/.bin/mocha --reporter spec
+	@$(mocha)
+
+test-debug: node_modules
+	@$(mocha) debug
 
-.PHONY: test
+.PHONY: test
+.PHONY: test-debug
diff --git a/Readme.md b/Readme.md
@@ -1,5 +1,7 @@
 # metalsmith-in-place
 
+[![Build Status](https://travis-ci.org/superwolff/metalsmith-in-place.svg)](https://travis-ci.org/superwolff/metalsmith-in-place) [![Dependency Status](https://david-dm.org/superwolff/metalsmith-in-place.svg)](https://david-dm.org/superwolff/metalsmith-in-place) [![devDependency Status](https://david-dm.org/superwolff/metalsmith-in-place/dev-status.svg)](https://david-dm.org/superwolff/metalsmith-in-place#info=devDependencies)
+
 > A metalsmith plugin for in-place templating
 
 This plugin renders templating syntax in your source files. You can use any templating engine supported by [consolidate.js](https://github.com/tj/consolidate.js). Pass options to it with the [Javascript API](https://github.com/segmentio/metalsmith#api) or [CLI](https://github.com/segmentio/metalsmith#cli). The options are:

diff --git a/lib/index.js b/lib/index.js
@@ -1,10 +1,10 @@
-
 var consolidate = require('consolidate');
 var debug = require('debug')('metalsmith-in-place');
 var each = require('async').each;
 var extend = require('extend');
 var match = require('multimatch');
 var omit = require('lodash.omit');
+var utf8 = require('is-utf8');
 
 /**
  * Expose `plugin`.
@@ -38,8 +38,11 @@ function plugin(opts){
 
   return function(files, metalsmith, done){
     var metadata = metalsmith.metadata();
+    var matches = {};
 
     function check(file){
+      var data = files[file];
+      if (!utf8(data.contents)) return false;
       if (pattern && !match(file, pattern)[0]) return false;
       return true;
     }
@@ -49,15 +52,16 @@ function plugin(opts){
       debug('stringifying file: %s', file);
       var data = files[file];
       data.contents = data.contents.toString();
+      matches[file] = data;
     });
 
-    each(Object.keys(files), convert, done);
+    each(Object.keys(matches), convert, done);
 
     function convert(file, done){
-      if (!check(file)) return done();
       debug('converting file: %s', file);
       var data = files[file];
-      var clone = extend({}, params, metadata, data);
+      var clonedParams = extend(true, {}, params);
+      var clone = extend({}, clonedParams, metadata, data);
       var str = clone.contents;
       var render = consolidate[engine].render;
 

diff --git a/package.json b/package.json
@@ -19,6 +19,7 @@
   },
   "devDependencies": {
     "assert-dir-equal": "0.0.1",
+    "is-utf8": "^0.2.0",
     "metalsmith": "^1.0.1",
     "mocha": "1.x",
     "swig": "~1.3.2"

diff --git a/test/fixtures/basic/build/index.html b/test/fixtures/basic/build/index.html
@@ -1,6 +1,2 @@
-<html>
-<body>
-
-body
-</body>
-</html>
+
+value
diff --git a/test/fixtures/basic/expected/index.html b/test/fixtures/basic/expected/index.html
@@ -1,6 +1,2 @@
-<html>
-<body>
-
-body
-</body>
-</html>
+
+value
diff --git a/test/fixtures/basic/src/index.html b/test/fixtures/basic/src/index.html
@@ -1,5 +1,5 @@
 ---
-template: layout.html
+variable: value
 ---
 
-body
+{{variable}}
diff --git a/test/fixtures/basic/templates/layout.html b/test/fixtures/basic/templates/layout.html
diff --git a/test/fixtures/default/build/default.md b/test/fixtures/default/build/default.md
diff --git a/test/fixtures/default/build/other.md b/test/fixtures/default/build/other.md
diff --git a/test/fixtures/default/expected/default.md b/test/fixtures/default/expected/default.md
diff --git a/test/fixtures/default/expected/other.md b/test/fixtures/default/expected/other.md
diff --git a/test/fixtures/default/src/default.md b/test/fixtures/default/src/default.md
diff --git a/test/fixtures/default/src/other.md b/test/fixtures/default/src/other.md
diff --git a/test/fixtures/default/templates/default.html b/test/fixtures/default/templates/default.html
diff --git a/test/fixtures/default/templates/other.html b/test/fixtures/default/templates/other.html
diff --git a/test/fixtures/directory/build/index.html b/test/fixtures/directory/build/index.html
diff --git a/test/fixtures/directory/expected/index.html b/test/fixtures/directory/expected/index.html
diff --git a/test/fixtures/directory/layouts/layout.html b/test/fixtures/directory/layouts/layout.html
diff --git a/test/fixtures/directory/src/index.html b/test/fixtures/directory/src/index.html
diff --git a/test/fixtures/in-place/build/index.html b/test/fixtures/in-place/build/index.html
diff --git a/test/fixtures/in-place/expected/index.html b/test/fixtures/in-place/expected/index.html
diff --git a/test/fixtures/in-place/src/index.html b/test/fixtures/in-place/src/index.html
diff --git a/test/fixtures/metadata/build/one.html b/test/fixtures/metadata/build/one.html
@@ -1,9 +1,3 @@
-<html>
-<head>
-  <title>Local Title</title>
-</head>
-<body>
-
-one
-</body>
-</html>
+Local Title
+
+one
diff --git a/test/fixtures/metadata/build/two.html b/test/fixtures/metadata/build/two.html
@@ -1,9 +1,3 @@
-<html>
-<head>
-  <title>Global Title</title>
-</head>
-<body>
-
-two
-</body>
-</html>
+Global Title
+
+two
diff --git a/test/fixtures/metadata/expected/one.html b/test/fixtures/metadata/expected/one.html
@@ -1,9 +1,3 @@
-<html>
-<head>
-  <title>Local Title</title>
-</head>
-<body>
-
-one
-</body>
-</html>
+Local Title
+
+one
diff --git a/test/fixtures/metadata/expected/two.html b/test/fixtures/metadata/expected/two.html
@@ -1,9 +1,3 @@
-<html>
-<head>
-  <title>Global Title</title>
-</head>
-<body>
-
-two
-</body>
-</html>
+Global Title
+
+two
diff --git a/test/fixtures/metadata/src/one.html b/test/fixtures/metadata/src/one.html
@@ -1,6 +1,6 @@
 ---
 title: Local Title
-template: layout.html
 ---
+{{title}}
 
 one
diff --git a/test/fixtures/metadata/src/two.html b/test/fixtures/metadata/src/two.html
@@ -1,5 +1,3 @@
----
-template: layout.html
----
+{{title}}
 
 two
diff --git a/test/fixtures/metadata/templates/layout.html b/test/fixtures/metadata/templates/layout.html
diff --git a/test/fixtures/pattern/build/index.html b/test/fixtures/pattern/build/index.html
@@ -1,2 +1,3 @@
+{{title}}
 
 Not matched body
diff --git a/test/fixtures/pattern/expected/index.html b/test/fixtures/pattern/expected/index.html
@@ -1,2 +1,3 @@
+{{title}}
 
 Not matched body
diff --git a/test/fixtures/pattern/src/index.html b/test/fixtures/pattern/src/index.html
@@ -1,6 +1,6 @@
 ---
 title: Not matched
-template: layout.html
 ---
+{{title}}
 
 Not matched body
diff --git a/test/fixtures/pattern/src/index.md b/test/fixtures/pattern/src/index.md
@@ -1,6 +1,6 @@
 ---
 title: Matched
-template: layout.html
 ---
+{{title}}
 
 Matched body
diff --git a/test/fixtures/pattern/templates/layout.html b/test/fixtures/pattern/templates/layout.html
-Original file line number
+Diff line change
@@ -1,6 +1,2 @@
-    <html>
-    <body>
-    body
-    </body>
-    </html>
+    value