Migrate to bookshelf

.gitignore

@@ -1,4 +1,3 @@
 node_modules
 coverage.html
 *.sqlite
-config/config.json

.travis.yml

@@ -1,6 +1,7 @@
-# please wake up, travis
 language: node_js
 node_js:
   - "0.10"
 before_script:
-  - cp config/config.json.example config/config.json
+  - mysql -e 'create database rssmtp;'
+  - ./node_modules/.bin/knex migrate:latest
+env: NODE_ENV=ci

Makefile

@@ -1,3 +1,6 @@
+clean:
+	rm -rf node_modules
+
 coverage:
 	NODE_ENV=test \
 					 DB_TOKEN="coverage" \
@@ -36,12 +39,12 @@ test:
 					 APP_SMTP_SSL="true" \
 					 APP_SMTP_FROM="[email protected]" \
 					 APP_SMTP_PASS="dummy password" \
-					 ./node_modules/.bin/mocha --recursive test -R list
+					 ./node_modules/.bin/mocha --recursive test -R dot
 
 testwatch:
 	DB_TOKEN="testwatch" ./node_modules/.bin/chicken -c 'clear; time make test' .
 
 install:
 	npm install
 
-.PHONY: cov coverage dev supper test testwatch
+.PHONY: clean cov coverage dev supper test testwatch

agents/fetcher.js

@@ -0,0 +1,30 @@
+'use strict';
+
+function Fetcher(getter) {
+  this._getter = getter;
+}
+
+Fetcher.prototype.fetchFeed = function fetchFeed(feed, done) {
+  var getter = this._getter;
+
+  feed.set('last_fetched', new Date());
+  feed
+    .save()
+    .exec(function(err) {
+      if (err) {
+        return done(err);
+      }
+
+      var url = feed.get('url');
+
+      getter(url, function(err, response, body) {
+        if (err) {
+          return done(err);
+        }
+
+        done();
+      });
+    });
+};
+
+module.exports = Fetcher;

agents/index.js

@@ -0,0 +1,17 @@
+var _str = require('underscore.string');
+var fs   = require('fs');
+var path = require('path');
+
+var files   = fs.readdirSync(__dirname);
+
+files.forEach(function(file) {
+  if (file === path.basename(__filename)) {
+    return;
+  }
+
+  var class_name = _str.classify(path.basename(file, '.js'));
+
+  var model = require('./' + file);
+
+  module.exports[class_name] = model;
+});

models/mailer.js → agents/mailer.js

