Now param method accepts a default value

param method accepts default value and added util module to manage common tasks under one file

Author: thetutlage

lib/util.js

@@ -0,0 +1,21 @@
+'use strict'
+
+/**
+ * adonis-framework
+ * Copyright(c) 2015-2016 Harminder Virk
+ * MIT Licensed
+*/
+
+const util = exports = module.exports = {}
+
+
+/**
+ * @description tells whether value exists or not by checking
+ * it type
+ * @method existy
+ * @param  {Mixed} value
+ * @return {Boolean}
+ */
+util.existy = function (value) {
+  return value !== undefined && value !== null
+}

src/Config/index.js

@@ -8,6 +8,7 @@
 
 const autoLoad = require('auto-loader')
 const _ = require('lodash')
+const util = require('../../lib/util')
 
 class Config {
 
@@ -16,17 +17,6 @@ class Config {
     this.config = autoLoad.load(this.configPath)
   }
 
-  /**
-   * @description tells whether value exists or not by checking
-   * it type
-   * @method existy
-   * @param  {Mixed} value
-   * @return {Boolean}
-   */
-  existy (value) {
-    return value !== undefined && value !== null
-  }
-
   /**
    * @description get value for a given key from config store
    * @method get
@@ -36,9 +26,9 @@ class Config {
    * @public
    */
   get (key, defaultValue) {
-    defaultValue = this.existy(defaultValue) ? defaultValue : null
+    defaultValue = util.existy(defaultValue) ? defaultValue : null
     const returnValue = _.get(this.config, key)
-    return this.existy(returnValue) ? returnValue : defaultValue
+    return util.existy(returnValue) ? returnValue : defaultValue
   }
 
   /**

src/Env/index.js

@@ -8,6 +8,7 @@
 
 const path = require('path')
 const dotenv = require('dotenv')
+const util = require('../../lib/util')
 
 class Env {
 
@@ -17,17 +18,6 @@ class Env {
     dotenv.load({path: pathToEnvFile})
   }
 
-  /**
-   * @description tells whether value exists or not by checking
-   * it type
-   * @method existy
-   * @param  {Mixed} value
-   * @return {Boolean}
-   */
-  existy (value) {
-    return value !== undefined && value !== null
-  }
-
   /**
    * @description get value of an existing key from
    * env file
@@ -37,7 +27,7 @@ class Env {
    * @return {Mixed}
    */
   get (key, defaultValue) {
-    defaultValue = this.existy(defaultValue) ? defaultValue : null
+    defaultValue = util.existy(defaultValue) ? defaultValue : null
     let returnValue = process.env[key] || defaultValue
     if (returnValue === 'true' || returnValue === '1') {
       return true

src/Request/index.js

@@ -12,6 +12,7 @@ const File = require('../File')
 const _ = require('lodash')
 const CatLog = require('cat-log')
 const log = new CatLog('adonis:framework')
+const util = require('../../lib/util')
 
 /**
  * @class  Request
@@ -60,9 +61,9 @@ class Request {
    * @public
    */
   input (key, defaultValue) {
-    defaultValue = defaultValue || null
+    defaultValue = util.existy(defaultValue) ? defaultValue : null
     const input = this.all()
-    return input[key] || defaultValue
+    return util.existy(input[key]) ? input[key] : defaultValue
   }
 
   /**
@@ -332,8 +333,9 @@ class Request {
    * @return {Mixed}
    * @public
    */
-  param (key) {
-    return this.params()[key] || null
+  param (key, defaultValue) {
+    defaultValue = util.existy(defaultValue) ? defaultValue : null
+    return util.existy(this.params()[key]) ? this.params()[key] : defaultValue
   }
 
   /**
@@ -438,8 +440,8 @@ class Request {
       log.warn('Make use of Flash middleware to enable flash messaging')
       this._flash_messages = {}
     }
-    defaultValue = defaultValue || null
-    return this._flash_messages[key] || defaultValue
+    defaultValue = util.existy(defaultValue) ? defaultValue : null
+    return util.existy(this._flash_messages[key]) ? this._flash_messages[key] : defaultValue
   }
 
   /**

src/Session/SessionManager/index.js

@@ -10,6 +10,7 @@ const nodeCookie = require('node-cookie')
 const Type = require('type-of-is')
 const _ = require('lodash')
 const uuid = require('node-uuid')
+const util = require('../../../lib/util')
 
 class SessionManager {
 
@@ -317,9 +318,9 @@ class SessionManager {
    * @public
    */
   * get (key, defaultValue) {
-    defaultValue = defaultValue || null
+    defaultValue = util.existy(defaultValue) ? defaultValue : null
     const sessionValues = yield this.all()
-    return sessionValues[key] || defaultValue
+    return util.existy(sessionValues[key]) ? sessionValues[key] : defaultValue
   }
 
   /**

test/unit/request.spec.js

@@ -524,7 +524,7 @@ describe('Request', function () {
     expect(res.body.id).to.equal(1)
   })
 
-  it('should return request null when param value for a given key does not exists', function * () {
+  it('should return null when param value for a given key does not exists', function * () {
     const server = http.createServer(function (req, res) {
       const request = new Request(req, res, Config)
       request._params = {id:1}
@@ -537,6 +537,20 @@ describe('Request', function () {
     expect(res.body.name).to.equal(null)
   })
 
+  it('should return default value when param value for a given key does not exists', function * () {
+    const server = http.createServer(function (req, res) {
+      const request = new Request(req, res, Config)
+      request._params = {id:1}
+      const name = request.param('name', 'bar')
+      res.writeHead(200, {"Content-type":"application/json"})
+      res.end(JSON.stringify({name}),'utf8')
+    })
+
+    const res = yield supertest(server).get("/").expect(200).end()
+    expect(res.body.name).to.equal('bar')
+  })
+
+
   it('should return an uploaded file as an instance of File object', function * () {
     const server = http.createServer(function (req, res) {
       var form = new formidable.IncomingForm();