ee-soa-transport-rewrite
Advanced tools
Comparing version 0.2.0 to 0.2.1
@@ -21,3 +21,3 @@ "use strict"; | ||
var result = pathname.match(path); | ||
pathname.lastIndex = 0; | ||
path.lastIndex = 0; | ||
return !Types.null(result); | ||
@@ -24,0 +24,0 @@ } |
@@ -6,3 +6,4 @@ "use strict"; | ||
var Extend = { | ||
var Extend = module.exports = new Class({ | ||
inherits: Rewrite | ||
@@ -14,6 +15,5 @@ , _name: 'extend' | ||
this._loader.load(aliased, function(err, result){ | ||
if(err){ | ||
return callback(err, null); | ||
} | ||
if(err) return callback(err, null); | ||
if('execute' in result){ | ||
@@ -27,4 +27,2 @@ this.then(result); | ||
} | ||
}; | ||
module.exports = new Class(Extend); | ||
}); |
{ | ||
"name" : "ee-soa-transport-rewrite" | ||
, "description" : "Rewriting middleware for the ee-soa-transports" | ||
, "version" : "0.2.0" | ||
, "version" : "0.2.1" | ||
, "homepage" : "https://github.com/eventEmitter/ee-soa-transport-rewrite" | ||
@@ -6,0 +6,0 @@ , "author" : { |
@@ -19,2 +19,3 @@ var assert = require('assert') | ||
describe('Rewrite', function(){ | ||
var rew = new rewrites.Rewrite(), | ||
@@ -26,4 +27,5 @@ base = new rewrites.Append({domain:'test.com', field:'filter', value:', deleted=null'}), | ||
template = new rewrites.Template({domain:'test.com', value:'index.nunjucks.html'}), | ||
path = new rewrites.Path({domain:'test.com', path:/\/somewhere\/(\d+)/, value: '/somewhere-else/$1' }), | ||
template = new rewrites.Template({domain:'test.com', value:'index.nunjucks.html'}), | ||
templateWithPath = new rewrites.Template({domain:'test.com', value:'details.nunjucks.html', path: '/detail/'}), | ||
path = new rewrites.Path({domain:'test.com', path:/\/somewhere\/(\d+)/, value: '/somewhere-else/$1' }), | ||
@@ -38,2 +40,3 @@ option1 = new rewrites.Option({domain: 'test.com', field:'testosteron', value: true}), | ||
param4 = new rewrites.Parameter({domain: 'test.com', path: /\/images\/(\d)(\d).*/, field: 'matches', value: function(match){ return match; }}), | ||
imageParam = new rewrites.Parameter( | ||
@@ -117,5 +120,8 @@ { | ||
describe('Template', function(){ | ||
describe('#execute', function(){ | ||
var templateWithStatusCode = new rewrites.Template({field:404, value:'error/404.html'}); | ||
var templateWithStatusCode = new rewrites.Template({ field:404, value:'error/404.html' }); | ||
assert(!MockRequest.template); | ||
it('should set should a template property (an object)', function(done){ | ||
@@ -133,2 +139,10 @@ template.execute(MockRequest, function(err){ | ||
it('the default key can be overwritten by later invokations', function(done){ | ||
templateWithPath.execute(MockRequest, function(err){ | ||
assert.equal('details.nunjucks.html', MockRequest.template.resolve()); | ||
assert.equal('details.nunjucks.html', MockRequest.template.resolve(1000)); | ||
done(err); | ||
}); | ||
}); | ||
it('or a key such as an error key if one is set', function(done){ | ||
@@ -142,4 +156,5 @@ templateWithStatusCode.execute(MockRequest, function(err){ | ||
it('without modifying the existing templates', function(){ | ||
assert.equal('index.nunjucks.html', MockRequest.template.resolve()); | ||
assert.equal('details.nunjucks.html', MockRequest.template.resolve()); | ||
}); | ||
}); | ||
@@ -146,0 +161,0 @@ }); |
1165
52025
38