Skip to content
This repository was archived by the owner on Jun 14, 2019. It is now read-only.

Commit e9a0196

Browse files
committed
Release 3.1.0
1 parent 4c8ed1e commit e9a0196

File tree

5 files changed

+1051
-920
lines changed

5 files changed

+1051
-920
lines changed

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
<a name="3.1.0"></a>
2+
# [3.1.0](https://github.com/knalli/angular-vertxbus/compare/3.0.2...v3.1.0) (2015-10-25)
3+
4+
5+
### Bug Fixes
6+
7+
* **build:** fix invalid license header in artifacts' headers ([f0597fb](https://github.com/knalli/angular-vertxbus/commit/f0597fb))
8+
9+
### Features
10+
11+
* **wrapper:** introduce `.disableAutoConnect()` #71 ([ce3a0af](https://github.com/knalli/angular-vertxbus/commit/ce3a0af))
12+
13+
14+
115
<a name="3.0.2"></a>
216
## [3.0.2](https://github.com/knalli/angular-vertxbus/compare/3.0.1...v3.0.2) (2015-10-08)
317

dist/angular-vertxbus.js

Lines changed: 122 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
/*! angular-vertxbus - v3.0.2 - 2015-10-09
1+
/*! angular-vertxbus - v3.1.0 - 2015-10-25
22
* http://github.com/knalli/angular-vertxbus
3-
* Copyright (c) 2015 Jan Philipp; Licensed */
3+
* Copyright (c) 2015 Jan Philipp; Licensed MIT */
44
(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
55
'use strict';
66

@@ -27,7 +27,7 @@ var _module3 = _interopRequireDefault(_module2);
2727
exports['default'] = _module3['default'];
2828
module.exports = exports['default'];
2929

30-
},{"./module":14}],3:[function(require,module,exports){
30+
},{"./module":15}],3:[function(require,module,exports){
3131
'use strict';
3232

3333
Object.defineProperty(exports, '__esModule', {
@@ -308,6 +308,10 @@ var _adapterNoopAdapter = require('./adapter/NoopAdapter');
308308

309309
var _adapterNoopAdapter2 = _interopRequireDefault(_adapterNoopAdapter);
310310

311+
var _supportConnectionConfigHolder = require('./support/ConnectionConfigHolder');
312+
313+
var _supportConnectionConfigHolder2 = _interopRequireDefault(_supportConnectionConfigHolder);
314+
311315
/**
312316
* @ngdoc service
313317
* @module knalli.angular-vertxbus
@@ -319,6 +323,7 @@ var _adapterNoopAdapter2 = _interopRequireDefault(_adapterNoopAdapter);
319323
var DEFAULTS = {
320324
enabled: true,
321325
debugEnabled: false,
326+
initialConnectEnabled: true,
322327
urlServer: location.protocol + '//' + location.hostname + ((function () {
323328
if (location.port) {
324329
return ':' + location.port;
@@ -355,6 +360,25 @@ var VertxEventBusWrapperProvider = function VertxEventBusWrapperProvider() {
355360
return _this;
356361
};
357362

363+
/**
364+
* @ngdoc method
365+
* @module knalli.angular-vertxbus
366+
* @methodOf knalli.angular-vertxbus.vertxEventBusProvider
367+
* @name .#disableAutoConnect
368+
*
369+
* @description
370+
* Disables the auto connection feature.
371+
*
372+
* This feature will be only available if `enable == true`.
373+
*
374+
* @param {boolean} [value=true] auto connect on startup
375+
* @returns {object} this
376+
*/
377+
this.disableAutoConnect = function () {
378+
options.initialConnectEnabled = false;
379+
return _this;
380+
};
381+
358382
/**
359383
* @ngdoc method
360384
* @module knalli.angular-vertxbus
@@ -510,6 +534,15 @@ var VertxEventBusWrapperProvider = function VertxEventBusWrapperProvider() {
510534
if (instanceOptions.debugEnabled) {
511535
$log.debug('[Vert.x EB Stub] Enabled');
512536
}
537+
538+
// aggregate server connection params
539+
instanceOptions.connectionConfig = new _supportConnectionConfigHolder2['default']({
540+
urlServer: instanceOptions.urlServer,
541+
urlPath: instanceOptions.urlPath
542+
});
543+
delete instanceOptions.urlServer;
544+
delete instanceOptions.urlPath;
545+
513546
return new _adapterEventBusAdapter2['default'](vertx.EventBus, $timeout, $log, instanceOptions);
514547
} else {
515548
if (instanceOptions.debugEnabled) {
@@ -524,7 +557,7 @@ var VertxEventBusWrapperProvider = function VertxEventBusWrapperProvider() {
524557
exports['default'] = VertxEventBusWrapperProvider;
525558
module.exports = exports['default'];
526559

527-
},{"./adapter/EventBusAdapter":6,"./adapter/NoopAdapter":7}],5:[function(require,module,exports){
560+
},{"./adapter/EventBusAdapter":6,"./adapter/NoopAdapter":7,"./support/ConnectionConfigHolder":12}],5:[function(require,module,exports){
528561
"use strict";
529562

530563
Object.defineProperty(exports, "__esModule", {
@@ -541,6 +574,9 @@ var BaseAdapter = (function () {
541574
}
542575

543576
_createClass(BaseAdapter, [{
577+
key: "configureConnection",
578+
value: function configureConnection() {}
579+
}, {
544580
key: "connect",
545581
value: function connect() {}
546582
}, {
@@ -599,7 +635,7 @@ Object.defineProperty(exports, '__esModule', {
599635

600636
var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
601637

602-
var _get = function get(_x2, _x3, _x4) { var _again = true; _function: while (_again) { var object = _x2, property = _x3, receiver = _x4; desc = parent = getter = undefined; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x2 = parent; _x3 = property; _x4 = receiver; _again = true; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } };
638+
var _get = function get(_x3, _x4, _x5) { var _again = true; _function: while (_again) { var object = _x3, property = _x4, receiver = _x5; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x3 = parent; _x4 = property; _x5 = receiver; _again = true; desc = parent = undefined; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } };
603639

604640
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
605641

@@ -613,6 +649,10 @@ var _BaseAdapter2 = require('./BaseAdapter');
613649

614650
var _BaseAdapter3 = _interopRequireDefault(_BaseAdapter2);
615651

652+
var _supportConnectionConfigHolder = require('./../support/ConnectionConfigHolder');
653+
654+
var _supportConnectionConfigHolder2 = _interopRequireDefault(_supportConnectionConfigHolder);
655+
616656
/**
617657
* @ngdoc service
618658
* @module vertx
@@ -696,8 +736,8 @@ var EventBusAdapter = (function (_BaseAdapter) {
696736
function EventBusAdapter(EventBus, $timeout, $log, _ref) {
697737
var enabled = _ref.enabled;
698738
var debugEnabled = _ref.debugEnabled;
699-
var urlServer = _ref.urlServer;
700-
var urlPath = _ref.urlPath;
739+
var initialConnectEnabled = _ref.initialConnectEnabled;
740+
var connectionConfig = _ref.connectionConfig;
701741
var reconnectEnabled = _ref.reconnectEnabled;
702742
var sockjsReconnectInterval = _ref.sockjsReconnectInterval;
703743
var sockjsOptions = _ref.sockjsOptions;
@@ -712,23 +752,46 @@ var EventBusAdapter = (function (_BaseAdapter) {
712752
this.options = {
713753
enabled: enabled,
714754
debugEnabled: debugEnabled,
715-
urlServer: urlServer,
716-
urlPath: urlPath,
755+
initialConnectEnabled: initialConnectEnabled,
756+
connectionConfig: connectionConfig,
717757
reconnectEnabled: reconnectEnabled,
718758
sockjsReconnectInterval: sockjsReconnectInterval,
719759
sockjsOptions: sockjsOptions
720760
};
721761
this.disconnectTimeoutEnabled = true;
722-
// asap create connection
723-
this.connect();
762+
if (initialConnectEnabled) {
763+
// asap create connection
764+
this.connect();
765+
}
724766
}
725767

768+
/**
769+
* @ngdoc method
770+
* @module knalli.angular-vertxbus
771+
* @methodOf knalli.angular-vertxbus.vertxEventBus
772+
* @name .#configureConnect
773+
*
774+
* @description
775+
* Reconfigure the connection details.
776+
*
777+
* @param {string} urlServer
778+
* @param {string} [urlPath=/eventbus]
779+
*/
780+
726781
_createClass(EventBusAdapter, [{
782+
key: 'configureConnection',
783+
value: function configureConnection(urlServer) {
784+
var urlPath = arguments.length <= 1 || arguments[1] === undefined ? '/eventbus' : arguments[1];
785+
786+
this.options.connectionConfig = new _supportConnectionConfigHolder2['default']({ urlServer: urlServer, urlPath: urlPath });
787+
return this;
788+
}
789+
}, {
727790
key: 'connect',
728791
value: function connect() {
729792
var _this = this;
730793

731-
var url = '' + this.options.urlServer + this.options.urlPath;
794+
var url = '' + this.options.connectionConfig.urlServer + this.options.connectionConfig.urlPath;
732795
if (this.options.debugEnabled) {
733796
this.$log.debug('[Vert.x EB Stub] Enabled: connecting \'' + url + '\'');
734797
}
@@ -995,14 +1058,14 @@ var EventBusAdapter = (function (_BaseAdapter) {
9951058
exports['default'] = EventBusAdapter;
9961059
module.exports = exports['default'];
9971060

998-
},{"../../config.js":1,"./BaseAdapter":5}],7:[function(require,module,exports){
1061+
},{"../../config.js":1,"./../support/ConnectionConfigHolder":12,"./BaseAdapter":5}],7:[function(require,module,exports){
9991062
'use strict';
10001063

10011064
Object.defineProperty(exports, '__esModule', {
10021065
value: true
10031066
});
10041067

1005-
var _get = function get(_x, _x2, _x3) { var _again = true; _function: while (_again) { var object = _x, property = _x2, receiver = _x3; desc = parent = getter = undefined; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x = parent; _x2 = property; _x3 = receiver; _again = true; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } };
1068+
var _get = function get(_x, _x2, _x3) { var _again = true; _function: while (_again) { var object = _x, property = _x2, receiver = _x3; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x = parent; _x2 = property; _x3 = receiver; _again = true; desc = parent = undefined; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } };
10061069

10071070
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
10081071

@@ -1290,7 +1353,7 @@ Object.defineProperty(exports, '__esModule', {
12901353

12911354
var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
12921355

1293-
var _get = function get(_x6, _x7, _x8) { var _again = true; _function: while (_again) { var object = _x6, property = _x7, receiver = _x8; desc = parent = getter = undefined; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x6 = parent; _x7 = property; _x8 = receiver; _again = true; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } };
1356+
var _get = function get(_x6, _x7, _x8) { var _again = true; _function: while (_again) { var object = _x6, property = _x7, receiver = _x8; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x6 = parent; _x7 = property; _x8 = receiver; _again = true; desc = parent = undefined; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } };
12941357

12951358
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
12961359

@@ -1897,14 +1960,14 @@ var EventBusDelegate = (function (_BaseDelegate) {
18971960
exports['default'] = EventBusDelegate;
18981961
module.exports = exports['default'];
18991962

1900-
},{"../../../config":1,"./../../support/Queue":12,"./../../support/SimpleMap":13,"./BaseDelegate":9}],11:[function(require,module,exports){
1963+
},{"../../../config":1,"./../../support/Queue":13,"./../../support/SimpleMap":14,"./BaseDelegate":9}],11:[function(require,module,exports){
19011964
'use strict';
19021965

19031966
Object.defineProperty(exports, '__esModule', {
19041967
value: true
19051968
});
19061969

1907-
var _get = function get(_x, _x2, _x3) { var _again = true; _function: while (_again) { var object = _x, property = _x2, receiver = _x3; desc = parent = getter = undefined; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x = parent; _x2 = property; _x3 = receiver; _again = true; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } };
1970+
var _get = function get(_x, _x2, _x3) { var _again = true; _function: while (_again) { var object = _x, property = _x2, receiver = _x3; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x = parent; _x2 = property; _x3 = receiver; _again = true; desc = parent = undefined; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } };
19081971

19091972
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
19101973

@@ -1932,6 +1995,46 @@ exports['default'] = NoopDelegate;
19321995
module.exports = exports['default'];
19331996

19341997
},{"./BaseDelegate":9}],12:[function(require,module,exports){
1998+
"use strict";
1999+
2000+
Object.defineProperty(exports, "__esModule", {
2001+
value: true
2002+
});
2003+
2004+
var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
2005+
2006+
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
2007+
2008+
var ConnectionConfigHolder = (function () {
2009+
function ConnectionConfigHolder(_ref) {
2010+
var urlServer = _ref.urlServer;
2011+
var urlPath = _ref.urlPath;
2012+
2013+
_classCallCheck(this, ConnectionConfigHolder);
2014+
2015+
this._urlServer = urlServer;
2016+
this._urlPath = urlPath;
2017+
}
2018+
2019+
_createClass(ConnectionConfigHolder, [{
2020+
key: "urlServer",
2021+
get: function get() {
2022+
return this._urlServer;
2023+
}
2024+
}, {
2025+
key: "urlPath",
2026+
get: function get() {
2027+
return this._urlPath;
2028+
}
2029+
}]);
2030+
2031+
return ConnectionConfigHolder;
2032+
})();
2033+
2034+
exports["default"] = ConnectionConfigHolder;
2035+
module.exports = exports["default"];
2036+
2037+
},{}],13:[function(require,module,exports){
19352038
/*
19362039
Simple queue implementation
19372040
@@ -1995,7 +2098,7 @@ var Queue = (function () {
19952098
exports["default"] = Queue;
19962099
module.exports = exports["default"];
19972100

1998-
},{}],13:[function(require,module,exports){
2101+
},{}],14:[function(require,module,exports){
19992102
/*
20002103
Simple Map implementation
20012104
@@ -2109,7 +2212,7 @@ var SimpleMap = (function () {
21092212
exports["default"] = SimpleMap;
21102213
module.exports = exports["default"];
21112214

2112-
},{}],14:[function(require,module,exports){
2215+
},{}],15:[function(require,module,exports){
21132216
'use strict';
21142217

21152218
Object.defineProperty(exports, '__esModule', {

dist/angular-vertxbus.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)