Merge branch 'feature/import-relpath' of https://github.com/accerqueira/sequeliz…

…e into accerqueira-feature/import-relpath

lib/sequelize.js

 var url               = require("url")
 var url               = require("url")
+  , Path              = require("path")
   , Utils             = require("./utils")
   , Utils             = require("./utils")
   , DAOFactory        = require("./dao-factory")
   , DAOFactory        = require("./dao-factory")
   , DataTypes         = require('./data-types')
   , DataTypes         = require('./data-types')
@@ -215,6 +216,13 @@ module.exports = (function() {
   }
   }
 
 
   Sequelize.prototype.import = function(path) {
   Sequelize.prototype.import = function(path) {
+    // is it a relative path?
+    if (url.parse(path).pathname.indexOf('/') !== 0) {
+      // make path relative to the caller
+      var callerFilename = Utils.stack()[1].getFileName();
+      path = Path.resolve(callerFilename, path);
+    }
+
     if (!this.importCache[path]) {
     if (!this.importCache[path]) {
       var defineCall = require(path)
       var defineCall = require(path)
       this.importCache[path] = defineCall(this, DataTypes)
       this.importCache[path] = defineCall(this, DataTypes)

lib/utils.js

@@ -452,6 +452,18 @@ var Utils = module.exports = {
     return subClass;
     return subClass;
   },
   },
 
 
+
+  stack: function() {
+    var orig = Error.prepareStackTrace;
+    Error.prepareStackTrace = function(_, stack){ return stack; };
+    var err = new Error();
+    Error.captureStackTrace(err, arguments.callee);
+    var stack = err.stack;
+    Error.prepareStackTrace = orig;
+    return stack;
+  },
+
+
   now: function(dialect) {
   now: function(dialect) {
     var now = new Date()
     var now = new Date()
     if(dialect != "postgres") now.setMilliseconds(0)
     if(dialect != "postgres") now.setMilliseconds(0)

test/sequelize.test.js

@@ -375,11 +375,17 @@ describe(Support.getTestDialectTeaser("Sequelize"), function () {
   })
   })
 
 
   describe('import', function() {
   describe('import', function() {
-    it("imports a dao definition from a file", function(done) {
+    it("imports a dao definition from a file absolute path", function(done) {
       var Project = this.sequelize.import(__dirname + "/assets/project")
       var Project = this.sequelize.import(__dirname + "/assets/project")
       expect(Project).to.exist
       expect(Project).to.exist
       done()
       done()
     })
     })
+
+    it("imports a dao definition from a file relative path", function(done) {
+      var Project = this.sequelize.import("assets/project")
+      expect(Project).to.exist
+      done()
+    })
   })
   })
 
 
   describe('define', function() {
   describe('define', function() {