Upgraded to Grind 0.7.0

shnhrrsn · shnhrrsn · commit 88ba64ae5b06 · 2017-07-16T22:55:45.000-04:00
diff --git a/.babelrc b/.babelrc
@@ -2,10 +2,12 @@
 	"presets": [ "grind" ],
 	"plugins": [
 		[
-			"babel-plugin-module-alias", [
-				{ "src": "./app", "expose": "App" },
-				{ "src": "./boot", "expose": "Boot" }
-			]
+			"module-resolver", {
+				"alias": {
+					"App": "./app",
+					"Boot": "./boot"
+				}
+			}
 		]
 	]
 }
diff --git a/.travis.yml b/.travis.yml
@@ -2,5 +2,6 @@ language: node_js
 node_js:
   - "6"
   - "7"
+  - "8"
 sudo: false
 script: "bin/lint"
diff --git a/app/Bootstrap.js b/app/Bootstrap.js
@@ -8,9 +8,9 @@ import 'App/Providers/RoutesProvider'
 
 const app = new Grind()
 
-app.providers.push(DatabaseProvider)
-app.providers.push(OrmProvider)
-app.providers.push(SwaggerProvider)
-app.providers.push(RoutesProvider)
+app.providers.add(DatabaseProvider)
+app.providers.add(OrmProvider)
+app.providers.add(SwaggerProvider)
+app.providers.add(RoutesProvider)
 
 module.exports = app
diff --git a/app/Commands/StatesListCommand.js b/app/Commands/StatesListCommand.js
@@ -1,4 +1,4 @@
-import { Command } from 'grind-cli'
+import { Command, InputArgument, InputOption } from 'grind-cli'
 
 import 'App/Models/StateModel'
 
