Move all adapter libs into dev dependencies

Author: mde

.travis.yml

@@ -7,6 +7,7 @@ services:
   - mongodb
   - postgresql
   - riak
+  - mysql
 
 before_script:
   - sudo /etc/init.d/postgresql stop
@@ -26,4 +27,4 @@ before_script:
   - mysql -u root -e "CREATE DATABASE model_test COLLATE latin1_general_cs;"
   - sudo apt-get install sqlite3 libsqlite3-dev
 
-script: jake test
+script: jake test --trace

lib/adapters/level/index.js

@@ -1,16 +1,19 @@
 var model = require('../../index')
   , utils = require('utilities')
+  , level
   , mr = require('../transformers/mr')
   , operation = require('../../query/operation')
   , comparison = require('../../query/comparison')
   , datatypes = require('../../datatypes')
   , request = utils.request
   , BaseAdapter = require('../base_adapter').BaseAdapter
-  , level = require('level')
   , _baseConfig
   , _data = {}
   , delimiter = '!';
 
+// DB lib should be locally installed in the consuming app
+level = utils.file.requireLocal('level');
+
 _baseConfig = {
   db: '/data/level'
 };

lib/adapters/mongo/index.js

@@ -1,6 +1,5 @@
 var model = require('../../index')
-  , file = require('utilities').file
-  , driver = require('mongodb-wrapper')
+  , mongo
   , utils = require('utilities')
   , operation = require('../../query/operation')
   , comparison = require('../../query/comparison')
@@ -12,6 +11,9 @@ var model = require('../../index')
   , _comparisonTypeMap
   , _collectionizeModelName;
 
+// DB lib should be locally installed in the consuming app
+mongo = utils.file.requireLocal('mongodb-wrapper')
+
 _baseConfig = {
   username: null
 , dbname: null
@@ -177,7 +179,7 @@ utils.mixin(Adapter.prototype, new (function () {
         'password'].forEach(function (c) {
       args.push(config[c]);
     });
-    this.client = driver.db.apply(driver, args);
+    this.client = mongo.db.apply(mongo, args);
   };
 
   this.load = function (query, callback) {

lib/adapters/sql/mysql.js

@@ -1,13 +1,15 @@
-var file = require('utilities').file
-  , mysql = file.requireLocal('mysql')
+var utils = require('utilities')
+  , mysql
   , generator = require('../../../lib/generators/sql')
-  , utils = require('utilities')
   , model = require('../../../lib')
   , Query = require('../../../lib/query/query').Query
   , BaseAdapter = require('./base').Adapter
   , Adapter
   , _baseConfig;
 
+// DB lib should be locally installed in the consuming app
+mysql = utils.file.requireLocal('mysql');
+
 _baseConfig = {
   host: 'localhost'
 , user: process.env.USER

lib/adapters/sql/postgres.js

@@ -1,13 +1,15 @@
-var file = require('utilities').file
-  , pg = require('pg')
+var utils = require('utilities')
+  , pg
   , generator = require('../../generators/sql')
-  , utils = require('utilities')
   , model = require('../../index')
   , Query = require('../../query/query').Query
   , BaseAdapter = require('./base').Adapter
   , Adapter
   , _baseConfig;
 
+// DB lib should be locally installed in the consuming app
+pg = utils.file.requireLocal('pg');
+
 _baseConfig = {
   user: process.env.USER
 , database: process.env.USER

lib/adapters/sql/sqlite.js

@@ -1,13 +1,15 @@
-var file = require('utilities').file
-  , sqlite3 = file.requireLocal('sqlite3')
+var utils = require('utilities')
+  , sqlite3
   , generator = require('../../../lib/generators/sql')
-  , utils = require('utilities')
   , model = require('../../../lib')
   , Query = require('../../../lib/query/query').Query
   , BaseAdapter = require('./base').Adapter
   , Adapter
   , _baseConfig;
 
+// DB lib should be locally installed in the consuming app
+sqlite3 = utils.file.requireLocal('sqlite3');
+
 _baseConfig = {
   database: process.env.USER + '.db'
 };

package.json

@@ -28,16 +28,16 @@
     "url": "git://github.com/mde/model.git"
   },
   "dependencies": {
-    "utilities": "0.0.x",
+    "utilities": "0.0.x"
+  },
+  "devDependencies": {
+    "jake": "0.7.x",
     "mongodb-wrapper": "0.4.x",
     "pg": "2.5.x",
-    "level": "0.17.x",
     "mysql": "2.0.x",
+    "level": "0.17.x",
     "sqlite3": "2.1.x"
   },
-  "devDependencies": {
-    "jake": "0.7.x"
-  },
   "engines": {
     "node": "*"
   }