hapi-paginate
Advanced tools
Comparing version 0.3.0 to 0.4.0
32
index.js
@@ -7,4 +7,4 @@ /* global require, exports, module */ | ||
exports.register = function (server, options, next) { | ||
var page = 1; | ||
var limit = options.limit || 100; | ||
var defaultPage = 1; | ||
var defaultLimit = options.limit || 100; | ||
var name = options.name || 'meta'; | ||
@@ -14,19 +14,22 @@ var results = options.results || 'results'; | ||
var excludeFormats = options.excludeFormats || []; | ||
var requestLimit = defaultLimit; | ||
var requestPage = defaultPage; | ||
server.ext('onPreHandler', function (request, reply) { | ||
page = 1; | ||
limit = options.limit || 100; | ||
if (_.has(request.query, 'page')) { | ||
page = _.parseInt(request.query.page); | ||
requestPage = _.parseInt(request.query.page); | ||
request.query = _.omit(request.query, 'page'); | ||
} else { | ||
requestPage = defaultPage; | ||
} | ||
if (_.has(request.query, 'limit')) { | ||
limit = _.parseInt(request.query.limit); | ||
requestLimit = _.parseInt(request.query.limit); | ||
request.query = _.omit(request.query, 'limit'); | ||
} else { | ||
requestLimit = defaultLimit; | ||
} | ||
request.page = page; | ||
request.limit = limit; | ||
request.page = requestPage; | ||
request.limit = requestLimit; | ||
@@ -38,4 +41,4 @@ return reply.continue(); | ||
var meta = { | ||
page: request.page, | ||
limit: request.limit | ||
page: requestPage, | ||
limit: requestLimit | ||
}; | ||
@@ -59,2 +62,9 @@ | ||
} | ||
} else { | ||
// Remove any previous meta content since we don't want it in this case | ||
if (_.has(request.response.source, name)) { | ||
delete request.response.source[name].page; | ||
delete request.response.source[name].limit; | ||
delete request.response.source[name].found; | ||
} | ||
} | ||
@@ -61,0 +71,0 @@ |
{ | ||
"name": "hapi-paginate", | ||
"version": "0.3.0", | ||
"version": "0.4.0", | ||
"description": "A pagination plugin for Hapi", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
@@ -1,2 +0,2 @@ | ||
/* global require, describe, it, before */ | ||
/* global require, describe, it */ | ||
'use strict'; | ||
@@ -3,0 +3,0 @@ |
11147
260