@@ -10,12 +10,14 @@ export class StatesListCommand extends Command {
 	description = 'List all states in the database'
 
 	// Arguments available for this command
-	arguments = [ 'term?' ]
+	arguments = [
+		new InputArgument('term', InputArgument.VALUE_OPTIONAL, 'Search term'),
+	]
 
 	// Options for this command
-	options = {
-		limit: 'Limit the number of states'
-	}
+	options = [
+		new InputOption('limit', InputOption.VALUE_OPTIONAL, 'Limit the number of states', '100')
+	]
 
 	run() {
 		const limit = Number.parseInt(this.option('limit', 100))
diff --git a/app/Controllers/BaseController.js b/app/Controllers/BaseController.js
@@ -16,4 +16,9 @@ export class BaseController extends Controller {
 		return { limit, offset }
 	}
 
+	paginationRange(req, limit = 100) {
+		const pagination = this.pagination(req, limit)
+		return { start: pagination.offset, end: (pagination.limit + pagination.offset) - 1 }
+	}
+
 }
diff --git a/app/Controllers/CompaniesController.js b/app/Controllers/CompaniesController.js
@@ -6,7 +6,9 @@ export class CompaniesController extends BaseController {
 	model = CompanyModel
 
 	index(req, res) {
-		return this.model.query().subset(this.pagination(req)).then(rows => {
+		const { start, end } = this.paginationRange(req)
+
+		return this.model.query().range(start, end).then(rows => {
 			if(rows.isNil) {
 				throw new NotFoundError('No companies found')
 			}
diff --git a/app/Controllers/CountriesController.js b/app/Controllers/CountriesController.js
@@ -6,7 +6,9 @@ export class CountriesController extends BaseController {
 	model = CountryModel
 
 	index(req, res) {
-		return this.model.query().subset(this.pagination(req)).then(rows => {
+		const { start, end } = this.paginationRange(req)
+
+		return this.model.query().range(start, end).then(rows => {
 			if(rows.isNil) {
 				throw new NotFoundError('No countries found')
 			}
@@ -26,7 +28,9 @@ export class CountriesController extends BaseController {
 			throw new ValidationError({ term: 'term is required' })
 		}
 
-		return this.model.find(req.query.term).subset(this.pagination(req)).then(rows => {
+		const { start, end } = this.paginationRange(req)
+
+		return this.model.find(req.query.term).range(start, end).then(rows => {
 			if(rows.isNil) {
 				throw new NotFoundError('No countries found, try a different term')
 			}
diff --git a/app/Controllers/StatesController.js b/app/Controllers/StatesController.js
@@ -6,7 +6,9 @@ export class StatesController extends BaseController {
 	model = StateModel
 
 	index(req, res) {
-		return this.model.query().subset(this.pagination(req)).then(rows => {
+		const { start, end } = this.paginationRange(req)
+
+		return this.model.query().range(start, end).then(rows => {
 			if(rows.isNil) {
 				throw new NotFoundError('No states found')
 			}
@@ -26,7 +28,9 @@ export class StatesController extends BaseController {
 			throw new BadRequestError('`term` is required')
 		}
 
-		return this.model.find(req.query.term).subset(this.pagination(req)).then(rows => {
+		const { start, end } = this.paginationRange(req)
+
+		return this.model.find(req.query.term).range(start, end).then(rows => {
 			if(rows.isNil) {
 				throw new NotFoundError('No states found, try a different term')
 			}
diff --git a/bin/.init b/bin/.init
@@ -19,6 +19,10 @@ pushd $NODE_ROOT > /dev/null
 NODE_ROOT="`pwd`"
 popd > /dev/null
 
+pushd $NODE_ROOT/.. > /dev/null
+export BASE_PATH="`pwd`"
+popd > /dev/null
+
 if [ -f "$NODE_ROOT/../.env" ];
 then
 	source "$NODE_ROOT/../.env"
diff --git a/bin/build b/bin/build
@@ -4,13 +4,7 @@ source ${0%/*}/.init
 
 strip_babel() {
 	cp "$1" "$1-tmp"
-
-	if [ $(node -e 'console.log(Number.parseFloat(process.version.substring(1)) >= 7)') == "true" ]; then
-		cat "$1-tmp" | sed 's/babel-node/node/g' | sed 's/FLAGS=.*$/FLAGS="--harmony-async-await"/g' > "$1"
-	else
-		cat "$1-tmp" | sed 's/babel-node/node/g' | sed 's/FLAGS=.*$/FLAGS=""/g' > "$1"
-	fi
-
+	cat "$1-tmp" | sed "s/require('babel-register')//g" > "$1"
 	rm "$1-tmp"
 }
 
@@ -27,7 +21,8 @@ echo "Setting up bins"
 cp -R bin build/bin
 rm build/bin/build build/bin/lint
 
-strip_babel build/bin/cli
+strip_babel build/boot/Cli.js
+strip_babel build/boot/Http.js
 chmod +x build/bin/* build/bin/.init
 
 echo "Done"
diff --git a/bin/cli b/bin/cli
@@ -9,16 +9,22 @@ source ${0%/*}/.init
 COMMAND=$1
 
 if [[ "$@" == *"--help"* ]]; then
-    COMMAND="$COMMAND-help"
+	COMMAND="$COMMAND-help"
 fi
 
-FLAGS=$(node -e 'console.log(Number.parseFloat(process.version.substring(1)) >= 7 ? "--harmony-async-await" : "")')
+NODE_VERSION=$(node -v)
+NODE_VERSION=$(echo ${NODE_VERSION#*v} | cut -d. -f1)
+
+FLAGS=""
+if [ "$NODE_VERSION" = "7" ]; then
+	FLAGS="--harmony-async-await"
+fi
 
 case $COMMAND in
-	watch) exec babel-node $FLAGS boot/Http.js --watch=app,config $@
+	watch) exec node $FLAGS boot/Http.js --watch=app,config $@
 		;;
-	serve) exec babel-node $FLAGS boot/Http.js $@
+	serve) exec node $FLAGS boot/Http.js $@
 		;;
-	*) IN_CLI=true CLI_BIN="$CLI_BIN" exec babel-node $FLAGS boot/Cli.js "$@"
+	*) IN_CLI=true CLI_BIN="$CLI_BIN" exec node $FLAGS boot/Cli.js "$@"
 		;;
 esac
diff --git a/bin/lint b/bin/lint
@@ -2,4 +2,4 @@
 
 source ${0%/*}/.init
 
-eslint app config server
+eslint app boot config
diff --git a/boot/Cli.js b/boot/Cli.js
@@ -1,10 +1,20 @@
-import { CliProvider } from 'grind-cli'
-import 'App/Providers/CommandsProvider'
+//
+// WARNING: This file is *NOT* processed through babel
+//
 
-const app = require('App/Bootstrap')
-app.providers.push(CliProvider, CommandsProvider)
+require('babel-register')
+require('babel-polyfill')
+require('grind-framework')
 
-app.boot().then(() => app.cli.run()).catch(err => {
+const { CliProvider, Runner } = require('grind-cli')
+
+new Runner(() => {
+	const app = require('../app/Bootstrap')
+	const { CommandsProvider } = require('../app/Providers/CommandsProvider')
+	app.providers.add(CliProvider, CommandsProvider)
+
+	return app
+}).run().catch(err => {
 	Log.error('Boot Error', err)
 	process.exit(1)
 })
diff --git a/boot/Http.js b/boot/Http.js
@@ -1,6 +1,13 @@
-import { HttpServer } from 'grind-framework'
+//
+// WARNING: This file is *NOT* processed through babel
+//
 
-(new HttpServer(() => require('App/Bootstrap'))).start().catch(err => {
+require('babel-register')
+require('babel-polyfill')
+
+const { HttpServer } = require('grind-framework')
+
+new HttpServer(() => require('../app/Bootstrap')).start().catch(err => {
 	Log.error('Boot Error', err)
 	process.exit(1)
 })
diff --git a/config/database.json b/config/database.json
@@ -4,10 +4,10 @@
 
 	"connections": {
 
-		"mysql2": {
-			"driver": "mysql2",
+		"mysql": {
+			"driver": "mysql",
 			"host": "localhost",
-			"db": "app-db-name",
+			"database": "app-db-name",
 			"user": "app-user",
 			"password": "app-password",
 			"charset": "utf8"
diff --git a/config/redis.json b/config/redis.json
@@ -0,0 +1,14 @@
+{
+
+	"default": "redis",
+
+	"connections": {
+
+		"redis": {
+			"host": "localhost",
+			"port": 6379
+		}
+
+	}
+
+}
diff --git a/config/routing.json b/config/routing.json
@@ -8,6 +8,8 @@
 				"extended": true
 			}
 		}
-	}
+	},
+
+	// "middleware": [ "cookie", "session", "method-override" ]
 
 }
diff --git a/database/seeds/01-countries.js b/database/seeds/01-countries.js
@@ -1,9 +1,9 @@
-export function seed(knex) {
+export function seed(db) {
 	const table = 'countries'
 
 	return Promise.all([
-		knex(table).del(),
+		db(table).del(),
 
-		knex(table).insert({ id: 1, abbreviation: 'US', name: 'United States' })
+		db(table).insert({ id: 1, abbreviation: 'US', name: 'United States' })
 	])
 }
diff --git a/database/seeds/02-states.js b/database/seeds/02-states.js
diff --git a/database/seeds/03-companies.js b/database/seeds/03-companies.js
diff --git a/database/seeds/04-companies_states.js b/database/seeds/04-companies_states.js
diff --git a/package.json b/package.json

Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,12 @@`
`2`	`2`	`"presets": [ "grind" ],`
`3`	`3`	`"plugins": [`
`4`	`4`	`[`
`5`		`- "babel-plugin-module-alias", [`
`6`		`- { "src": "./app", "expose": "App" },`
`7`		`- { "src": "./boot", "expose": "Boot" }`
`8`		`- ]`
	`5`	`+ "module-resolver", {`
	`6`	`+ "alias": {`
	`7`	`+ "App": "./app",`
	`8`	`+ "Boot": "./boot"`
	`9`	`+ }`
	`10`	`+ }`
`9`	`11`	`]`
`10`	`12`	`]`
`11`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,9 @@ export class BaseController extends Controller {`
`16`	`16`	`return { limit, offset }`
`17`	`17`	`}`
`18`	`18`
	`19`	`+ paginationRange(req, limit = 100) {`
	`20`	`+ const pagination = this.pagination(req, limit)`
	`21`	`+ return { start: pagination.offset, end: (pagination.limit + pagination.offset) - 1 }`
	`22`	`+ }`
	`23`	`+`
`19`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,9 @@ export class CountriesController extends BaseController {`
`6`	`6`	`model = CountryModel`
`7`	`7`
`8`	`8`	`index(req, res) {`
`9`		`- return this.model.query().subset(this.pagination(req)).then(rows => {`
	`9`	`+ const { start, end } = this.paginationRange(req)`
	`10`	`+`
	`11`	`+ return this.model.query().range(start, end).then(rows => {`
`10`	`12`	`if(rows.isNil) {`
`11`	`13`	`throw new NotFoundError('No countries found')`
`12`	`14`	`}`
`@@ -26,7 +28,9 @@ export class CountriesController extends BaseController {`
`26`	`28`	`throw new ValidationError({ term: 'term is required' })`
`27`	`29`	`}`
`28`	`30`
`29`		`- return this.model.find(req.query.term).subset(this.pagination(req)).then(rows => {`
	`31`	`+ const { start, end } = this.paginationRange(req)`
	`32`	`+`
	`33`	`+ return this.model.find(req.query.term).range(start, end).then(rows => {`
`30`	`34`	`if(rows.isNil) {`
`31`	`35`	`throw new NotFoundError('No countries found, try a different term')`
`32`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,9 @@ export class StatesController extends BaseController {`
`6`	`6`	`model = StateModel`
`7`	`7`
`8`	`8`	`index(req, res) {`
`9`		`- return this.model.query().subset(this.pagination(req)).then(rows => {`
	`9`	`+ const { start, end } = this.paginationRange(req)`
	`10`	`+`
	`11`	`+ return this.model.query().range(start, end).then(rows => {`
`10`	`12`	`if(rows.isNil) {`
`11`	`13`	`throw new NotFoundError('No states found')`
`12`	`14`	`}`
`@@ -26,7 +28,9 @@ export class StatesController extends BaseController {`
`26`	`28`	throw new BadRequestError('`term` is required')
`27`	`29`	`}`
`28`	`30`
`29`		`- return this.model.find(req.query.term).subset(this.pagination(req)).then(rows => {`
	`31`	`+ const { start, end } = this.paginationRange(req)`
	`32`	`+`
	`33`	`+ return this.model.find(req.query.term).range(start, end).then(rows => {`
`30`	`34`	`if(rows.isNil) {`
`31`	`35`	`throw new NotFoundError('No states found, try a different term')`
`32`	`36`	`}`