Skip to content

Commit

Permalink
hapi 8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mwawrusch committed Jan 1, 2015
1 parent 5aa43b9 commit 91d3a59
Show file tree
Hide file tree
Showing 18 changed files with 55 additions and 52 deletions.
1 change: 1 addition & 0 deletions Gruntfile.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ module.exports = (grunt) ->
npm_install:
command: "npm install"

release: {}
env:
dev:
NODE_ENV: "development"
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[![Dependency Status](https://gemnasium.com/codedoctor/hapi-routes-tenants-setup.svg)](https://gemnasium.com/codedoctor/hapi-routes-tenants-setup)
[![NPM Downloads](http://img.shields.io/npm/dm/hapi-routes-tenants-setup.svg)](https://www.npmjs.org/package/hapi-routes-tenants-setup)
[![Issues](http://img.shields.io/github/issues/codedoctor/hapi-routes-tenants-setup.svg)](https://github.com/codedoctor/hapi-routes-tenants-setup/issues)
[![HAPI 6.0](http://img.shields.io/badge/hapi-6.0-blue.svg)](http://hapijs.com)
[![HAPI 8.0](http://img.shields.io/badge/hapi-8.0-blue.svg)](http://hapijs.com)
[![API Documentation](http://img.shields.io/badge/API-Documentation-ff69b4.svg)](http://coffeedoc.info/github/codedoctor/hapi-routes-tenants-setup)

(C) 2014 Martin Wawrusch
Expand Down Expand Up @@ -63,7 +63,7 @@ curl -H "Content-Type: application/json" -X POST -d @samples/sample.json https:/

## Dependencies

* HAPI >= 6.5.0
* HAPI >= 8.0.0,hapi-oauth-store-multi-tenant,hapi-user-store-multi-tenant

## Plugins that must be loaded into your hapi server:

Expand Down
2 changes: 1 addition & 1 deletion doc/alphabetical_index.html
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ <h2>File Listing A-Z</h2>
</div>
</div>
<div id='footer'>
January 01, 15 13:20:25 by
January 01, 15 13:27:49 by
<a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
Codo
</a>
Expand Down
6 changes: 3 additions & 3 deletions doc/extra/README.md.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<a href="https://gemnasium.com/codedoctor/hapi-routes-tenants-setup"><img src="https://gemnasium.com/codedoctor/hapi-routes-tenants-setup.svg" alt="Dependency Status"></a>
<a href="https://www.npmjs.org/package/hapi-routes-tenants-setup"><img src="http://img.shields.io/npm/dm/hapi-routes-tenants-setup.svg" alt="NPM Downloads"></a>
<a href="https://github.com/codedoctor/hapi-routes-tenants-setup/issues"><img src="http://img.shields.io/github/issues/codedoctor/hapi-routes-tenants-setup.svg" alt="Issues"></a>
<a href="http://hapijs.com"><img src="http://img.shields.io/badge/hapi-6.0-blue.svg" alt="HAPI 6.0"></a>
<a href="http://hapijs.com"><img src="http://img.shields.io/badge/hapi-8.0-blue.svg" alt="HAPI 8.0"></a>
<a href="http://coffeedoc.info/github/codedoctor/hapi-routes-tenants-setup"><img src="http://img.shields.io/badge/API-Documentation-ff69b4.svg" alt="API Documentation"></a></p><p>(C) 2014 Martin Wawrusch</p><p>Provides an enpoint to set up a tenant with</p><ul>
<li>initial users</li>
<li>oauth scopes</li>
Expand Down Expand Up @@ -74,7 +74,7 @@
</code></pre>
<h2 id="dependencies">Dependencies</h2>
<ul>
<li>HAPI &gt;= 6.5.0</li>
<li>HAPI &gt;= 8.0.0,hapi-oauth-store-multi-tenant,hapi-user-store-multi-tenant</li>
</ul>
<h2 id="plugins-that-must-be-loaded-into-your-hapi-server-">Plugins that must be loaded into your hapi server:</h2>
<ul>
Expand Down Expand Up @@ -115,7 +115,7 @@ <h2 id="copyright">Copyright</h2><p>Copyright (c) 2014 Martin Wawrusch </p>
</div>
</div>
<div id='footer'>
January 01, 15 13:20:25 by
January 01, 15 13:27:49 by
<a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
Codo
</a>
Expand Down
2 changes: 1 addition & 1 deletion doc/file/src/helper-obj-to-rest.coffee.html
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ <h2>Variables Summary</h2>
</dl>
</div>
<div id='footer'>
January 01, 15 13:20:25 by
January 01, 15 13:27:49 by
<a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
Codo
</a>
Expand Down
2 changes: 1 addition & 1 deletion doc/file/src/i18n.coffee.html
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ <h2>Variables Summary</h2>
</dl>
</div>
<div id='footer'>
January 01, 15 13:20:25 by
January 01, 15 13:27:49 by
<a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
Codo
</a>
Expand Down
6 changes: 3 additions & 3 deletions doc/file/src/index.coffee.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ <h2>Method Summary</h2>
<a href='#register-'>
~
(void)
<b>register</b><span>(plugin, options = {}, cb)</span>
<b>register</b><span>(server, options = {}, cb)</span>
</a>
</span>
<span class='desc'>
Expand All @@ -56,7 +56,7 @@ <h2>Method Details</h2>
<p class='signature' id='register-'>
~
(void)
<b>register</b><span>(plugin, options = {}, cb)</span>
<b>register</b><span>(server, options = {}, cb)</span>
<br>
</p>
<div class='docstring'>
Expand Down Expand Up @@ -137,7 +137,7 @@ <h3>
</div>
</div>
<div id='footer'>
January 01, 15 13:20:25 by
January 01, 15 13:27:49 by
<a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
Codo
</a>
Expand Down
2 changes: 1 addition & 1 deletion doc/file/src/routes.coffee.html
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ <h2>Method Details</h2>
</div>
</div>
<div id='footer'>
January 01, 15 13:20:25 by
January 01, 15 13:27:49 by
<a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
Codo
</a>
Expand Down
2 changes: 1 addition & 1 deletion doc/file/src/validation-schemas.coffee.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ <h2>Variables Summary</h2>
</dl>
</div>
<div id='footer'>
January 01, 15 13:20:25 by
January 01, 15 13:27:49 by
<a href='https://github.com/coffeedoc/codo' title='CoffeeScript API documentation generator'>
Codo
</a>
Expand Down
6 changes: 3 additions & 3 deletions lib/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/routes.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 21 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hapi-routes-tenants-setup",
"version": "1.0.7",
"version": "2.0.0",
"private": false,
"main": "lib/index.js",
"repository": {
Expand All @@ -13,36 +13,38 @@
"description": "Provides an HAPI endpoint to set up a new tenant.",
"dependencies": {
"async": "0.9.0",
"hoek": ">=2.4.1",
"boom": ">=2.5.1",
"bson": ">=0.2.11",
"joi": ">=4.6.2",
"underscore": ">=1.7.0"
"hoek": "2.10.0",
"boom": "2.6.1",
"bson": "0.2.16",
"joi": "5.0.2",
"underscore": "1.7.0"
},
"peerDependencies": {
"hapi": ">=6.5.0 <8"
"hapi": ">=8.0.0",
"hapi-oauth-store-multi-tenant": ">=2.0.0",
"hapi-user-store-multi-tenant": ">=2.0.0"
},
"devDependencies": {
"blanket": "1.1.6",
"codo": "2.0.9",
"coffee-script": "1.7.1",
"coffee-script": "1.8.0",
"grunt": "0.4.5",
"grunt-cli": "0.1.13",
"grunt-contrib-coffee": "0.11.0",
"grunt-contrib-coffee": "0.12.0",
"grunt-contrib-watch": "0.6.1",
"grunt-codo": "0.2.0",
"grunt-env": "0.4.1",
"grunt-env": "0.4.2",
"grunt-mocha-cov": "0.3.0",
"grunt-mocha-test": "0.11.0",
"grunt-release": "0.7.0",
"grunt-shell": "0.7.0",
"hapi": "6.5.0",
"hapi-user-store-multi-tenant": "1.0.x",
"hapi-oauth-store-multi-tenant": "1.2.x",
"grunt-mocha-test": "0.12.4",
"grunt-release": "0.9.0",
"grunt-shell": "1.1.1",
"hapi": "8.0.0",
"hapi-user-store-multi-tenant": "2.0.1",
"hapi-oauth-store-multi-tenant": "2.0.1",
"matchdep": "0.3.0",
"mocha": "1.21.4",
"mongoose": "3.8.14",
"should": "4.0.4"
"mocha": "2.1.0",
"mongoose": "3.8.21",
"should": "4.4.2"
},
"config": {
"blanket": {
Expand Down
6 changes: 3 additions & 3 deletions src/index.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Main entry point for the plugin
Please note that the routesBaseName is only included to make the life easier while doing the config of your HAPI server.
###
module.exports.register = (plugin, options = {}, cb) ->
module.exports.register = (server, options = {}, cb) ->

defaults =
routesBaseName: '/tenants/setup'
Expand All @@ -28,9 +28,9 @@ module.exports.register = (plugin, options = {}, cb) ->

options = Hoek.applyToDefaults defaults, options

routes plugin,options
routes server,options

plugin.expose 'i18n',i18n
server.expose 'i18n',i18n

cb()

Expand Down
3 changes: 1 addition & 2 deletions test/index-tests.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ describe 'index has been loaded', ->
return cb err if err

should.exist server
server.should.have.property "pack"

should.exist server.pack.plugins['hapi-routes-tenants-setup']
should.exist server.plugins['hapi-routes-tenants-setup']

cb null
Loading

0 comments on commit 91d3a59

Please sign in to comment.