Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/RuleMatcher.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,18 @@ var RuleMatcher = function(rules){
this.rules = rules;

this.redirectOnMatch = function(request){
var rule = _.find(rules, function(rule){
return rule.isActive
&& request.url.indexOf(rule.from) > -1
&& request.requestId !== lastRequestId;
var rule = _.find(rules, function(rule){
var match = new RegExp(rule.from);
return rule.isActive && match.test(request.url) &&
request.requestId !== lastRequestId;
});

if(rule){
lastRequestId = request.requestId;
var match = new RegExp(rule.from);
return {
redirectUrl : request.url.replace(rule.from, rule.to)
redirectUrl : request.url.replace(match, rule.to)
};
}
};
};
};
2 changes: 1 addition & 1 deletion src/RulesController.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ angular.module('switcheroo')
$scope.$watch('rules', function(oldValue, newValue){
rulesService.set(newValue);
}, true);
}]);
}]);
10 changes: 10 additions & 0 deletions tests/spec/RuleMatcher.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,16 @@ describe("RuleMatcher", function() {
expect(sut.redirectOnMatch(request)).toEqual({ redirectUrl: 'http://bard.com' });
});

it('given request url should redirect to rule with regexp matching', function(){
sut = new RuleMatcher([
givenRule('fo+', 'bar', true),
]);

var request = givenRequest(1, 'http://food.com');

expect(sut.redirectOnMatch(request)).toEqual({ redirectUrl: 'http://bard.com' });
});

it('given request url should redirect to first matching active rule', function(){
sut = new RuleMatcher([
givenRule('foo', 'bar', false),
Expand Down