using relative references where possible and updating package.json

cloudwork · Aug 18, 2011 · b468cd8 · b468cd8
1 parent b32d061
commit b468cd8
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 27 deletions.
diff --git a/facet/jsgi.js b/facet/jsgi.js
@@ -5,6 +5,7 @@
 var Facet = require("perstore/facet").Facet,
 	directApp = require("../pintura").directApp,
 	defer = require("promised-io/promise").defer,
+	// FIXME: what is this module?
 	namedFacets = require("../facet-resolver").namedFacets;
 
 namedFacets["application/jsgi"] = exports.JsgiFacet = Facet(Object, function(store){

diff --git a/jsgi/auth.js b/jsgi/auth.js
@@ -2,7 +2,7 @@
  * This middleware module provides authentication
  */
 var AccessError = require("perstore/errors").AccessError,
-	Response = require("../jsgi/response").Response,
+	Response = require("./response").Response,
 	DatabaseError = require("perstore/errors").DatabaseError,
 	promiseModule = require("promised-io/promise"),
 	when = promiseModule.when,

diff --git a/package.json b/package.json
@@ -3,6 +3,7 @@
   "version": "0.2.6",
   "author": "Kris Zyp",
   "email": "kriszyp@gmail.com",
+  "description": "JSGI-based RESTful JSON/JavaScript server",
   "contributors": ["Vladimir Dronnikov <dronnikov@gmail.com>"],
   "keywords": [
     "rest",
@@ -57,18 +58,19 @@
     "url":"http://github.com/kriszyp/tunguska"
   },
   "directories": {
-    "lib": "./lib"
+    "lib": "."
   },
   "dependencies":{
-    "tunguska": ">=0.2.4",
-    "rql": ">=0.2.2",
-    "patr": ">=0.2.6",
+    "tunguska": ">0.2.4",
+    "rql": ">0.2.2",
     "websocket-server": ">=1.4.01",
-    "perstore": ">=0.2.4",
-    "promised-io": ">=0.2.3",
-    "commonjs-utils": ">=0.2.2",
-    "mongodb": "*",
-    "multi-node": ">=0.2.3",
-    "jsgi-node": ">=0.2.5"
+    "perstore": ">0.2.4",
+    "promised-io": ">0.2.3",
+    "commonjs-utils": ">0.2.2",
+    "multi-node": ">0.2.3",
+    "jsgi-node": ">0.2.5"
+  },
+  "devDependencies": {
+    "patr": ">0.2.6"
   }
 }
diff --git a/tests/jsgi/csrf.js b/tests/jsgi/csrf.js
@@ -1,4 +1,4 @@
-var CSRFDetect = require("jsgi/csrf").CSRFDetect, 
+var CSRFDetect = require("../../jsgi/csrf").CSRFDetect, 
 	assert = require("assert"),
 	print = require("promised-io/process").print;
 

diff --git a/tests/stack.js b/tests/stack.js
@@ -15,36 +15,36 @@ var emptyApp = function(){
 		body:[]
 	} 
 };
-var lowerAppMock = new MockRequest(require("jsgi/context").SetContext({},
+var lowerAppMock = new MockRequest(require("../jsgi/context").SetContext({},
 			// We detect if the request could have been forged from another site
-			require("jsgi/csrf").CSRFDetect(emptyApp)));
+			require("../jsgi/csrf").CSRFDetect(emptyApp)));
 				// Support handling various cross-site request mechanisms like JSONP, window.name, CS-XHR
-var lowerApp2Mock = new MockRequest(require("jsgi/xsite").CrossSite(
+var lowerApp2Mock = new MockRequest(require("../jsgi/xsite").CrossSite(
 					// Handle header emulation through query parameters (useful for cross-site and links)
-					require("jsgi/http-params").HttpParams(emptyApp)));
+					require("../jsgi/http-params").HttpParams(emptyApp)));
 						// Handle HEAD requests
-var lowerApp3Mock = new MockRequest(require("jsgi/head").Head(
+var lowerApp3Mock = new MockRequest(require("../jsgi/head").Head(
 							// Add some useful headers
-							require("jsgi/pintura-headers").PinturaHeaders(config.serverName,
+							require("../jsgi/pintura-headers").PinturaHeaders(config.serverName,
 								// Handle conditional requests
-								require("jsgi/conditional").Conditional(true,emptyApp
+								require("../jsgi/conditional").Conditional(true,emptyApp
 								))));
-var middleAppMock = new MockRequest(require("jsgi/media").Serialize(config.mediaSelector,
+var middleAppMock = new MockRequest(require("../jsgi/media").Serialize(config.mediaSelector,
 										// Handle errors that are thrown, converting to appropriate status codes
-										require("jsgi/error").ErrorHandler(
+										require("../jsgi/error").ErrorHandler(
 											//	Handle transactions
 											require("perstore/jsgi/transactional").Transactional(
 												// Handle sessions
-												require("jsgi/session").Session({},
+												require("../jsgi/session").Session({},
 													// Do authentication
-													require("jsgi/auth").Authentication(config.security, emptyApp))))));
-var upperAppMock = new MockRequest(require("jsgi/media").Deserialize(config.mediaSelector,
+													require("../jsgi/auth").Authentication(config.security, emptyApp))))));
+var upperAppMock = new MockRequest(require("../jsgi/media").Deserialize(config.mediaSelector,
 															// Non-REST custom handlers
-															require('jsgi/routes').Routes(config.customRoutes,
+															require('../jsgi/routes').Routes(config.customRoutes,
 																// Add and retrieve metadata from objects
-																exports.directApp = require("jsgi/metadata").Metadata(
+																exports.directApp = require("../jsgi/metadata").Metadata(
 																	// Final REST handler
-																	require("jsgi/rest-store").RestStore(config)))));
+																	require("../jsgi/rest-store").RestStore(config)))));
 var emptyMock = new MockRequest(emptyApp);
 config.getDataModel = function(){
 	return {