@@ -1,5 +1,4 @@
-var nodemailer = require('nodemailer')
-;
+var nodemailer = require('nodemailer');
 
 function Mailer() {
   var settings = {

bookmodels/article.js

@@ -0,0 +1,17 @@
+'use strict';
+
+var db = require('../db');
+
+var Article = db.BaseModel.extend({
+  tableName: 'articles',
+  defaults:  function defaults() {
+    return {
+      link:        null,
+      description: null,
+      title:       'untitled article'
+    }
+  }
+}, {
+});
+
+module.exports = Article;

bookmodels/feed.js

@@ -0,0 +1,10 @@
+'use strict';
+
+var db = require('../db');
+
+var Feed = db.BaseModel.extend({
+  tableName: 'feeds'
+}, {
+});
+
+module.exports = Feed;

bookmodels/index.js

@@ -0,0 +1,17 @@
+var _str = require('underscore.string');
+var fs   = require('fs');
+var path = require('path');
+
+var files   = fs.readdirSync(__dirname);
+
+files.forEach(function(file) {
+  if (file === path.basename(__filename)) {
+    return;
+  }
+
+  var class_name = _str.classify(path.basename(file, '.js'));
+
+  var model = require('./' + file);
+
+  module.exports[class_name] = model;
+});

bookmodels/user.js

@@ -0,0 +1,40 @@
+'use strict';
+
+var db = require('../db');
+
+var User = db.BaseModel.extend({
+  tableName: 'users'
+}, {
+  findOrCreateFromOAUTH: function findOrCreateFromOAUTH(oauth_data, done) {
+    var attrs = {
+      oauth_provider: oauth_data.provider,
+      oauth_id:       oauth_data.id
+    };
+
+    var created = false;
+    var user = User
+      .forge(attrs)
+
+    user
+      .fetch()
+      .then(function(result) {
+        if (result) {
+          return result;
+        }
+
+        created = true;
+        user.set('email', oauth_data.emails[0].value);
+
+        return user.save();
+      })
+      .exec(function(err, user) {
+        if (err) {
+          return done(err);
+        }
+
+        done(null, user, created);
+      });
+  }
+});
+
+module.exports = User;

config/ci.js

@@ -0,0 +1,17 @@
+module.exports = {
+  database: {
+    // for sequelize
+    dialect:  "mysql",
+    username: "travis",
+    password: null,
+    database: "rssmtp",
+    host:     "127.0.0.1",
+
+    // for bookshelf
+    client: 'mysql2',
+    connection: {
+      database: 'rssmtp',
+      user:     'travis'
+    }
+  }
+};

config/default.js

@@ -0,0 +1,19 @@
+module.exports = {
+  database: {
+    // for sequelize
+    dialect:  "mysql",
+    username: "root",
+    password: null,
+    database: "rssmtp",
+    host:     "127.0.0.1",
+
+    //debug: true,
+
+    // for bookshelf
+    client: 'mysql2',
+    connection: {
+      database: 'rssmtp',
+      user:     'root'
+    }
+  }
+};

config/dev.js

@@ -0,0 +1,2 @@
+module.exports = {
+};

config/prod.js

@@ -0,0 +1,19 @@
+module.exports = {
+  database: {
+    // for sequelize
+    dialect: "postgres",
+    username: "rssmtp",
+    password: "password_here",
+    database: "rssmtp_production",
+    host: "127.0.0.1",
+
+    // for bookshelf
+    client: 'pg',
+    connection: {
+      host: "127.0.0.1",
+      username: "rssmtp",
+      password: "password_here",
+      database: "rssmtp_production"
+    }
+  }
+};

config/runtime.json

@@ -0,0 +1 @@
+{}

config/test.js

@@ -0,0 +1,2 @@
+module.exports = {
+};

db.js

@@ -0,0 +1,62 @@
+var _         = require('lodash');
+var Bookshelf = require('bookshelf');
+var config    = require('config');
+var Knex      = require('knex');
+
+var db_config = _.cloneDeep(config.database);
+if (db_config.client.match(/^mysql/)) {
+  // make mysql pay attention to schema and not "just go with it"
+  db_config.pool = {
+    afterCreate: function(connection, callback) {
+      connection.query("SET sql_MODE='STRICT_ALL_TABLES';", function(err) {
+        callback(err, connection);
+      });
+    }
+  };
+}
+
+var knex      = Knex(db_config);
+var bookshelf = Bookshelf.initialize(knex);
+
+bookshelf.plugin('registry');
+var Parent = bookshelf.Model;
+var BaseModel = Parent.extend({
+  initialize: function initialize(attrs, options) {
+    Parent.prototype.initialize.call(this, attrs, options);
+
+    this.on('saving', this.onSaving);
+  },
+  parse: function parse(input, options) {
+    var attrs = Parent.prototype.parse.call(this, input, options);
+
+    (this.dateColumns || []).forEach(function(column) {
+      if (null != attrs[column]) {
+        attrs[column] = new Date(attrs[column]);
+      }
+    });
+
+    return attrs;
+  },
+  onSaving: function onSaving(model, attrs, options) {
+    trim_milliseconds = this.trimMilliseconds;
+
+    (this.dateColumns || []).forEach(function(column) {
+      if (null != attrs[column]) {
+        attrs[column] = new Date(attrs[column]);
+
+        if (trim_milliseconds) {
+          attrs[column].setMilliseconds(0);
+          model.set(column, attrs[column]);
+        }
+      }
+    });
+  },
+  dateColumns:      ['created_at', 'updated_at', 'last_fetched'],
+  trimMilliseconds: true,
+  hasTimestamps:    true,
+}, {
+});
+
+module.exports.knex      = knex;
+module.exports.bookshelf = bookshelf;
+module.exports.BaseModel = BaseModel;

knexfile.js

@@ -0,0 +1,4 @@
+'use strict';
+
+module.exports.development = require('config').database;
+module.exports.ci          = require('config').database;

lib/promise.js

@@ -0,0 +1,11 @@
+var BookPromise = require('bookshelf/lib/base/promise');
+var KnexPromise = require('knex/lib/promise');
+
+function unhandledRejectionHandler(err) {
+  throw err;
+}
+
+BookPromise.onPossiblyUnhandledRejection(unhandledRejectionHandler);
+KnexPromise.onPossiblyUnhandledRejection(unhandledRejectionHandler);
+
+module.exports = KnexPromise;