Skip to content

Commit

Permalink
Merge pull request #3 from lpinca/fix/deprecation-warning
Browse files Browse the repository at this point in the history 
Suppress a deprecation warning
  • Loading branch information
@3rd-Eden
3rd-Eden committed Nov 22, 2014
2 parents c049fa7 + 5b2179a commit 038a831
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 24 deletions.
26 changes: 10 additions & 16 deletions docs/README.md
View file
Expand Up @@ -112,35 +112,29 @@ Object.defineProperty(Route.prototype, 'url', {
---------------------------------------
### routable.compile
<p>: '\/+';</p>
<pre><code> if (named) {
<p>: &#39;\/+&#39;;</p><pre><code> if (named) {
//
// Previously was gratuitous, but better to just be standard
// self.pattern += '([a-zA-Z0-9-_~%!;@=+\\$\\*\\.]+)';
// self.pattern += &#39;([a-zA-Z0-9-_~%!;@=+\\$\\*\\.]+)&#39;;
//
// See RFC3986, or this handy table:
// <a href='http://en.wikipedia.org/wiki/Percent-encoding#Types_of_URI_characters'>http://en.wikipedia.org/wiki/Percent-encoding#Types_of_URI_characters</a>
// http://en.wikipedia.org/wiki/Percent-encoding#Types_of_URI_characters
//
self.pattern += '([a-zA-Z0-9-_~\\.%]+)';
self.pattern += &#39;([a-zA-Z0-9-_~\\.%]+)&#39;;
self.params.push(fragment.slice(1, optional ? -1 : undefined));
} else {
self.pattern += fragment;
}
if (optional) self.pattern += '?';
if (optional) self.pattern += &#39;?&#39;;
});
if (this.pattern === '^') this.pattern += '\\/';
this.pattern += '$';
if (this.pattern === &#39;^&#39;) this.pattern += &#39;\\/&#39;;
this.pattern += &#39;$&#39;;
return this.compile();
}
</code></pre>

<p>});</p>

