Move etagsCacheMaxSize to a server option. Closes #99

README.md

@@ -127,16 +127,16 @@ server.ext('onPreResponse', (request, responder) => {
 After registration, this plugin adds a new method to the `responder` object and exposes the `'file'`
 and `'directory'` route handlers.
 
-### Registration options
+Note that **inert** uses the custom `'file'` `variety` to signal that the response is a static
+file generated by this plugin.
+
+### Server options
 
-**inert** accepts the following registration options:
+**inert** handles the following server plugin options on `plugins.inert`:
 
   - `etagsCacheMaxSize` - sets the maximum number of file etag hash values stored in the
     etags cache. Defaults to `10000`.
 
-Note that **inert** uses the custom `'file'` `variety` to signal that the response is a static
-file generated by this plugin.
-
 ### `responder.file(path, [options])`
 
 Transmits a file from the file system. The 'Content-Type' header defaults to the matching mime

lib/index.js

@@ -6,26 +6,27 @@ const Directory = require('./directory');
 const Etag = require('./etag');
 const File = require('./file');
 const Hoek = require('hoek');
+const Joi = require('joi');
 
 
 // Declare internals
 
 const internals = {
-    defaults: {
-        etagsCacheMaxSize: 1000
-    }
+    schema: Joi.object({
+        etagsCacheMaxSize: Joi.number().integer().min(0).default(1000)
+    }).required()
 };
 
 
 exports.plugin = {
     pkg: require('../package.json'),
     once: true,
 
-    register: function (server, options) {
+    register(server) {
 
-        const settings = Hoek.applyToDefaults(internals.defaults, options);
+        const settings = Joi.attempt(Hoek.reach(server.settings.plugins, 'inert') || {}, internals.schema, 'Invalid "inert" server options');
 
-        server.expose('_etags', settings.etagsCacheMaxSize ? new Etag.Cache(settings.etagsCacheMaxSize) : null);
+        server.expose('_etags', settings.etagsCacheMaxSize > 0 ? new Etag.Cache(settings.etagsCacheMaxSize) : null);
 
         server.decorate('handler', 'file', File.handler);
         server.decorate('handler', 'directory', Directory.handler);

test/file.js

@@ -24,8 +24,7 @@ const internals = {};
 // Test shortcuts
 
 const lab = exports.lab = Lab.script();
-const describe = lab.describe;
-const it = lab.it;
+const { describe, it } = lab;
 const expect = Code.expect;
 
 
@@ -35,9 +34,9 @@ describe('file', () => {
 
         const provisionServer = async (options, etagsCacheMaxSize) => {
 
-            const defaults = { compression: { minBytes: 1 } };
+            const defaults = { compression: { minBytes: 1 }, plugins: { inert: { etagsCacheMaxSize } } };
             const server = new Hapi.Server(Hoek.applyToDefaults(defaults, options || {}));
-            await server.register(etagsCacheMaxSize !== undefined ? { plugin: Inert, options: { etagsCacheMaxSize } } : Inert);
+            await server.register(Inert);
             return server;
         };