Initial commit. Types 'email', 'url', 'counter'

bnoguchi · bnoguchi · commit 17b6e63b8ed2 · 2010-11-16T18:26:14.000-08:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+**.swp
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "support/expresso"]
+	path = support/expresso
+	url = https://github.com/visionmedia/expresso.git
diff --git a/Makefile b/Makefile
@@ -0,0 +1,11 @@
+EXPRESSO = support/expresso/bin/expresso -I lib --serial
+
+TESTS = tests/*.test.js
+
+test:
+	@$(EXPRESSO) $(TESTS) $(TEST_FLAGS)
+
+test-cov:
+	@$(MAKE) TEST_FLAGS=--cov test
+
+.PHONY: test test-cov
diff --git a/index.js b/index.js
@@ -0,0 +1 @@
+module.exports = require("./lib/types");
diff --git a/lib/types/counter.js b/lib/types/counter.js
@@ -0,0 +1,36 @@
+module.exports.loadType = function (mongoose) {
+  mongoose.type('counter')
+    .extend('number')
+    .default(0)
+    .setup( function () { /** @scope is the Schema instance **/
+      var schema = this;
+      ['incr', 'decr'].forEach( function (methodToAdd) {
+        if (!schema._methods[methodToAdd]) {
+          schema.method(methodToAdd, function (path, delta, fn) { /** @scope is a Document instance **/
+            if (this.isNew || !this.id) throw new Error("You can only increment keys of documents that already have been persisted to mongodb.");
+            var arg1type = typeof arguments[1];
+            if (arg1type === "undefined") { // incr(path)
+              delta = 1;
+            } else if (arg1type === "function") { // incr(path, fn)
+              fn = delta;
+              delta = 1;
+            } // Else we had invoked: incr(path, delta[, fn]); // i.e. arg1type === "number"
+            var mongooseDoc = this,
+                incObj = {}, fieldsObj = {};
+            switch (methodToAdd) {
+              case ('incr'):
+                incObj[path] = delta;
+                break;
+              case('decr'):
+                incObj[path] = -1 * delta;
+                break;
+            }
+            fieldsObj[path] = 1;
+            this._collection.findAndModify({'_id': this._id}, [], {'$inc': incObj}, {'new': true, fields: fieldsObj}, function (err, doc) {
+              if (doc) mongooseDoc.set(path, doc[path], true);
+              if (fn) fn(err, mongooseDoc);
+            });
+          });
+        }
+      });
+};
diff --git a/lib/types/email.js b/lib/types/email.js
@@ -0,0 +1,6 @@
+module.exports.loadType = function (mongoose) {
+  mongoose.type('email')
+    .validate('email', function (value, callback) {
+      return callback( /^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/.test(value) );
+    });
+};
diff --git a/lib/types/index.js b/lib/types/index.js
@@ -0,0 +1,7 @@
+module.exports.loadTypes = function () {
+  var mongoose = arguments[0],
+      types = Array.prototype.slice.call(arguments, 1);
+  types.forEach( function (type) {
+    require("./" + type).loadType(mongoose);
+  });
+};
diff --git a/lib/types/url.js b/lib/types/url.js
@@ -0,0 +1,48 @@
+var Url = require("url");
+
+module.exports.loadType = function (mongoose) {
+  type('url')
+    .extend('string')
+    .validate('url', function (val, callback) {
+      var urlRegexp = /(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/;
+      return callback(urlRegexp.test(val));
+    })
+    .castSet(function (val, path) {
+      return module.exports.normalizeUrl(val);
+    });
+};
+
+// See http://en.wikipedia.org/wiki/URL_normalization
+module.exports.normalizeUrl = (function () {
+  var reorderQuery = function (query) {
+    var orderedKeys = [], name, i, len, key, querystr = [];
+    for (name in query) {
+      for (i = 0, len = orderedKeys.length; i < len; i++) {
+        if (orderedKeys[i] >= name) break;
+      }
+      orderedKeys.splice(i, 0, name);
+    }
+    for (i = 0, len = orderedKeys.length; i < len; i++) {
+      key = orderedKeys[i];
+      querystr.push(key + "=" + query[key]);
+    }
+    return querystr.join("&");
+  };
+
+  return function (uri) {
+    var parsedUrl = Url.parse(uri, true),
+        urlstr = "";
+    urlstr += parsedUrl.protocol.toLowerCase() + "//" + parsedUrl.hostname.toLowerCase().replace(/^www\./, "") + // Convert scheme and host to lower case; remove www. if it exists in hostname
+      (parsedUrl.pathname ?
+         parsedUrl.pathname.replace(/\/\.{1,2}\//g, "/").replace(/\/{2,}/, "/") : // Remove dot-segments; Remove duplicate slashes
+         "/" // Add trailing /
+      );
+    if (parsedUrl.query) {
+      urlstr += "?" + reorderQuery(parsedUrl.query);
+    }
+    if (parsedUrl.hash) {
+      urlstr += parsedUrl.hash;
+    }
+    return urlstr;
+  };
+})();
diff --git a/support/expresso b/support/expresso
@@ -0,0 +1 @@
+Subproject commit 7f10ab7fa655299b4e2f519065b0495e6ac34ef2
diff --git a/tests/email.test.js b/tests/email.test.js
@@ -0,0 +1,39 @@
+var assert = require('assert')
+  , mongoose = require('mongoose').new()
+  , document = mongoose.define
+  , db = mongoose.connect('mongodb://localhost/mongoose_types_tests')
+  , loadTypes = require("../").loadTypes;
+
+loadTypes(mongoose, 'email');
+document('User')
+  .email('email');
+
+module.exports = {
+  before: function(assert, done){
+    db.on('connect', function () {
+      mongoose.User.remove({}, function () {
+        done();
+      });
+    });
+  },
+  'test invalid email validation': function (assert, done) {
+    var user = new mongoose.User({email: 'hello'});
+    user.save(function (err, _user) {
+      assert.ok(_user.errors[0].name === 'email');
+      assert.ok(_user.errors[0].path === 'email');
+      assert.ok(_user.errors[0].type === 'validation');
+      assert.ok(_user.errors[0].message === 'validation email failed for email');
+      done();
+    });
+  },
+  'test valid email validation': function (assert, done) {
+    mongoose.User.create({ email: 'brian@brian.com' }, function (err, user) {
+      assert.equal("undefined", typeof user.errors);
+      assert.equal(false, user.isNew);
+      done();
+    });
+  },
+  teardown: function(){
+    mongoose.disconnect();
+  }
+};

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[submodule "support/expresso"]`
	`2`	`+ path = support/expresso`
	`3`	`+ url = https://github.com/visionmedia/expresso.git`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+module.exports = require("./lib/types");`