Permalink
Browse files

Removed semi-colons from glob and include

  • Loading branch information...
1 parent cc3356f commit ca2259c6a830ce8efaaf3f574d662c2fe3bdef4b @tj committed Mar 22, 2012
Showing with 8 additions and 8 deletions.
  1. +1 −1 lib/plugins/glob.js
  2. +1 −1 lib/plugins/include.js
  3. +1 −1 package.json
  4. +2 −2 test/fixtures/include.json
  5. +3 −3 test/glob.js
View
@@ -4,7 +4,7 @@
*/
module.exports = function(key, val){
- var m = /^glob: *(.+)$/.exec(val);
+ var m = /^glob +(.+)$/.exec(val);
if (!m) return;
return require('glob').sync(m[1]);
}
View
@@ -13,7 +13,7 @@ var path = require('path')
*/
module.exports = function(key, val, parser){
- var m = /^include: *(.+)$/.exec(val);
+ var m = /^include +(.+)$/.exec(val);
if (!m) return;
var path = join(dirname(parser.path), m[1] + '.json');
return parser.clone().read(path);
View
@@ -1,7 +1,7 @@
{
"name": "ejson"
, "version": "0.0.1"
- , "description": "Extended JSON"
+ , "description": "Extended JSON - pluggable JSON logic for dates, includes, and more"
, "keywords": ["json", "config"]
, "author": "TJ Holowaychuk <tj@vision-media.ca>"
, "dependencies": {
@@ -1,3 +1,3 @@
["foo",
- "include: ./config/permissions",
- "include: ./config/roles"]
+ "include config/permissions",
+ "include config/roles"]
View
@@ -4,18 +4,18 @@ var Parser = require('../')
describe('glob', function(){
it('should perform a sync glob', function(){
- glob('', 'glob: test/fixtures/*.js').should.eql(
+ glob('', 'glob test/fixtures/*.js').should.eql(
['test/fixtures/bar.js',
'test/fixtures/baz.js',
'test/fixtures/foo.js']
);
- glob('', 'glob: test/fixtures/b*.js').should.eql(
+ glob('', 'glob test/fixtures/b*.js').should.eql(
['test/fixtures/bar.js',
'test/fixtures/baz.js']
);
- glob('', 'glob: test/fixtures/{bar,foo}.js').should.eql(
+ glob('', 'glob test/fixtures/{bar,foo}.js').should.eql(
['test/fixtures/bar.js',
'test/fixtures/foo.js']
);

0 comments on commit ca2259c

Please sign in to comment.