Merge branch 'master' of github.com:sdepold/sequelize

package.json

@@ -9,7 +9,7 @@
   "dependencies": {
   "dependencies": {
     "mysql": "=0.9.4",
     "mysql": "=0.9.4",
     "underscore": "=1.2.1",
     "underscore": "=1.2.1",
-    "underscore.string": "=1.2.0",
+    "underscore.string": "=2.0.0",
     "lingo": "=0.0.4",
     "lingo": "=0.0.4",
     "validator": "=0.3.5",
     "validator": "=0.3.5",
     "moment": "=1.1.1"
     "moment": "=1.1.1"

spec/model.spec.js

@@ -7,12 +7,12 @@ describe('Model', function() {
   describe('Validations', function() {
   describe('Validations', function() {
     var checks = {
     var checks = {
       is : {
       is : {
-        spec : { args: [/[a-z]/,'i'] },
+        spec : { args: ["[a-z]",'i'] },
         fail: "0",
         fail: "0",
         pass: "a"
         pass: "a"
       }
       }
     , not : {
     , not : {
-        spec: { args: [/[a-z]/,'i'] },
+        spec: { args: ["[a-z]",'i'] },
         fail: "a",
         fail: "a",
         pass: "0"
         pass: "0"
       }
       }
@@ -88,12 +88,12 @@ describe('Model', function() {
         pass: "la"
         pass: "la"
       }
       }
     , regex : {
     , regex : {
-        spec : { args: [/[a-z]/,'i'] },
+        spec : { args: ["[a-z]",'i'] },
         fail: "0",
         fail: "0",
         pass: "a"
         pass: "a"
       }
       }
     , notRegex : {
     , notRegex : {
-        spec: { args: [/[a-z]/,'i'] },
+        spec: { args: ["[a-z]",'i'] },
         fail: "a",
         fail: "a",
         pass: "0"
         pass: "0"
       }
       }