Merge branch 'canary'

Author: knalli

.eslintrc

@@ -0,0 +1,44 @@
+{
+  "root": true,
+  "extends": "eslint:recommended",
+  "ecmaFeatures": {
+    "arrowFunctions": true,
+    "blockBindings": true,
+    "classes": true,
+    "defaultParams": true,
+    "destructuring": true,
+    "modules": true,
+    "forOf": true,
+    "templateStrings": true
+  },
+  "rules": {
+    "no-console": 1,
+    "curly": 1,
+    "eqeqeq": 1,
+    "no-alert": 2,
+    "no-eval": 2,
+    "no-extra-semi": 1,
+    "no-multi-spaces": 1,
+    "no-unused-vars": 1,
+    "no-unreachable": 1,
+    "array-bracket-spacing": [1, "never"],
+    "block-spacing": [1, "always"],
+    "brace-style": [1, "1tbs", { "allowSingleLine": true }],
+    "camelcase": [1, {"properties": "always"}],
+    "comma-spacing": [1, {"before": false, "after": true}],
+    "comma-style": [1, "last"],
+    "eol-last": 1,
+    "indent": [1, 2, {"SwitchCase": 1}],
+    "space-before-blocks": 1,
+    "space-after-keywords": 1,
+    "semi": 2,
+    "quotes": [1, "single"]
+  },
+  "env": {
+    "browser": true
+  },
+  "globals": {
+    "angular": false,
+    "vertx": false
+  }
+}

.travis.yml

@@ -24,3 +24,7 @@ env:
   - TEST_SCOPE=angular_1.3.x
   - TEST_SCOPE=angular_1.4.x
   - TEST_SCOPE=angular_1.5.x
+
+matrix:
+  allow_failures:
+    - env: TEST_SCOPE=angular_1.5.x

Gruntfile.eslint.json

@@ -0,0 +1,44 @@
+{
+  "root": true,
+  "extends": "eslint:recommended",
+  "ecmaFeatures": {
+    "arrowFunctions": true,
+    "blockBindings": true,
+    "classes": true,
+    "defaultParams": true,
+    "destructuring": true,
+    "modules": true,
+    "forOf": true,
+    "templateStrings": true
+  },
+  "rules": {
+    "no-console": 1,
+    "curly": 1,
+    "eqeqeq": 1,
+    "no-alert": 2,
+    "no-eval": 2,
+    "no-extra-semi": 1,
+    "no-multi-spaces": 1,
+    "no-unused-vars": 1,
+    "no-unreachable": 1,
+    "array-bracket-spacing": [1, "never"],
+    "block-spacing": [1, "always"],
+    "brace-style": [1, "1tbs", { "allowSingleLine": true }],
+    "camelcase": [0],
+    "comma-spacing": [1, {"before": false, "after": true}],
+    "comma-style": [1, "last"],
+    "eol-last": 1,
+    "indent": [1, 2, {"SwitchCase": 1}],
+    "space-before-blocks": 1,
+    "space-after-keywords": 1,
+    "semi": 2,
+    "quotes": [1, "single"]
+  },
+  "env": {
+    "node": true
+  },
+  "globals": {
+    "angular": false,
+    "vertx": false
+  }
+}

Gruntfile.js

@@ -51,14 +51,18 @@ module.exports = function (grunt) {
       dist : 'dist/',
       temp : 'temp/'
     },
