velocious 1.0.27 → 1.0.29

package/package.json

@@ -3,7 +3,7 @@
     "velocious": "bin/velocious.js"
   },
   "name": "velocious",
-  "version": "1.0.27",
+  "version": "1.0.29",
   "main": "index.js",
   "scripts": {
     "test": "jasmine",

package/spec/dummy/src/config/routes.js

@@ -8,6 +8,8 @@ routes.draw((route) => {
   route.resources("tasks", (route) => {
     route.get("users")
   })
+
+  route.get("ping")
 })
 
 export default {routes}

package/spec/dummy/src/routes/_root/controller.js

@@ -0,0 +1,11 @@
+import Controller from "../../../../../src/controller.js"
+
+export default class RootController extends Controller {
+  ping() {
+    this.render({
+      json: {
+        message: "Pong"
+      }
+    })
+  }
+}

package/spec/dummy/src/routes/projects/controller.js

@@ -2,7 +2,6 @@ import {digg} from "diggerize"
 
 import Controller from "../../../../../src/controller.js"
 import Project from "../../models/project.js"
-import Task from "../../models/task.js"
 
 export default class ProjectsController extends Controller {
   index() {

package/spec/http-server/root-get-spec.js

@@ -0,0 +1,26 @@
+import fetch from "node-fetch"
+import Dummy from "../dummy/index.js"
+
+describe("HttpServer", () => {
+  it("handles root get requests", async () => {
+    await Dummy.run(async () => {
+      const response = await fetch("http://localhost:3006/ping")
+      const text = await response.text()
+
+      expect(response.status).toEqual(200)
+      expect(response.statusText).toEqual("OK")
+      expect(text).toEqual("{\"message\":\"Pong\"}")
+    })
+  })
+
+  it("returns a 404 error when a root get isn't found", async () => {
+    await Dummy.run(async () => {
+      const response = await fetch("http://localhost:3006/doesnt-exist")
+      const text = await response.text()
+
+      expect(response.status).toEqual(404)
+      expect(response.statusText).toEqual("Not Found")
+      expect(text).toEqual("Not found!\n")
+    })
+  })
+})

package/src/database/query/index.js

@@ -213,7 +213,7 @@ export default class VelociousDatabaseQuery {
     const sql = this.toSql()
     const results = await this.driver.query(sql)
 
-    this.logger.debug(`SQL: sql`)
+    this.logger.debug("SQL: ", sql)
 
     return results
   }

package/src/routes/get-route.js

@@ -10,10 +10,14 @@ export default class VelociousRouteGetRoute extends BaseRoute {
     this.regExp = new RegExp(`^(${escapeStringRegexp(name)})(.*)$`)
   }
 
-  matchWithPath({path}) {
-    if (path.match(this.regExp)) {
+  matchWithPath({params, path}) {
+    const match = path.match(this.regExp)
+
+    if (match) {
       const [_beginnigSlash, _matchedName, restPath] = match
 
+      params.action = this.name
+
       return {restPath}
     }
   }

package/src/routes/resolver.js

@@ -33,7 +33,9 @@ export default class VelociousRoutesResolver {
       controllerPath = "./built-in/errors/controller.js"
       action = "notFound"
       viewPath = await fs.realpath(`${__dirname}/built-in/errors`) // eslint-disable-line no-undef
-    } else if (action && controller) {
+    } else if (action) {
+      if (!controller) controller = "_root"
+
       controllerPath = `${this.configuration.getDirectory()}/src/routes/${controller}/controller.js`
       viewPath = `${this.configuration.getDirectory()}/src/routes/${controller}`
     } else {

package/src/testing/test.js

@@ -34,7 +34,7 @@ class ExpectToChange {
     const difference = this.newCount - this.oldCount
 
     if (difference != this.count) {
-      throw new Error(`Expected to change by ${count} but changed by ${difference}`)
+      throw new Error(`Expected to change by ${this.count} but changed by ${difference}`)
     }
   }
 }
@@ -68,7 +68,7 @@ class Expect {
       await expectation.runBefore()
     }
 
-    await this._object()
+    const result = await this._object()
 
     for (const expectation of this.expectations) {
       await expectation.runAfter()
@@ -77,6 +77,8 @@ class Expect {
     for (const expectation of this.expectations) {
       await expectation.execute()
     }
+
+    return result
   }
 
   toHaveAttributes(result) {