Merge branch 'canary'

Author: knalli

.nvmrc

@@ -0,0 +1 @@
+4.1

.travis.yml

@@ -1,16 +1,15 @@
 sudo: false
 language: node_js
 node_js:
-  - "0.12"
+  - "4.1"
 
 addons:
   code_climate:
     repo_token: 94ea5ac76984c311dcbadb53a52dd219400775e20402587a0063d8b9d3a66bca
 
 before_install:
-  - '[ "${TRAVIS_NODE_VERSION}" != "0.8" ] || npm install -g npm@1.4.28'
-  - npm install -g npm@latest
-  - npm install -g grunt-cli codeclimate-test-reporter
+  - npm install -qg npm
+  - npm install -qg grunt-cli codeclimate-test-reporter
 
 before_script:
   - export DISPLAY=:99.0
@@ -24,3 +23,4 @@ env:
   - TEST_SCOPE=angular_1.2.x
   - TEST_SCOPE=angular_1.3.x
   - TEST_SCOPE=angular_1.4.x
+  - TEST_SCOPE=angular_1.5.x

Gruntfile.js

@@ -160,7 +160,7 @@ module.exports = function (grunt) {
       },
       'dist-withPolyfill' : {
         src : [
-          'node_modules/babelify/node_modules/babel-core/browser-polyfill.js',
+          'node_modules/babel-core/browser-polyfill.js',
           'dist/angular-vertxbus.js'
         ],
         dest : 'dist/angular-vertxbus.withpolyfill.js'

bower.json

@@ -2,7 +2,7 @@
   "author": "Jan Philipp",
   "name": "angular-vertxbus",
   "description": "AngularJS facade and service acting as a Vert.x SockJS client",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "homepage": "http://github.com/knalli/angular-vertxbus",
   "main": "./dist/angular-vertxbus.js",
   "keywords": [

karma.conf.js

@@ -44,19 +44,19 @@ module.exports = function(config) {
 
     // list of files / patterns to load in the browser
     files: [
-      'node_modules/karma-babel-preprocessor/node_modules/babel-core/browser-polyfill.js',
+      'node_modules/babel-core/browser-polyfill.js',
       injectByScope(scope, 'angular/angular.js'),
       injectByScope(scope, 'angular-mocks/angular-mocks.js'),
       'test/unit/mock/sockjs.js',
       injectByScope(scope, 'vertx3-eventbus-client/vertxbus.js'),
       'src/lib/**/*.js',
-      'src/vertxbus.module.js',
+      'src/module.js',
       'src/vertxbus.wrapper.provider.js',
       'src/vertxbus.service.provider.js',
-      'test/**/*Spec.js'
+      'test/**/*.spec.js'
     ],
 
-    frameworks: ['browserify', 'mocha', 'expect'],
+    frameworks: ['browserify', 'mocha', 'expect', 'jasmine'],
 
 
     // list of files to exclude
@@ -72,6 +72,7 @@ module.exports = function(config) {
     preprocessors: (function () {
       var config = {
         'src/**/*.js': [ 'browserify' ],
+        'test/unit/lib/**/*.js': [ 'browserify' ],
         'test/unit/mock/sockjs.js': [ 'browserify' ]
       };
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-vertxbus",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "AngularJS facade and service acting as a Vert.x SockJS client",
   "main": "dist/angular-vertxbus.js",
   "keywords": [
@@ -9,6 +9,9 @@
     "facade",
     "websocket"
   ],
+  "engines": {
+    "node": ">=4.0"
+  },
   "scripts": {
     "prepublish": "bower install",
     "test": "grunt install-test && grunt test",
@@ -37,7 +40,7 @@
     "browserify": "^11.0.1",
     "browserify-ngannotate": "^1.0.1",
     "browserify-shim": "^3.8.10",
-    "express": "~4.12.0",
+    "express": "^4.13.3",
     "grunt": "~0.4.5",
     "grunt-babel": "^5.0.1",
     "grunt-bower-install-simple": "^1.1.4",
@@ -49,20 +52,23 @@
     "grunt-contrib-watch": "~0.6.1",
     "grunt-conventional-changelog": "^4.1.0",
     "grunt-extract-sourcemap": "^0.1.16",
-    "grunt-karma": "^0.11.2",
+    "grunt-karma": "^0.12.1",
     "grunt-ngdocs": "^0.2.9",
     "istanbul": "^0.3.18",
-    "karma": "^0.12.37",
-    "karma-babel-preprocessor": "5.2.1",
+    "jasmine-core": "^2.3.4",
+    "karma": "^0.13.9",
+    "karma-babel-preprocessor": "^5.2.2",
     "karma-browserify": "^4.3.0",
     "karma-chrome-launcher": "^0.2.0",
-    "karma-coverage": "^0.2.7",
+    "karma-coverage": "^0.5.2",
     "karma-expect": "~1.1.0",
     "karma-firefox-launcher": "~0.1.3",
+    "karma-jasmine": "^0.3.6",
     "karma-mocha": "^0.2.0",
     "karma-phantomjs-launcher": "^0.2.1",
     "load-grunt-tasks": "~3.2.0",
     "lodash": "^3.10.1",
-    "mocha": "^2.2.5"
+    "mocha": "^2.2.5",
+    "phantomjs": "^1.9.18"
   }
 }

src/index.js

@@ -1,7 +1,3 @@
-import {moduleName} from './config';
-
-import './vertxbus.module';
-import './vertxbus.wrapper.provider.js';
-import './vertxbus.service.provider.js';
+import moduleName from './module';
 
 export default moduleName;

src/vertxbus.module.js src/module.jssrc/vertxbus.module.js renamed to src/module.js

@@ -1,5 +1,8 @@
 import {moduleName} from './config';
 
+import VertxEventBusWrapperProvider from './vertxbus.wrapper.provider';
+import VertxEventBusServiceProvider from './vertxbus.service.provider';
+
 /**
  * @ngdoc overview
  * @module knalli.angular-vertxbus
@@ -43,5 +46,11 @@ import {moduleName} from './config';
  *
  * However, if you are looking for a simple, clean and promised based high api, the service is much better you.
  */
-angular
-  .module(moduleName, ['ng']);
+export default angular
+
+  .module(moduleName, ['ng'])
+
+  .provider('vertxEventBus', VertxEventBusWrapperProvider)
+  .provider('vertxEventBusService', VertxEventBusServiceProvider)
+
+  .name;