feat: implement custom orm on top of knex.js (#65)

* feat: implement custom orm on top of Knex.js

* feat: write operations with custom orm

* test: add fixutres to match new table names

* feat: add model hooks

* feat: use primaryKey variable instead of id

* refactor: move model initializer to a private Database util

* refactor: set route props in constructor

* refactor: set controller props in constructor

* feat: dirty checking for models and object model refactors

* feat: migrations

* fix: remove extra deps from test apps package.json

* chore: remove empty hook from post model in test-app

* feat: more db commands including seeding

* refactor: replace range with literall array when small enough

* feat: update all generators to use optional attrs

* test: update helper to use npm linked version of lux

* feat: validations

* fix: change example app lux imports to point to npm package

* fix: load knex and db driver from application not lux

* test: test against node 4

* test: test against mysql, sqlite, and postgres

test: fix broken .travis.yml syntax

test: fix postgres user for test-app test env

fix: don't use connection pool for tests

test: another attempt to get postgres working on travis

test: change DB=postgres -> DB=postgresql

test: remove services section and custom pg version from travis.yml

test: debug postgres travis build

test: uncomment postgresql matrix

test: continued postgresql build debugging

test: continued postgresql build debugging

test: continued postgresql build debugging

test: continued postgresql build debugging

test: continued postgresql build debugging

test: continued postgresql build debugging

test: run tests against all matrixes

test: add all verion tests back to travis.yml

* refactor: do not run npm install for test-app in gulp task

* refactor: add config option to disable/enable logging

* fix: lux d resource cmd does not remove resource from routes.js

* feat: add --database option to lux new cmd

* test: default to sqlite if DB is not set

* chore: update dependencies

* chore: bump version to 0.0.1-beta.8

* fix: move eslint version back to 2.8.0

* feat: update package.json template and test-app dependencies

Author: papa-zakari

.eslintrc

@@ -7,10 +7,12 @@
   },
   "globals": {
     "Map": true,
+    "Set": true,
     "Promise": true,
     "Symbol": true,
     "WeakMap": true,
     "before": true,
+    "after": true,
     "describe": true,
     "it": true
   },

.gitignore

@@ -7,6 +7,7 @@
 node_modules/
 
 # misc
+*.sqlite
 *.DS_Store
 
 # logs

.travis.yml

@@ -3,26 +3,40 @@ sudo: true
 language: node_js
 
 node_js:
-  - "6"
-  - "5"
+  - '4'
+  - '5'
+  - '6'
 
 services:
   - mysql
+  - postgresql
 
 before_script:
-  - cat test/fixtures/data.sql | mysql -u travis
-  - npm install -g gulp
+  - mysql -e 'create database lux_test;'
+  - psql -c 'create database lux_test;' -U postgres
+  - touch test/test-app/db/lux_test_test.sqlite
+  - cd test/test-app && npm install && cd ../../
   - npm link
 
 env:
   global:
     - CXX=g++-4.8
     - NODE_ENV=test
 
+  matrix:
+    - DB=mysql
+    - DB=sqlite
+    - DB=postgresql
+
 addons:
   apt:
     sources:
       - ubuntu-toolchain-r-test
 
     packages:
       - g++-4.8
+      - gcc-4.8
+      - postgresql-9.4
+
+notifications:
+  email: false

README.md

@@ -167,10 +167,8 @@ cat test/fixtures/data.sql | mysql -u root -p
 npm test
 ```
 
-*Note:* Make sure you have MySQL installed and accessible on port `3306`.
-
 ## Useful Links
 
 * [JSON API](http://jsonapi.org/)
-* [node-orm2](http://dresende.github.io/node-orm2/)
+* [Knex.js](http://knexjs.org/)
 * [Chai](http://chaijs.com/) / [Mocha](http://mochajs.org/)

examples/todo/app/models/task-list.js

@@ -7,6 +7,13 @@ class TaskList extends Model {
       defaultValue: 'To Do'
     }
   };
+
+  static hasMany = {
+    tasks: {
+      model: 'task',
+      inverse: 'lists'
+    }
+  };
 }
 
 export default TaskList;

examples/todo/app/models/task.js

@@ -18,10 +18,10 @@ class Task extends Model {
     }
   };
 
-  static hasOne = {
+  static belongsTo = {
     list: {
       model: 'task-list',
-      reverse: 'tasks'
+      inverse: 'tasks'
     }
   };
 }

gulpfile.babel.js

@@ -4,7 +4,6 @@ import mocha from 'gulp-mocha';
 import eslint from 'gulp-eslint';
 import uglify from 'gulp-uglify';
 
-import exec from './src/packages/cli/utils/exec';
 import rmrf from './src/packages/cli/utils/rmrf';
 
 gulp.task('clean', () => {
@@ -18,20 +17,14 @@ gulp.task('build', ['lint', 'clean'], () => {
     .pipe(gulp.dest('dist'));
 });
 
-gulp.task('build:test', ['build'], () => {
-  return exec('npm install', {
-    cwd: `${__dirname}/test/test-app`
-  });
-});
-
 gulp.task('lint', () => {
   return gulp.src('src/**/*.js')
     .pipe(eslint())
     .pipe(eslint.format())
     .pipe(eslint.failAfterError());
 });
 
-gulp.task('test', ['build:test'], () => {
+gulp.task('test', ['build'], () => {
   return gulp.src([
     'test/helper.js',
     'test/unit/**/*.js',
@@ -40,7 +33,7 @@ gulp.task('test', ['build:test'], () => {
     .pipe(
       mocha({
         bail: true,
-        timeout: 600000,
+        timeout: 60000,
         require: [
           'babel-core/register'
         ]

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lux-framework",
-  "version": "0.0.1-beta.7",
+  "version": "0.0.1-beta.8",
   "description": "A MVC style Node.js framework for building lightning fast JSON APIs",
   "repository": "https://github.com/postlight/lux",
   "main": "dist/index.js",
@@ -24,14 +24,13 @@
     "commander": "2.9.0",
     "inflection": "1.10.0",
     "moment": "2.13.0",
-    "ora": "0.2.1",
-    "orm": "2.1.30"
+    "ora": "0.2.1"
   },
   "devDependencies": {
-    "babel-core": "6.7.7",
-    "babel-eslint": "6.0.3",
+    "babel-core": "6.8.0",
+    "babel-eslint": "6.0.4",
     "babel-plugin-transform-decorators-legacy": "1.3.4",
-    "babel-plugin-transform-runtime": "6.7.5",
+    "babel-plugin-transform-runtime": "6.8.0",
     "babel-preset-es2015": "6.6.0",
     "babel-preset-stage-1": "6.5.0",
     "chai": "3.5.0",
@@ -42,7 +41,6 @@
     "gulp-mocha": "2.2.0",
     "gulp-uglify": "1.5.3",
     "isomorphic-fetch": "2.2.1",
-    "mocha": "2.4.5",
-    "mysql": "2.10.2"
+    "mocha": "2.4.5"
   }
 }

src/decorators/nonconfigurable.js

@@ -0,0 +1,6 @@
+export default function nonconfigurable(target, key, desc) {
+  return {
+    ...desc,
+    configurable: false
+  };
+}

src/decorators/nonenumerable.js

@@ -0,0 +1,6 @@
+export default function nonenumerable(target, key, desc) {
+  return {
+    ...desc,
+    enumerable: false
+  };
+}