diff --git a/dist/smartstring.domain.js b/dist/smartstring.domain.js index bcd9692..a331f9a 100644 --- a/dist/smartstring.domain.js +++ b/dist/smartstring.domain.js @@ -4,12 +4,17 @@ var Domain = (function () { function Domain(domainStringArg) { this.fullName = domainStringArg; var regexMatches = domainRegex(domainStringArg); - this.level1 = regexMatches[0]; - this.level2 = regexMatches[1]; - this.level3 = regexMatches[2]; - this.level4 = regexMatches[3]; - this.level5 = regexMatches[4]; - this.protocol = protocolRegex(domainStringArg)[1]; + for (var i = 1; i <= 5; i++) { + if (regexMatches[i - 1]) { + this["level" + i.toString()] = regexMatches[i - 1]; + } + else { + this["level" + i.toString()] = undefined; + } + ; + } + ; + this.protocol = protocolRegex(domainStringArg); this.zoneName = this.level2 + "." + this.level1; // aliases this.topLevel = this.level1; @@ -22,7 +27,8 @@ exports.Domain = Domain; var domainRegex = function (stringArg) { var regexString = /([a-zA-Z0-9]*)\.{0,1}([a-zA-Z0-9]*)\.{0,1}([a-zA-Z0-9]*)\.{0,1}([a-zA-Z0-9]*)\.{0,1}([a-zA-Z0-9]*)\.{0,1}$/; var regexMatches = regexString.exec(stringArg); - regexMatches.reverse(); + regexMatches.reverse(); //make sure we build the domain from toplevel to subdomain (reversed order) + regexMatches.pop(); // pop the last element, which is, since we reversed the Array, the full String of matched elements var regexMatchesFiltered = regexMatches.filter(function (stringArg) { return (stringArg != ""); }); @@ -31,8 +37,12 @@ var domainRegex = function (stringArg) { var protocolRegex = function (stringArg) { var regexString = /^([a-zA-Z0-9]*):\/\//; var regexMatches = regexString.exec(stringArg); - console.log(regexMatches); - return regexMatches; + if (regexMatches) { + return regexMatches[1]; + } + else { + return undefined; + } }; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNtYXJ0c3RyaW5nLmRvbWFpbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFDUCxDQUFDLENBRHNCO0FBR3ZCO0lBYUksZ0JBQVksZUFBc0I7UUFDOUIsSUFBSSxDQUFDLFFBQVEsR0FBRyxlQUFlLENBQUM7UUFDaEMsSUFBSSxZQUFZLEdBQUcsV0FBVyxDQUFDLGVBQWUsQ0FBQyxDQUFDO1FBQ2hELElBQUksQ0FBQyxNQUFNLEdBQUcsWUFBWSxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQzlCLElBQUksQ0FBQyxNQUFNLEdBQUcsWUFBWSxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQzlCLElBQUksQ0FBQyxNQUFNLEdBQUcsWUFBWSxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQzlCLElBQUksQ0FBQyxNQUFNLEdBQUcsWUFBWSxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQzlCLElBQUksQ0FBQyxNQUFNLEdBQUcsWUFBWSxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQzlCLElBQUksQ0FBQyxRQUFRLEdBQUcsYUFBYSxDQUFDLGVBQWUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ2xELElBQUksQ0FBQyxRQUFRLEdBQUcsSUFBSSxDQUFDLE1BQU0sR0FBRyxHQUFHLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQztRQUVoRCxVQUFVO1FBQ1YsSUFBSSxDQUFDLFFBQVEsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDO1FBQzVCLElBQUksQ0FBQyxVQUFVLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQztRQUM5QixJQUFJLENBQUMsU0FBUyxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUM7SUFDakMsQ0FBQztJQUNMLGFBQUM7QUFBRCxDQTdCQSxBQTZCQyxJQUFBO0FBN0JZLGNBQU0sU0E2QmxCLENBQUE7QUFHRCxJQUFJLFdBQVcsR0FBRyxVQUFTLFNBQWdCO0lBQ3ZDLElBQUksV0FBVyxHQUFHLDRHQUE0RyxDQUFDO0lBQy9ILElBQUksWUFBWSxHQUFHLFdBQVcsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDL0MsWUFBWSxDQUFDLE9BQU8sRUFBRSxDQUFDO0lBQ3ZCLElBQUksb0JBQW9CLEdBQUcsWUFBWSxDQUFDLE1BQU0sQ0FBQyxVQUFTLFNBQWdCO1FBQ3BFLE1BQU0sQ0FBQSxDQUFDLFNBQVMsSUFBSSxFQUFFLENBQUMsQ0FBQztJQUM1QixDQUFDLENBQUMsQ0FBQztJQUNILE1BQU0sQ0FBQyxvQkFBb0IsQ0FBQztBQUNoQyxDQUFDLENBQUM7QUFFRixJQUFJLGFBQWEsR0FBRyxVQUFTLFNBQWdCO0lBQ3pDLElBQUksV0FBVyxHQUFHLHNCQUFzQixDQUFDO0lBQ3pDLElBQUksWUFBWSxHQUFHLFdBQVcsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDL0MsT0FBTyxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsQ0FBQztJQUMxQixNQUFNLENBQUMsWUFBWSxDQUFDO0FBQ3hCLENBQUMsQ0FBQSIsImZpbGUiOiJzbWFydHN0cmluZy5kb21haW4uanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgXCJ0eXBpbmdzLWdsb2JhbFwiXG5pbXBvcnQgcGx1Z2lucyA9IHJlcXVpcmUoXCIuL3NtYXJ0c3RyaW5nLnBsdWdpbnNcIik7XG5cbmV4cG9ydCBjbGFzcyBEb21haW4ge1xuICAgIGZ1bGxOYW1lOnN0cmluZztcbiAgICBsZXZlbDE6c3RyaW5nO1xuICAgIGxldmVsMjpzdHJpbmc7XG4gICAgbGV2ZWwzOnN0cmluZztcbiAgICBsZXZlbDQ6c3RyaW5nO1xuICAgIGxldmVsNTpzdHJpbmc7XG4gICAgcHJvdG9jb2w6c3RyaW5nO1xuICAgIHpvbmVOYW1lOnN0cmluZztcbiAgICAvL2FsaWFzZXNcbiAgICB0b3BMZXZlbDpzdHJpbmc7XG4gICAgZG9tYWluTmFtZTtcbiAgICBzdWJEb21haW47XG4gICAgY29uc3RydWN0b3IoZG9tYWluU3RyaW5nQXJnOnN0cmluZyl7XG4gICAgICAgIHRoaXMuZnVsbE5hbWUgPSBkb21haW5TdHJpbmdBcmc7XG4gICAgICAgIGxldCByZWdleE1hdGNoZXMgPSBkb21haW5SZWdleChkb21haW5TdHJpbmdBcmcpO1xuICAgICAgICB0aGlzLmxldmVsMSA9IHJlZ2V4TWF0Y2hlc1swXTtcbiAgICAgICAgdGhpcy5sZXZlbDIgPSByZWdleE1hdGNoZXNbMV07XG4gICAgICAgIHRoaXMubGV2ZWwzID0gcmVnZXhNYXRjaGVzWzJdO1xuICAgICAgICB0aGlzLmxldmVsNCA9IHJlZ2V4TWF0Y2hlc1szXTtcbiAgICAgICAgdGhpcy5sZXZlbDUgPSByZWdleE1hdGNoZXNbNF07XG4gICAgICAgIHRoaXMucHJvdG9jb2wgPSBwcm90b2NvbFJlZ2V4KGRvbWFpblN0cmluZ0FyZylbMV07XG4gICAgICAgIHRoaXMuem9uZU5hbWUgPSB0aGlzLmxldmVsMiArIFwiLlwiICsgdGhpcy5sZXZlbDE7IFxuICAgICAgICBcbiAgICAgICAgLy8gYWxpYXNlc1xuICAgICAgICB0aGlzLnRvcExldmVsID0gdGhpcy5sZXZlbDE7XG4gICAgICAgIHRoaXMuZG9tYWluTmFtZSA9IHRoaXMubGV2ZWwyO1xuICAgICAgICB0aGlzLnN1YkRvbWFpbiA9IHRoaXMubGV2ZWwzO1xuICAgIH1cbn1cblxuXG5sZXQgZG9tYWluUmVnZXggPSBmdW5jdGlvbihzdHJpbmdBcmc6c3RyaW5nKXtcbiAgICBsZXQgcmVnZXhTdHJpbmcgPSAvKFthLXpBLVowLTldKilcXC57MCwxfShbYS16QS1aMC05XSopXFwuezAsMX0oW2EtekEtWjAtOV0qKVxcLnswLDF9KFthLXpBLVowLTldKilcXC57MCwxfShbYS16QS1aMC05XSopXFwuezAsMX0kLztcbiAgICBsZXQgcmVnZXhNYXRjaGVzID0gcmVnZXhTdHJpbmcuZXhlYyhzdHJpbmdBcmcpO1xuICAgIHJlZ2V4TWF0Y2hlcy5yZXZlcnNlKCk7XG4gICAgbGV0IHJlZ2V4TWF0Y2hlc0ZpbHRlcmVkID0gcmVnZXhNYXRjaGVzLmZpbHRlcihmdW5jdGlvbihzdHJpbmdBcmc6c3RyaW5nKXtcbiAgICAgICAgcmV0dXJuKHN0cmluZ0FyZyAhPSBcIlwiKTtcbiAgICB9KTtcbiAgICByZXR1cm4gcmVnZXhNYXRjaGVzRmlsdGVyZWQ7XG59O1xuXG5sZXQgcHJvdG9jb2xSZWdleCA9IGZ1bmN0aW9uKHN0cmluZ0FyZzpzdHJpbmcpe1xuICAgIGxldCByZWdleFN0cmluZyA9IC9eKFthLXpBLVowLTldKik6XFwvXFwvLztcbiAgICBsZXQgcmVnZXhNYXRjaGVzID0gcmVnZXhTdHJpbmcuZXhlYyhzdHJpbmdBcmcpO1xuICAgIGNvbnNvbGUubG9nKHJlZ2V4TWF0Y2hlcyk7XG4gICAgcmV0dXJuIHJlZ2V4TWF0Y2hlcztcbn0iXX0= +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNtYXJ0c3RyaW5nLmRvbWFpbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFDUCxDQUFDLENBRHNCO0FBR3ZCO0lBYUksZ0JBQVksZUFBc0I7UUFDOUIsSUFBSSxDQUFDLFFBQVEsR0FBRyxlQUFlLENBQUM7UUFDaEMsSUFBSSxZQUFZLEdBQUcsV0FBVyxDQUFDLGVBQWUsQ0FBQyxDQUFDO1FBQ2hELEdBQUcsQ0FBQSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFDLENBQUM7WUFDeEIsRUFBRSxDQUFBLENBQUMsWUFBWSxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQ3JCLElBQUksQ0FBQyxPQUFPLEdBQUcsQ0FBQyxDQUFDLFFBQVEsRUFBRSxDQUFDLEdBQUcsWUFBWSxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQTtZQUN0RCxDQUFDO1lBQUMsSUFBSSxDQUFDLENBQUM7Z0JBQ0osSUFBSSxDQUFDLE9BQU8sR0FBRyxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUMsR0FBRyxTQUFTLENBQUM7WUFDN0MsQ0FBQztZQUFBLENBQUM7UUFDTixDQUFDO1FBQUEsQ0FBQztRQUNGLElBQUksQ0FBQyxRQUFRLEdBQUcsYUFBYSxDQUFDLGVBQWUsQ0FBQyxDQUFDO1FBQy9DLElBQUksQ0FBQyxRQUFRLEdBQUcsSUFBSSxDQUFDLE1BQU0sR0FBRyxHQUFHLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQztRQUVoRCxVQUFVO1FBQ1YsSUFBSSxDQUFDLFFBQVEsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDO1FBQzVCLElBQUksQ0FBQyxVQUFVLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQztRQUM5QixJQUFJLENBQUMsU0FBUyxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUM7SUFDakMsQ0FBQztJQUNMLGFBQUM7QUFBRCxDQS9CQSxBQStCQyxJQUFBO0FBL0JZLGNBQU0sU0ErQmxCLENBQUE7QUFHRCxJQUFJLFdBQVcsR0FBRyxVQUFTLFNBQWdCO0lBQ3ZDLElBQUksV0FBVyxHQUFHLDRHQUE0RyxDQUFDO0lBQy9ILElBQUksWUFBWSxHQUFHLFdBQVcsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDL0MsWUFBWSxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUMsMkVBQTJFO0lBQ25HLFlBQVksQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDLG1HQUFtRztJQUN2SCxJQUFJLG9CQUFvQixHQUFHLFlBQVksQ0FBQyxNQUFNLENBQUMsVUFBUyxTQUFnQjtRQUNwRSxNQUFNLENBQUEsQ0FBQyxTQUFTLElBQUksRUFBRSxDQUFDLENBQUM7SUFDNUIsQ0FBQyxDQUFDLENBQUM7SUFDSCxNQUFNLENBQUMsb0JBQW9CLENBQUM7QUFDaEMsQ0FBQyxDQUFDO0FBRUYsSUFBSSxhQUFhLEdBQUcsVUFBUyxTQUFnQjtJQUN6QyxJQUFJLFdBQVcsR0FBRyxzQkFBc0IsQ0FBQztJQUN6QyxJQUFJLFlBQVksR0FBRyxXQUFXLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQy9DLEVBQUUsQ0FBQSxDQUFDLFlBQVksQ0FBQyxDQUFBLENBQUM7UUFDYixNQUFNLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQzNCLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNKLE1BQU0sQ0FBQyxTQUFTLENBQUM7SUFDckIsQ0FBQztBQUNMLENBQUMsQ0FBQSIsImZpbGUiOiJzbWFydHN0cmluZy5kb21haW4uanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgXCJ0eXBpbmdzLWdsb2JhbFwiXG5pbXBvcnQgcGx1Z2lucyA9IHJlcXVpcmUoXCIuL3NtYXJ0c3RyaW5nLnBsdWdpbnNcIik7XG5cbmV4cG9ydCBjbGFzcyBEb21haW4ge1xuICAgIGZ1bGxOYW1lOnN0cmluZztcbiAgICBsZXZlbDE6c3RyaW5nO1xuICAgIGxldmVsMjpzdHJpbmc7XG4gICAgbGV2ZWwzOnN0cmluZztcbiAgICBsZXZlbDQ6c3RyaW5nO1xuICAgIGxldmVsNTpzdHJpbmc7XG4gICAgcHJvdG9jb2w6c3RyaW5nO1xuICAgIHpvbmVOYW1lOnN0cmluZztcbiAgICAvL2FsaWFzZXNcbiAgICB0b3BMZXZlbDpzdHJpbmc7XG4gICAgZG9tYWluTmFtZTtcbiAgICBzdWJEb21haW47XG4gICAgY29uc3RydWN0b3IoZG9tYWluU3RyaW5nQXJnOnN0cmluZyl7XG4gICAgICAgIHRoaXMuZnVsbE5hbWUgPSBkb21haW5TdHJpbmdBcmc7XG4gICAgICAgIGxldCByZWdleE1hdGNoZXMgPSBkb21haW5SZWdleChkb21haW5TdHJpbmdBcmcpO1xuICAgICAgICBmb3IobGV0IGkgPSAxOyBpIDw9IDU7IGkrKyl7XG4gICAgICAgICAgICBpZihyZWdleE1hdGNoZXNbaSAtIDFdKSB7XG4gICAgICAgICAgICAgICAgdGhpc1tcImxldmVsXCIgKyBpLnRvU3RyaW5nKCldID0gcmVnZXhNYXRjaGVzW2kgLSAxXVxuICAgICAgICAgICAgfSBlbHNlIHtcbiAgICAgICAgICAgICAgICB0aGlzW1wibGV2ZWxcIiArIGkudG9TdHJpbmcoKV0gPSB1bmRlZmluZWQ7XG4gICAgICAgICAgICB9O1xuICAgICAgICB9O1xuICAgICAgICB0aGlzLnByb3RvY29sID0gcHJvdG9jb2xSZWdleChkb21haW5TdHJpbmdBcmcpO1xuICAgICAgICB0aGlzLnpvbmVOYW1lID0gdGhpcy5sZXZlbDIgKyBcIi5cIiArIHRoaXMubGV2ZWwxOyBcbiAgICAgICAgXG4gICAgICAgIC8vIGFsaWFzZXNcbiAgICAgICAgdGhpcy50b3BMZXZlbCA9IHRoaXMubGV2ZWwxO1xuICAgICAgICB0aGlzLmRvbWFpbk5hbWUgPSB0aGlzLmxldmVsMjtcbiAgICAgICAgdGhpcy5zdWJEb21haW4gPSB0aGlzLmxldmVsMztcbiAgICB9XG59XG5cblxubGV0IGRvbWFpblJlZ2V4ID0gZnVuY3Rpb24oc3RyaW5nQXJnOnN0cmluZyl7XG4gICAgbGV0IHJlZ2V4U3RyaW5nID0gLyhbYS16QS1aMC05XSopXFwuezAsMX0oW2EtekEtWjAtOV0qKVxcLnswLDF9KFthLXpBLVowLTldKilcXC57MCwxfShbYS16QS1aMC05XSopXFwuezAsMX0oW2EtekEtWjAtOV0qKVxcLnswLDF9JC87XG4gICAgbGV0IHJlZ2V4TWF0Y2hlcyA9IHJlZ2V4U3RyaW5nLmV4ZWMoc3RyaW5nQXJnKTtcbiAgICByZWdleE1hdGNoZXMucmV2ZXJzZSgpOyAvL21ha2Ugc3VyZSB3ZSBidWlsZCB0aGUgZG9tYWluIGZyb20gdG9wbGV2ZWwgdG8gc3ViZG9tYWluIChyZXZlcnNlZCBvcmRlcilcbiAgICByZWdleE1hdGNoZXMucG9wKCk7IC8vIHBvcCB0aGUgbGFzdCBlbGVtZW50LCB3aGljaCBpcywgc2luY2Ugd2UgcmV2ZXJzZWQgdGhlIEFycmF5LCB0aGUgZnVsbCBTdHJpbmcgb2YgbWF0Y2hlZCBlbGVtZW50c1xuICAgIGxldCByZWdleE1hdGNoZXNGaWx0ZXJlZCA9IHJlZ2V4TWF0Y2hlcy5maWx0ZXIoZnVuY3Rpb24oc3RyaW5nQXJnOnN0cmluZyl7XG4gICAgICAgIHJldHVybihzdHJpbmdBcmcgIT0gXCJcIik7XG4gICAgfSk7XG4gICAgcmV0dXJuIHJlZ2V4TWF0Y2hlc0ZpbHRlcmVkO1xufTtcblxubGV0IHByb3RvY29sUmVnZXggPSBmdW5jdGlvbihzdHJpbmdBcmc6c3RyaW5nKXtcbiAgICBsZXQgcmVnZXhTdHJpbmcgPSAvXihbYS16QS1aMC05XSopOlxcL1xcLy87XG4gICAgbGV0IHJlZ2V4TWF0Y2hlcyA9IHJlZ2V4U3RyaW5nLmV4ZWMoc3RyaW5nQXJnKTtcbiAgICBpZihyZWdleE1hdGNoZXMpe1xuICAgICAgICByZXR1cm4gcmVnZXhNYXRjaGVzWzFdO1xuICAgIH0gZWxzZSB7XG4gICAgICAgIHJldHVybiB1bmRlZmluZWQ7XG4gICAgfVxufSJdfQ== diff --git a/package.json b/package.json index d1adfde..1529c9a 100644 --- a/package.json +++ b/package.json @@ -22,12 +22,12 @@ }, "homepage": "https://gitlab.com/pushrocks/smartstring#readme", "devDependencies": { - "npmts": "^5.2.1", - "should": "^9.0.0", + "npmts-g": "^5.2.6", + "should": "^9.0.2", "typings-test": "^1.0.1" }, "dependencies": { - "beautylog": "^5.0.8", + "beautylog": "^5.0.12", "typings-global": "^1.0.3" } } diff --git a/test/test.js b/test/test.js index aa68324..68adb09 100644 --- a/test/test.js +++ b/test/test.js @@ -5,9 +5,11 @@ var should = require("should"); describe("smartstring", function () { describe(".Domain class", function () { var testDomain; + var testDomain2; it("should create a new Domain object", function () { testDomain = new smartstring.Domain("https://level3D.level2D.level1D"); testDomain.should.be.instanceof(smartstring.Domain); + console.log(testDomain); }); it("should have a .topLevel", function () { testDomain.topLevel.should.equal("level1D"); @@ -24,6 +26,10 @@ describe("smartstring", function () { it("should have the correct protocol", function () { testDomain.protocol.should.equal("https"); }); + it("testDomain2 should be a basic domain", function () { + testDomain2 = new smartstring.Domain("bleu.de"); + console.log(testDomain2); + }); }); describe(".Git class", function () { var testGit; @@ -76,4 +82,4 @@ describe("smartstring", function () { }); }); -//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["test.ts"],"names":[],"mappings":"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","file":"test.js","sourcesContent":["import \"typings-test\"\nimport * as smartstring from \"../dist/index\";\nlet should = require(\"should\");\n\ndescribe(\"smartstring\",function(){\n    describe(\".Domain class\",function(){\n        let testDomain:smartstring.Domain;\n        it(\"should create a new Domain object\",function(){\n            testDomain = new smartstring.Domain(\"https://level3D.level2D.level1D\");\n            testDomain.should.be.instanceof(smartstring.Domain);\n        });\n        it(\"should have a .topLevel\",function(){\n            testDomain.topLevel.should.equal(\"level1D\");\n        });\n        it(\"should have a .level2\",function(){\n            testDomain.level2.should.equal(\"level2D\");\n        });\n        it(\"should have a .level3\",function(){\n            testDomain.level3.should.equal(\"level3D\");\n        });\n        it(\"should have the correct dns zone name\",function(){\n            testDomain.zoneName.should.equal(\"level2D.level1D\");\n        })\n        it (\"should have the correct protocol\",function(){\n            testDomain.protocol.should.equal(\"https\");\n        })\n    })\n    describe(\".Git class\",function(){\n        let testGit:smartstring.GitRepo;\n        it(\"should create a new Git class GitRepo\",function(){\n            testGit = new smartstring.GitRepo(\"git+https://github.com/pushrocks/smartstring.git\");\n            testGit.should.be.instanceof(smartstring.GitRepo);\n        })\n        it(\"should return a .host\",function(){\n            testGit.host\n                .should.equal(\"github.com\");\n        });\n        it(\"should return a .user\",function(){\n            testGit.user\n                .should.equal(\"pushrocks\");\n        });\n        it(\"should return a .repo\",function(){\n            testGit.repo\n                .should.equal(\"smartstring\");\n        });\n        it(\"should return a .httpsUrl\",function(){\n            testGit.httpsUrl\n                .should.equal(\"https://github.com/pushrocks/smartstring.git\");\n        });\n        it(\"should return a .sshUrl\",function(){\n            testGit.sshUrl\n                .should.equal(\"git@github.com:pushrocks/smartstring.git\");\n        });\n    })\n    describe(\".docker\",function(){\n        describe(\".makeEnvObject\",function(){\n            it(\"should create a Env Object\",function(){\n                let envStringArray = [\"VIRTUAL_HOST=sub.domain.tld\",\"DEFAULT_HOST=some.domain.com\"];\n                let envObject = smartstring.docker.makeEnvObject(envStringArray);\n                envObject.VIRTUAL_HOST.should.equal(\"sub.domain.tld\");\n                envObject.DEFAULT_HOST.should.equal(\"some.domain.com\");\n            })\n        })\n    })\n    describe(\".typescript\",function(){\n        describe(\".referenceRegex\",function(){\n            it(\"should match reference paths\",function(){\n                smartstring.typescript.regexReferencePath.test(\"/// <reference path=\\\"\\\" />\")\n                    .should.be.true();\n                smartstring.typescript.regexReferencePath.test(\"/// <reference path='' />\")\n                    .should.be.true();\n                smartstring.typescript.regexReferencePath.test(\"/// <referencepath=\\\"\\\" />\")\n                    .should.be.false();\n            })\n        })\n    })\n});"]} +//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["test.ts"],"names":[],"mappings":"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","file":"test.js","sourcesContent":["import \"typings-test\"\nimport * as smartstring from \"../dist/index\";\nlet should = require(\"should\");\n\ndescribe(\"smartstring\",function(){\n    describe(\".Domain class\",function(){\n        let testDomain:smartstring.Domain;\n        let testDomain2:smartstring.Domain;\n        it(\"should create a new Domain object\",function(){\n            testDomain = new smartstring.Domain(\"https://level3D.level2D.level1D\");\n            testDomain.should.be.instanceof(smartstring.Domain);\n            console.log(testDomain);\n        });\n        it(\"should have a .topLevel\",function(){\n            testDomain.topLevel.should.equal(\"level1D\");\n        });\n        it(\"should have a .level2\",function(){\n            testDomain.level2.should.equal(\"level2D\");\n        });\n        it(\"should have a .level3\",function(){\n            testDomain.level3.should.equal(\"level3D\");\n        });\n        it(\"should have the correct dns zone name\",function(){\n            testDomain.zoneName.should.equal(\"level2D.level1D\");\n        })\n        it (\"should have the correct protocol\",function(){\n            testDomain.protocol.should.equal(\"https\");\n        })\n        it(\"testDomain2 should be a basic domain\",function(){\n            testDomain2 = new smartstring.Domain(\"bleu.de\");\n            console.log(testDomain2);\n        });\n    })\n    describe(\".Git class\",function(){\n        let testGit:smartstring.GitRepo;\n        it(\"should create a new Git class GitRepo\",function(){\n            testGit = new smartstring.GitRepo(\"git+https://github.com/pushrocks/smartstring.git\");\n            testGit.should.be.instanceof(smartstring.GitRepo);\n        })\n        it(\"should return a .host\",function(){\n            testGit.host\n                .should.equal(\"github.com\");\n        });\n        it(\"should return a .user\",function(){\n            testGit.user\n                .should.equal(\"pushrocks\");\n        });\n        it(\"should return a .repo\",function(){\n            testGit.repo\n                .should.equal(\"smartstring\");\n        });\n        it(\"should return a .httpsUrl\",function(){\n            testGit.httpsUrl\n                .should.equal(\"https://github.com/pushrocks/smartstring.git\");\n        });\n        it(\"should return a .sshUrl\",function(){\n            testGit.sshUrl\n                .should.equal(\"git@github.com:pushrocks/smartstring.git\");\n        });\n    })\n    describe(\".docker\",function(){\n        describe(\".makeEnvObject\",function(){\n            it(\"should create a Env Object\",function(){\n                let envStringArray = [\"VIRTUAL_HOST=sub.domain.tld\",\"DEFAULT_HOST=some.domain.com\"];\n                let envObject:any = smartstring.docker.makeEnvObject(envStringArray);\n                envObject.VIRTUAL_HOST.should.equal(\"sub.domain.tld\");\n                envObject.DEFAULT_HOST.should.equal(\"some.domain.com\");\n            })\n        })\n    })\n    describe(\".typescript\",function(){\n        describe(\".referenceRegex\",function(){\n            it(\"should match reference paths\",function(){\n                smartstring.typescript.regexReferencePath.test(\"/// <reference path=\\\"\\\" />\")\n                    .should.be.true();\n                smartstring.typescript.regexReferencePath.test(\"/// <reference path='' />\")\n                    .should.be.true();\n                smartstring.typescript.regexReferencePath.test(\"/// <referencepath=\\\"\\\" />\")\n                    .should.be.false();\n            })\n        })\n    })\n});"]} diff --git a/test/test.ts b/test/test.ts index c8880b2..fe5bcd1 100644 --- a/test/test.ts +++ b/test/test.ts @@ -5,9 +5,11 @@ let should = require("should"); describe("smartstring",function(){ describe(".Domain class",function(){ let testDomain:smartstring.Domain; + let testDomain2:smartstring.Domain; it("should create a new Domain object",function(){ testDomain = new smartstring.Domain("https://level3D.level2D.level1D"); testDomain.should.be.instanceof(smartstring.Domain); + console.log(testDomain); }); it("should have a .topLevel",function(){ testDomain.topLevel.should.equal("level1D"); @@ -24,6 +26,10 @@ describe("smartstring",function(){ it ("should have the correct protocol",function(){ testDomain.protocol.should.equal("https"); }) + it("testDomain2 should be a basic domain",function(){ + testDomain2 = new smartstring.Domain("bleu.de"); + console.log(testDomain2); + }); }) describe(".Git class",function(){ let testGit:smartstring.GitRepo; @@ -56,7 +62,7 @@ describe("smartstring",function(){ describe(".makeEnvObject",function(){ it("should create a Env Object",function(){ let envStringArray = ["VIRTUAL_HOST=sub.domain.tld","DEFAULT_HOST=some.domain.com"]; - let envObject = smartstring.docker.makeEnvObject(envStringArray); + let envObject:any = smartstring.docker.makeEnvObject(envStringArray); envObject.VIRTUAL_HOST.should.equal("sub.domain.tld"); envObject.DEFAULT_HOST.should.equal("some.domain.com"); }) diff --git a/ts/smartstring.domain.ts b/ts/smartstring.domain.ts index 6c2d13c..3638091 100644 --- a/ts/smartstring.domain.ts +++ b/ts/smartstring.domain.ts @@ -17,12 +17,14 @@ export class Domain { constructor(domainStringArg:string){ this.fullName = domainStringArg; let regexMatches = domainRegex(domainStringArg); - this.level1 = regexMatches[0]; - this.level2 = regexMatches[1]; - this.level3 = regexMatches[2]; - this.level4 = regexMatches[3]; - this.level5 = regexMatches[4]; - this.protocol = protocolRegex(domainStringArg)[1]; + for(let i = 1; i <= 5; i++){ + if(regexMatches[i - 1]) { + this["level" + i.toString()] = regexMatches[i - 1] + } else { + this["level" + i.toString()] = undefined; + }; + }; + this.protocol = protocolRegex(domainStringArg); this.zoneName = this.level2 + "." + this.level1; // aliases @@ -36,7 +38,8 @@ export class Domain { let domainRegex = function(stringArg:string){ let regexString = /([a-zA-Z0-9]*)\.{0,1}([a-zA-Z0-9]*)\.{0,1}([a-zA-Z0-9]*)\.{0,1}([a-zA-Z0-9]*)\.{0,1}([a-zA-Z0-9]*)\.{0,1}$/; let regexMatches = regexString.exec(stringArg); - regexMatches.reverse(); + regexMatches.reverse(); //make sure we build the domain from toplevel to subdomain (reversed order) + regexMatches.pop(); // pop the last element, which is, since we reversed the Array, the full String of matched elements let regexMatchesFiltered = regexMatches.filter(function(stringArg:string){ return(stringArg != ""); }); @@ -46,6 +49,9 @@ let domainRegex = function(stringArg:string){ let protocolRegex = function(stringArg:string){ let regexString = /^([a-zA-Z0-9]*):\/\//; let regexMatches = regexString.exec(stringArg); - console.log(regexMatches); - return regexMatches; + if(regexMatches){ + return regexMatches[1]; + } else { + return undefined; + } } \ No newline at end of file