update tests, add multipart/form-data processing support

Author: itsmattking

Gruntfile.js

@@ -1,4 +1,5 @@
 var sys = require('sys');
+var path = require('path');
 module.exports = function(grunt) {
 	grunt.initConfig({
 		pkg: grunt.file.readJSON('package.json'),
@@ -106,89 +107,24 @@ module.exports = function(grunt) {
 				src: ['src/**/*.js']
 			}
 		},
-		connect: {
-			server: {
+		express: {
+			testServer: { 
 				options: {
-					port: 8000,
-					base: './test',
-					middleware: function(connect, options, middlewares) {
-						middlewares.push(function(req, res, next) {
-							if (req.url === '/data/test-json' && req.method === 'GET') {
-								res.setHeader('Content-Type', 'application/json');
-								res.end(JSON.stringify({abc: 123}));
-								return true;
-							} else {
-								return next();
-							}
-						});
-						middlewares.push(function(req, res, next) {
-							if (req.url === '/data/test-bad-json' && req.method === 'GET') {
-								res.setHeader('Content-Type', 'application/json');
-								res.end('lllll');
-								return true;
-							} else {
-								return next();
-							}
-						});
-						middlewares.push(function(req, res, next) {
-							if (req.url === '/data/test-empty-json' && req.method === 'GET') {
-								res.setHeader('Content-Type', 'application/json');
-								res.end('');
-								return true;
-							} else {
-								return next();
-							}
-						});
-						middlewares.push(function(req, res, next) {
-							if (req.url === '/test-post' && req.method === 'POST') {
-								res.setHeader('Content-Type', 'application/json');
-								res.end(JSON.stringify({abc: 123}));
-								return true;
-							} else {
-								return next();
-							}
-						});
-						middlewares.push(function(req, res, next) {
-							if (req.url === '/data/test' && req.method === 'GET') {
-								res.end("Hi There");
-								return true;
-							} else {
-								return next();
-							}
-						});
-						middlewares.push(function(req, res, next) {
-							if (req.url === '/data/test/weird-status' && req.method === 'GET') {
-								res.statusCode = 444;
-								res.end("Hi There");
-								return true;
-							} else {
-								return next();
-							}
-						});
-						middlewares.push(function(req, res, next) {
-							if (req.url === '/data/test/server-error' && req.method === 'GET') {
-								res.statusCode = 500;
-								res.end("Hi There");
-								return true;
-							} else {
-								return next();
-							}
-						});
-						return middlewares;
-					}
+					server: path.resolve(__dirname, 'test/server.js'),
+					port: 8000
 				}
 			}
 		}
 	});
 
-	grunt.loadNpmTasks('grunt-contrib-connect');
 	grunt.loadNpmTasks('grunt-requirejs');
 	grunt.loadNpmTasks('grunt-contrib-jshint');
 	grunt.loadNpmTasks('grunt-contrib-qunit');
 	grunt.loadNpmTasks('grunt-contrib-watch');
 	grunt.loadNpmTasks('grunt-contrib-clean');
+  grunt.loadNpmTasks('grunt-express');
 
 	grunt.registerTask('test', ['jshint', 'requirejs:compile', 'requirejs:compileForTest', 'qunit', 'clean']);
-	grunt.registerTask('build', ['connect', 'jshint', 'requirejs:compile', 'qunit']);
-	grunt.registerTask('default', ['connect', 'watch']);
+	grunt.registerTask('build', ['express', 'test']); //jshint', 'requirejs:compile', 'requirejs:compileForTest', 'qunit', 'clean']);
+	grunt.registerTask('default', ['express', 'watch']);
 };

README.md

@@ -191,14 +191,17 @@ The form client is a convenience method to encode and serialize data as form POS
         console.log(req);
       }
     });
+    
+If `data` is a plain object, it will send the form POST/PUT as a urlencoded request. If `data` is a `form` element or a `FormData` object, it will send it as a multipart/form-data post (handy for file uploads).
 
 
-Supported Browsers
-==================
+Developing
+==========
 
-* Google Chrome 22+ (Desktop, Android)
-* Firefox 10+
-* Safari 5.x+, iOS
-* IE8+ (and probably 6/7, but need tests!)
-* Opera
+You'll need node installed to develop net.js. Just clone the repo and run `npm install` to get set up.
+
+`grunt` is used to manage build and development tasks:
+
+* `grunt` (with no arguments) starts up the test API server, testing/linting/compiling on file changes.
+* `grunt build` does the test/lint/compile once and exits.
 

dist/net.js

@@ -1,6 +1,6 @@
 {
   "name": "net.js",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Minimalistic network communications for browsers",
   "main": "Gruntfile.js",
   "directories": {
@@ -16,7 +16,10 @@
     "grunt-contrib-connect": "~0.7.1",
     "grunt-contrib-watch": "~0.6.0",
     "grunt-jasmine-runner": "~0.6.0",
-    "grunt-contrib-clean": "~0.5.0"
+    "grunt-contrib-clean": "~0.5.0",
+    "grunt-express": "~1.2.1",
+    "express": "^3.5.1",
+    "formidable": "^1.0.14"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"