Permalink
Browse files

complete overhaul

  • Loading branch information...
1 parent 3db9153 commit 0dd88f185580ae5cc23788f725d3ae3d7d08ff5a cloudhead committed Jan 22, 2010
Showing with 714 additions and 366 deletions.
  1. +179 −0 LICENSE
  2. 0 README.md
  3. +7 −0 benchmark/benchmark.js
  4. +0 −173 journey.js
  5. +339 −0 lib/journey.js
  6. +0 −92 proto.js
  7. +0 −101 test.js
  8. +189 −0 test/journey-test.js
View
179 LICENSE
@@ -0,0 +1,179 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+Copyright (c) 2009 Alexis Sellier
View
No changes.
View
@@ -0,0 +1,7 @@
+var journey = require('./journey');
+
+journey.begin({});
+journey.router.draw(function (map) {
+
+ map.route('GET', '/').to(function (res) {res.json("hello world")});
+})
View
@@ -1,173 +0,0 @@
-var sys = require("sys"),
- http = require("http"),
- posix = require("posix");
-
-var proto = posix.cat('./proto.js').wait();
-process.compile(proto, "proto");
-
-var journey = exports;
-
-journey.env = 'development';
-
-journey.router = {
- routes: [],
-
- draw: function (map) {
- return map(this.map);
- },
-
- map: {
- route: function (from) {
- return {
- to: function (to) {
- return journey.router.routes.push({ from: from, to: to })
- }
- };
- },
- trail: function (from, to) {
-
- }
- },
-
- find: function (request) {
- var matchers = {
- //
- // Match Method
- //
- method: function (method) {
- return method.is(Array) ? method.include(request.method)
- : method == request.method;
- },
- //
- // Match Pattern
- //
- pattern: function (pattern) {
- var pattern = pattern.is(Array) ? pattern : [pattern];
- for (var i = 0, match; i < pattern.length; i++) {
- if (match = request.uri.path.substr(1).match(pattern[i])) { return match }
- }
- return false;
- },
- //
- // Match Payload
- //
- payload: function (payload) {
- if (payload == undefined) return true;
- else return Boolean(request.body) === payload;
- }
- };
-
- return this.routes.find(function (route) {
- var from = route.from,
- to = route.to, match;
-
- var match = matchers.all(function (name, fn) {
- if (from.include(name)) {
- return fn(from[name]);
- } else {
- return true;
- }
- });
-
- if (match) {
- var sub = function (obj) { return obj.is(String) ? obj : match[obj] };
- return {
- request: request,
- success: 200,
- }.merge({
- resource: to.resource ? sub(to.resource) : null,
- query: to.query ? sub(to.query) : null,
- key: to.key ? sub(to.key) : null
- });
- }
- return false;
- });
- },
-
- dispatch: function (request, doc, resources, callback) {
- var found = this.find(request);
- var route = Object.create(this.Route(found.request, found.response, resources));
-
- sys.puts(sys.inspect(route));
-
- if (found) return callback(route.go(found, doc));
- else return callback({ code: 400, body: "request not found" });
- },
-
- Route: function (req, res, resources) {
- return {
- request: req,
- response: res,
- resources: resources,
-
- go: function (destination, doc) {
- if (resources.hasOwnProperty(destination.resource)) {
- try {
- var response = resources[destination.resource]
- [destination.query]
- (destination.key, doc) || {};
- return { body: response.body || "", code: response.code || 200 };
- } catch (err) {
- process.stdio.writeError(err + "\n");
- return { body: err, code: 500 };
- }
- } else return { code: 404, body: "resource not found" };
- }
- }
- }
-};
-
-journey.begin = function (resources, port) {
- if (typeof resources === 'object') {
- this.resources = resources;
- return this.server.listen(port || 8080);
- } else {
- throw "couldn't read `resources`";
- }
-};
-
-journey.end = function (code, msg) {
- if (msg) { process.stdio.write(msg) }
- this.server.close();
- return process.exit(code || 0);
-};
-
-journey.server = {
- instance: null,
-
- listen: function (port) {
- this.instance = http.createServer(function (request, response) {
- var body = "";
- request.addListener('body', function (chunk) { body += chunk });
- request.addListener('complete', this.handler(request, response, body));
- }).listen(port);
- sys.puts("Journey running on 127.0.0.1:" + port);
- return this.instance;
- },
-
- close: function () { return this.instance ? this.instance.close() : false },
-
- handler: function (request, response, body) {
- return journey.router.dispatch(request, body, journey.resources, function (outcome) {
- sys.puts(sys.inspect(outcome));
- var code = (request.headers.accept == "application/json") ? outcome.code : 400;
-
- response.sendHeader(code, {"Content-Type" : "text/html"});
-
- if (outcome.code >= 400) {
- if (journey.ENV == 'development') {
- response.sendBody(outcome.body);
- }
- } else {
- response.sendBody(outcome.body);
- }
-
- response.finish();
-
- sys.puts((new Date).toGMTString() + " -- " + request.method + " " + request.uri.full + " - HTTP " + code);
- return response;
- });
- }
-};
-
-
Oops, something went wrong.

0 comments on commit 0dd88f1

Please sign in to comment.