-    jshint : {
-      all : ['Gruntfile.js', 'test/unit/*.js', 'src/**/*.js'],
-      options : {
-        esnext : true,
-        eqeqeq : true,
-        globals : {
-          angular : true
+    eslint : {
+      chore: {
+        src : ['Gruntfile.js'],
+        options: {
+          configFile: 'Gruntfile.eslint.json'
         }
+      },
+      src: {
+        src : ['src/**/*.js']
+      },
+      test: {
+        src : ['test/unit/*.js']
       }
     },
     babel : {
@@ -94,9 +98,21 @@ module.exports = function (grunt) {
     },
     watch : {
       scripts : {
-        files : ['Gruntfile.js', 'temp/**/*.js', 'test/**/*.js'],
+        files : ['Gruntfile.js', 'src/**/*.js', 'test/**/*.js'],
         tasks : ['karma:unit']
       },
+      lint_chore : {
+        files : ['Gruntfile.js'],
+        tasks : ['eslint:chore']
+      },
+      lint_src : {
+        files : ['src/**/*.js'],
+        tasks : ['eslint:src']
+      },
+      lint_test : {
+        files : ['test/**/*.js'],
+        tasks : ['eslint:test']
+      },
       ngdocs : {
         files : ['src/**/*.js'],
         tasks : ['ngdocs:api']
@@ -167,13 +183,13 @@ module.exports = function (grunt) {
       }
     },
     conventionalChangelog : {
-      options: {
-        changelogOpts: {
+      options : {
+        changelogOpts : {
           // conventional-changelog options go here
-          preset: 'angular'
+          preset : 'angular'
         }
       },
-      release: {
+      release : {
         src : 'CHANGELOG.md'
       }
     },
@@ -194,17 +210,24 @@ module.exports = function (grunt) {
 
   });
 
+  grunt.loadNpmTasks('gruntify-eslint');
+
   // Compile and test (use "build" for dist/*)
   grunt.registerTask('default', [
     'clean',
-    'jshint',
+    'eslint',
     'karma:unit'
   ]);
 
+  // Linting
+  grunt.registerTask('lint', [
+    'eslint'
+  ]);
+
   // Testing
   grunt.registerTask('test', [
     'clean',
-    'jshint',
+    'eslint',
     'karma:unit'
   ]);
   grunt.registerTask('install-test', [
@@ -225,7 +248,7 @@ module.exports = function (grunt) {
   // Building & releasing
   grunt.registerTask('build', [
     'clean',
-    'jshint',
+    'eslint',
     'karma:unit',
     'browserify:dist',
     'concat:dist-withPolyfill',

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.1",
+  "version": "3.0.2",
   "homepage": "http://github.com/knalli/angular-vertxbus",
   "main": "./dist/angular-vertxbus.js",
   "keywords": [

karma.conf.js

@@ -51,8 +51,6 @@ module.exports = function(config) {
       injectByScope(scope, 'vertx3-eventbus-client/vertxbus.js'),
       'src/lib/**/*.js',
       'src/module.js',
-      'src/vertxbus.wrapper.provider.js',
-      'src/vertxbus.service.provider.js',
       'test/**/*.spec.js'
     ],
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-vertxbus",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "AngularJS facade and service acting as a Vert.x SockJS client",
   "main": "dist/angular-vertxbus.js",
   "keywords": [
@@ -36,39 +36,41 @@
   "devDependencies": {
     "babel": "^5.8.23",
     "babelify": "^6.2.0",
-    "bower": "^1.5.2",
+    "bower": "^1.5.3",
     "browserify": "^11.0.1",
     "browserify-ngannotate": "^1.0.1",
     "browserify-shim": "^3.8.10",
+    "eslint-plugin-angular": "^0.12.0",
+    "estraverse": "^4.1.0",
     "express": "^4.13.3",
     "grunt": "~0.4.5",
     "grunt-babel": "^5.0.1",
     "grunt-bower-install-simple": "^1.1.4",
     "grunt-browserify": "^4.0.0",
     "grunt-contrib-clean": "~0.6.0",
     "grunt-contrib-concat": "^0.5.1",
-    "grunt-contrib-jshint": "~0.11.x",
     "grunt-contrib-uglify": "^0.9.2",
     "grunt-contrib-watch": "~0.6.1",
-    "grunt-conventional-changelog": "^4.1.0",
+    "grunt-conventional-changelog": "^5.0.0",
     "grunt-extract-sourcemap": "^0.1.16",
     "grunt-karma": "^0.12.1",
     "grunt-ngdocs": "^0.2.9",
-    "istanbul": "^0.3.18",
+    "gruntify-eslint": "^1.1.0",
+    "istanbul": "^0.3.22",
     "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-chrome-launcher": "^0.2.1",
     "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",
+    "load-grunt-tasks": "^3.3.0",
     "lodash": "^3.10.1",
-    "mocha": "^2.2.5",
+    "mocha": "^2.3.3",
     "phantomjs": "^1.9.18"
   }
 }

src/vertxbus.service.provider.js src/lib/VertxEventBusServiceProvider.jssrc/vertxbus.service.provider.js renamed to src/lib/VertxEventBusServiceProvider.js

@@ -1,8 +1,6 @@
-import {moduleName} from './config';
-
-import LiveDelegate from './lib/service/delegate/Live';
-import NoopDelegate from './lib/service/delegate/Noop';
-import InterfaceService from './lib/service/InterfaceService';
+import EventBusDelegate from './service/delegate/EventBusDelegate';
+import NoopDelegate from './service/delegate/NoopDelegate';
+import Delegator from './service/Delegator';
 
 /**
  * @ngdoc service
@@ -223,12 +221,12 @@ let VertxEventBusServiceProvider = function () {
     // Current options (merged defaults with application-wide settings)
     let instanceOptions = angular.extend({}, vertxEventBus.getOptions(), options);
     if (instanceOptions.enabled) {
-      return new InterfaceService(
-        new LiveDelegate($rootScope, $interval, $log, $q, vertxEventBus, instanceOptions),
+      return new Delegator(
+        new EventBusDelegate($rootScope, $interval, $log, $q, vertxEventBus, instanceOptions),
         $log
       );
     } else {
-      return new InterfaceService(new NoopDelegate());
+      return new Delegator(new NoopDelegate());
     }
   };
 

src/vertxbus.wrapper.provider.js src/lib/VertxEventBusWrapperProvider.jssrc/vertxbus.wrapper.provider.js renamed to src/lib/VertxEventBusWrapperProvider.js

@@ -1,7 +1,5 @@
-import {moduleName} from './config';
-
-import EventbusWrapper from './lib/wrapper/Eventbus';
-import NoopWrapper from './lib/wrapper/Noop';
+import EventBusAdapter from './adapter/EventBusAdapter';
+import NoopAdapter from './adapter/NoopAdapter';
 
 /**
  * @ngdoc service
@@ -188,14 +186,14 @@ let VertxEventBusWrapperProvider = function () {
     let instanceOptions = angular.extend({}, DEFAULTS, options);
     if (instanceOptions.enabled && vertx && vertx.EventBus) {
       if (instanceOptions.debugEnabled) {
-        $log.debug("[Vert.x EB Stub] Enabled");
+        $log.debug('[Vert.x EB Stub] Enabled');
       }
-      return new EventbusWrapper(vertx.EventBus, $timeout, $log, instanceOptions);
+      return new EventBusAdapter(vertx.EventBus, $timeout, $log, instanceOptions);
     } else {
       if (instanceOptions.debugEnabled) {
-        $log.debug("[Vert.x EB Stub] Disabled");
+        $log.debug('[Vert.x EB Stub] Disabled');
       }
-      return new NoopWrapper(vertx.EventBus);
+      return new NoopAdapter(vertx.EventBus);
     }
   };
 

src/lib/adapter/BaseAdapter.js

@@ -0,0 +1,45 @@
+export default class BaseAdapter {
+
+  constructor() {
+  }
+
+  connect() {
+  }
+
+  reconnect() {
+  }
+
+  close() {
+  }
+
+  login() {
+  }
+
+  send() {
+  }
+
+  publish() {
+  }
+
+  registerHandler() {
+  }
+
+  unregisterHandler() {
+  }
+
+  readyState() {
+  }
+
+  getOptions() {
+    return {};
+  }
+
+  // empty: can be overriden by externals
+  onopen() {
+  }
+
+  // empty: can be overriden by externals
+  onclose() {
+  }
+
+}