Added support for spaces after prefix and before suffix

haoxins · Jun 29, 2015 · 4201514 · 4201514 · haoxins · Jun 30, 2015
1 parent 4ccae12
commit 4201514
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/index.js b/index.js
@@ -24,7 +24,7 @@ module.exports = function(options) {
     context = {};
   }
 
-  var includeRegExp = new RegExp(prefix + 'include\\s*\\([^)"\']*["\']([^"\']*)["\'](,\\s*({[\\s\\S]*?})){0,1}\\s*\\)+' + suffix);
+  var includeRegExp = new RegExp(prefix + '[ ]*include\\s*\\([^)"\']*["\']([^"\']*)["\'](,\\s*({[\\s\\S]*?})){0,1}\\s*\\)+[ ]*' + suffix);
 
   function fileInclude(file, enc, cb) {
     if (file.isNull()) {
@@ -55,13 +55,13 @@ module.exports = function(options) {
    */
   function stripCommentedIncludes(content) {
     // remove single line html comments that use the format: <!-- @@include() -->
-    var regex = new RegExp('<\!--(.*)' + prefix + 'include([\\s\\S]*?)' + suffix + '-->', 'g');
+    var regex = new RegExp('<\!--(.*)' + prefix + '[ ]*include([\\s\\S]*?)[ ]*' + suffix + '-->', 'g');
     return content.replace(regex, '');
   }
 
   function parseConditionalIncludes(content, data) {
     // parse @@if (something) { include('...') }
-    var regexp = new RegExp(prefix + 'if.*\\{[^{}]*\\}\\s*' + suffix),
+    var regexp = new RegExp(prefix + '[ ]*if.*\\{[^{}]*\\}\\s*' + suffix),
       matches = regexp.exec(content),
       included = false;
 
@@ -99,7 +99,7 @@ module.exports = function(options) {
     var key;
     for (; ~i; i -= 1) {
       key = keys[i];
-      text = text.replace(new RegExp(prefix + key + suffix, 'g'), variables[key]);
+      text = text.replace(new RegExp(prefix + '[ ]*' + key + '[ ]*' + suffix, 'g'), variables[key]);
     }
 
     var filebase = basepath === '@file' ? path.dirname(file.path) : basepath === '@root' ? process.cwd() : basepath;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gulp-file-include",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "description": "a gulp plugin for file include",
   "main": "index.js",
   "scripts": {

diff --git a/test/fixtures-conditional/index.html b/test/fixtures-conditional/index.html
@@ -22,10 +22,10 @@
   "title": "haoxin"
 })
 
-@@if (name === 'c' && context.title === 'haoxin') {
+@@ if (name === 'c' && context.title === 'haoxin') {
   @@include('c.html')
 }
 
-@@if (name === 'c' && context.title !== 'haoxin') {
+@@  if (name === 'c' && context.title !== 'haoxin') {
   @@include('c.html')
 }
diff --git a/test/fixtures/index-markdown.html b/test/fixtures/index-markdown.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <body>
-  @@include(markdown('view.md'))
+  @@  include(markdown('view.md'))
   @@include('./var.html', {
     "name": "haoxin",
     "age": 12345

diff --git a/test/fixtures/var.html b/test/fixtures/var.html
@@ -1,2 +1,2 @@
 <label>@@name</label>
-<label>@@age</label>
+<label>@@ age</label>