<p>/**<br />Compile our dis-assembled source to a new xRegExp instance.</p>
</code></pre><p>});</p><p>/**<br />Compile our dis-assembled source to a new xRegExp instance.</p>
Expand Down Expand Up @@ -173,7 +167,7 @@ Route.prototype.test = function test(uri) {
---------------------------------------
### routable.exec(req _Object_)
<p>Whether or not the route matches the given request's URL.</p>
<p>Whether or not the route matches the given request&#39;s URL.</p>
#### Arguments
Expand Down Expand Up @@ -264,7 +258,7 @@ Route.prototype.toString = function toString() {
return str;
};
Route.extend = require('extendable');
Route.extend = require('extendible');
```
---------------------------------------
Expand Down
12 changes: 6 additions & 6 deletions docs/api.json
View file
Expand Up @@ -86,9 +86,9 @@
}
],
"description": {
"full": "<p>: '\\/+';</p>\n\n<pre><code> if (named) {\n //\n // Previously was gratuitous, but better to just be standard\n // self.pattern += '([a-zA-Z0-9-_~%!;@=+\\\\$\\\\*\\\\.]+)';\n //\n // See RFC3986, or this handy table:\n // <a href='http://en.wikipedia.org/wiki/Percent-encoding#Types_of_URI_characters'>http://en.wikipedia.org/wiki/Percent-encoding#Types_of_URI_characters</a>\n //\n self.pattern += '([a-zA-Z0-9-_~\\\\.%]+)';\n self.params.push(fragment.slice(1, optional ? -1 : undefined));\n } else {\n self.pattern += fragment;\n }\n\n if (optional) self.pattern += '?';\n });\n\n if (this.pattern === '^') this.pattern += '\\\\/';\n this.pattern += '$';\n\n return this.compile();\n}\n</code></pre>\n\n<p>});</p>\n\n<p>/**<br />Compile our dis-assembled source to a new xRegExp instance.</p>",
"summary": "<p>: '\\/+';</p>",
"body": "<pre><code> if (named) {\n //\n // Previously was gratuitous, but better to just be standard\n // self.pattern += '([a-zA-Z0-9-_~%!;@=+\\\\$\\\\*\\\\.]+)';\n //\n // See RFC3986, or this handy table:\n // <a href='http://en.wikipedia.org/wiki/Percent-encoding#Types_of_URI_characters'>http://en.wikipedia.org/wiki/Percent-encoding#Types_of_URI_characters</a>\n //\n self.pattern += '([a-zA-Z0-9-_~\\\\.%]+)';\n self.params.push(fragment.slice(1, optional ? -1 : undefined));\n } else {\n self.pattern += fragment;\n }\n\n if (optional) self.pattern += '?';\n });\n\n if (this.pattern === '^') this.pattern += '\\\\/';\n this.pattern += '$';\n\n return this.compile();\n}\n</code></pre>\n\n<p>});</p>\n\n<p>/**<br />Compile our dis-assembled source to a new xRegExp instance.</p>"
"full": "<p>: &#39;\\/+&#39;;</p><pre><code> if (named) {\n //\n // Previously was gratuitous, but better to just be standard\n // self.pattern += &#39;([a-zA-Z0-9-_~%!;@=+\\\\$\\\\*\\\\.]+)&#39;;\n //\n // See RFC3986, or this handy table:\n // http://en.wikipedia.org/wiki/Percent-encoding#Types_of_URI_characters\n //\n self.pattern += &#39;([a-zA-Z0-9-_~\\\\.%]+)&#39;;\n self.params.push(fragment.slice(1, optional ? -1 : undefined));\n } else {\n self.pattern += fragment;\n }\n\n if (optional) self.pattern += &#39;?&#39;;\n });\n\n if (this.pattern === &#39;^&#39;) this.pattern += &#39;\\\\/&#39;;\n this.pattern += &#39;$&#39;;\n\n return this.compile();\n}\n</code></pre><p>});</p><p>/**<br />Compile our dis-assembled source to a new xRegExp instance.</p>",
"summary": "<p>: &#39;\\/+&#39;;</p>",
"body": "<pre><code> if (named) {\n //\n // Previously was gratuitous, but better to just be standard\n // self.pattern += &#39;([a-zA-Z0-9-_~%!;@=+\\\\$\\\\*\\\\.]+)&#39;;\n //\n // See RFC3986, or this handy table:\n // http://en.wikipedia.org/wiki/Percent-encoding#Types_of_URI_characters\n //\n self.pattern += &#39;([a-zA-Z0-9-_~\\\\.%]+)&#39;;\n self.params.push(fragment.slice(1, optional ? -1 : undefined));\n } else {\n self.pattern += fragment;\n }\n\n if (optional) self.pattern += &#39;?&#39;;\n });\n\n if (this.pattern === &#39;^&#39;) this.pattern += &#39;\\\\/&#39;;\n this.pattern += &#39;$&#39;;\n\n return this.compile();\n}\n</code></pre><p>});</p><p>/**<br />Compile our dis-assembled source to a new xRegExp instance.</p>"
},
"isPrivate": true,
"ignore": false,
Expand Down Expand Up @@ -166,8 +166,8 @@
}
],
"description": {
"full": "<p>Whether or not the route matches the given request's URL.</p>",
"summary": "<p>Whether or not the route matches the given request's URL.</p>",
"full": "<p>Whether or not the route matches the given request&#39;s URL.</p>",
"summary": "<p>Whether or not the route matches the given request&#39;s URL.</p>",
"body": ""
},
"isPrivate": false,
Expand Down Expand Up @@ -241,7 +241,7 @@
},
"isPrivate": true,
"ignore": false,
"code": "Route.prototype.toString = function toString() {\n var str = this.url.toString()\n , opts = [];\n\n if (this.version) opts.push('version=' + this.version);\n if (opts.length) str += ' (' + opts.join(', ') + ')';\n\n return str;\n};\n\nRoute.extend = require('extendable');",
"code": "Route.prototype.toString = function toString() {\n var str = this.url.toString()\n , opts = [];\n\n if (this.version) opts.push('version=' + this.version);\n if (opts.length) str += ' (' + opts.join(', ') + ')';\n\n return str;\n};\n\nRoute.extend = require('extendible');",
"ctx": {
"type": "method",
"constructor": "Route",
Expand Down
2 changes: 1 addition & 1 deletion index.js
View file
Expand Up @@ -218,4 +218,4 @@ Route.prototype.toString = function toString() {
return str;
};

Route.extend = require('extendable');
Route.extend = require('extendible');
2 changes: 1 addition & 1 deletion package.json
View file
Expand Up @@ -20,7 +20,7 @@
"author": "Arnout Kazemier",
"license": "MIT",
"dependencies": {
"extendable": "0.0.x",
"extendible": "0.1.x",
"xregexp": "2.0.x"
},
"devDependencies": {
Expand Down

0 comments on commit 038a831

Please sign in to comment.