Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Package fix #20

Merged
merged 7 commits into from

2 participants

@neonstalwart

this should be close to getting the wiki working. version numbers still need adjusting as the dependencies are tagged.

@neonstalwart

i'm wondering if media handlers should be broken out into separate repos. some of them have some specific dependencies that might not generally apply.

@kriszyp kriszyp merged commit b468cd8 into persvr:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
View
1  .gitignore
@@ -0,0 +1 @@
+node_modules
View
1  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){
View
2  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,
View
22 package.json
@@ -1,8 +1,9 @@
{
"name": "pintura",
- "version": "0.2.4",
+ "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,16 +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": "*"
+ "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"
}
}
View
2  start-node.js
@@ -1,6 +1,6 @@
// helpful for debugging
var settings = require("commonjs-utils/settings"),
- ws = require("node-websocket-server"),
+ ws = require("websocket-server"),
messageJson = require("./media/message/json"),
multiNode = require("multi-node");
View
2  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;
View
30 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 {
Something went wrong with that request. Please try again.