Merge pull request #110 from tlivings/master

use hapi-openapi instead of swaggerize-hapi

CHANGELOG.md

@@ -1,3 +1,7 @@
+# v4.1.0
+
+- Use `hapi-openapi` instead of `swaggerize-hapi`.
+
 # v4.0.0
 
 - Support latest swaggerize-hapi.

README.md

@@ -13,7 +13,7 @@ Generates projects for:
 
 See also:
 - [swaggerize-express](https://github.com/krakenjs/swaggerize-express)
-- [swaggerize-hapi](https://github.com/krakenjs/swaggerize-hapi)
+- [hapi-openapi](https://github.com/krakenjs/hapi-openapi) (formerly `swaggerize-hapi`)
 
 ### Usage
 

generators/app/templates/hapi/server.js

@@ -1,14 +1,14 @@
 'use strict';
 
 const Hapi = require('hapi');
-const Swaggerize = require('swaggerize-hapi');
+const HapiOpenAPI = require('hapi-openapi');
 const Path = require('path');
 
 const init = async function() {
     const server = new Hapi.Server();
 
     await server.register({
-        plugin: Swaggerize,
+        plugin: HapiOpenAPI,
         options: {
             api: Path.resolve('<%=apiPathRel.replace(/\\/g,'/')%>'),
             handlers: Path.resolve('<%=handlerPath.replace(/\\/g,'/')%>')
@@ -21,7 +21,7 @@ const init = async function() {
 };
 
 init().then((server) => {
-    server.plugins.swagger.setHost(server.info.host + ':' + server.info.port);
+    server.plugins.openapi.setHost(server.info.host + ':' + server.info.port);
 
     server.log(['info'], `Server running on ${server.info.host}:${server.info.port}`);
 });

generators/app/templates/package.json

@@ -18,7 +18,7 @@
         "swaggerize-express": "^4.0.0"<%}%><% if (framework === 'hapi') {%>
         "hapi": "^17.0.0",
         "boom": "^7.1.1",
-        "swaggerize-hapi": "^4.1.0-"<%}%><% if (framework === 'restify') {%>
+        "hapi-openapi": "^1.0.0"<%}%><% if (framework === 'restify') {%>
         "swaggerize-restify": "^2.0.0",
         "restify": "^3.0.3"<%}%><% if (framework !== 'hapi') {%>,
         "swagmock": "~0.0.2"<%}%>

generators/test/templates/hapi/test.js

@@ -2,15 +2,15 @@
 
 const Test = require('tape');
 const Hapi = require('hapi');
-const Swaggerize = require('swaggerize-hapi');
+const HapiOpenAPI = require('hapi-openapi');
 const Path = require('path');
 const Mockgen = require('<%=mockgenPath.replace(/\\/g,'/')%>');
 
 /**
  * Test for <%=path%>
  */
 Test('<%=path%>', function (t) {
-    
+
     <%operations.forEach(function (operation, i) {
         const mt = operation.method.toLowerCase();
     %>/**
@@ -25,7 +25,7 @@ Test('<%=path%>', function (t) {
         const server = new Hapi.Server();
 
         await server.register({
-            plugin: Swaggerize,
+            plugin: HapiOpenAPI,
             options: {
                 api: Path.resolve(__dirname, '<%=apiPathRel.replace(/\\/g,'/')%>'),
                 handlers: Path.join(__dirname, '<%=handlerDir.replace(/\\/g,'/')%>'),
@@ -66,7 +66,7 @@ Test('<%=path%>', function (t) {
         if (mock.request.headers && mock.request.headers.length > 0) {
             options.headers = mock.request.headers;
         }
-        
+
         const response = await server.inject(options);
 
         t.equal(response.statusCode, <%=(operation.response === 'default') ? 200 : operation.response%>, 'Ok response status');