Skip to content

Commit

Permalink
Added test
Browse files Browse the repository at this point in the history
  • Loading branch information
Ievgeniia Maltseva committed Mar 19, 2018
1 parent c59f62b commit bae376b
Show file tree
Hide file tree
Showing 8 changed files with 184 additions and 196 deletions.
94 changes: 47 additions & 47 deletions dist/es/overwritable.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,53 +5,53 @@
import RxError from './rx-error';

var funs = {
/**
* validates if a password can be used
* @overwritten by plugin (optional)
* @param {any} password
* @throws if password not valid
* @return {void}
*/
validatePassword: function validatePassword() {
throw RxError.pluginMissing('encryption');
},

/**
* creates a key-compressor for the given schema
* @param {RxSchema} schema
* @return {KeyCompressor}
*/
createKeyCompressor: function createKeyCompressor() {
throw RxError.pluginMissing('keycompression');
},

/**
* creates a leader-elector for the given database
* @param {RxDatabase} database
* @return {LeaderElector}
*/
createLeaderElector: function createLeaderElector() {
throw RxError.pluginMissing('leaderelection');
},


/**
* checks if the given adapter can be used
* @return {any} adapter
*/
checkAdapter: function checkAdapter() {
throw RxError.pluginMissing('adapter-check');
},

/**
* overwritte to map error-codes to text-messages
* @param {string} message
* @return {string}
*/
tunnelErrorMessage: function tunnelErrorMessage(message) {
// TODO better text with link
return 'RxDB Error-Code ' + message + '.\n - To find out what this means, use the error-messages-plugin https://pubkey.github.io/rxdb/custom-build.html#error-messages\n - Or search for this code https://github.com/pubkey/rxdb/search?l=JavaScript&q=' + message + '%3A\n ';
}
/**
* validates if a password can be used
* @overwritten by plugin (optional)
* @param {any} password
* @throws if password not valid
* @return {void}
*/
validatePassword: function validatePassword() {
throw RxError.pluginMissing('encryption');
},

/**
* creates a key-compressor for the given schema
* @param {RxSchema} schema
* @return {KeyCompressor}
*/
createKeyCompressor: function createKeyCompressor() {
throw RxError.pluginMissing('keycompression');
},

/**
* creates a leader-elector for the given database
* @param {RxDatabase} database
* @return {LeaderElector}
*/
createLeaderElector: function createLeaderElector() {
throw RxError.pluginMissing('leaderelection');
},


/**
* checks if the given adapter can be used
* @return {any} adapter
*/
checkAdapter: function checkAdapter() {
throw RxError.pluginMissing('adapter-check');
},

/**
* overwritte to map error-codes to text-messages
* @param {string} message
* @return {string}
*/
tunnelErrorMessage: function tunnelErrorMessage(message) {
// TODO better text with link
return 'RxDB Error-Code ' + message + '.\n - To find out what this means, use the error-messages-plugin https://pubkey.github.io/rxdb/custom-build.html#error-messages\n - Or search for this code https://github.com/pubkey/rxdb/search?l=JavaScript&q=' + message + '%3A\n ';
}
};

export default funs;
31 changes: 11 additions & 20 deletions dist/es/rx-database.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ var USED_COMBINATIONS = {};
var DB_COUNT = 0;

export var RxDatabase = function () {
function RxDatabase(name, adapter, password, multiInstance, options, pouchSettings) {
function RxDatabase(name, adapter, password, multiInstance, options) {
_classCallCheck(this, RxDatabase);

if (typeof name !== 'undefined') DB_COUNT++;
Expand All @@ -38,7 +38,6 @@ export var RxDatabase = function () {
this.password = password;
this.multiInstance = multiInstance;
this.options = options;
this.pouchSettings = pouchSettings;
this.idleQueue = new IdleQueue();
this.token = randomToken(10);

Expand Down Expand Up @@ -171,7 +170,7 @@ export var RxDatabase = function () {
RxDatabase.prototype._spawnPouchDB = function _spawnPouchDB(collectionName, schemaVersion) {
var pouchSettings = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};

return _spawnPouchDB2(this.name, this.adapter, collectionName, schemaVersion, pouchSettings, this.pouchSettings);
return _spawnPouchDB2(this.name, this.adapter, collectionName, schemaVersion, pouchSettings);
};

RxDatabase.prototype.waitForLeadership = function () {
Expand Down Expand Up @@ -718,13 +717,13 @@ export var RxDatabase = function () {
_createClass(RxDatabase, [{
key: '_adminPouch',
get: function get() {
if (!this.__adminPouch) this.__adminPouch = _internalAdminPouch(this.name, this.adapter, this.pouchSettings);
if (!this.__adminPouch) this.__adminPouch = _internalAdminPouch(this.name, this.adapter);
return this.__adminPouch;
}
}, {
key: '_collectionsPouch',
get: function get() {
if (!this.__collectionsPouch) this.__collectionsPouch = _internalCollectionsPouch(this.name, this.adapter, this.pouchSettings);
if (!this.__collectionsPouch) this.__collectionsPouch = _internalCollectionsPouch(this.name, this.adapter);
return this.__collectionsPouch;
}
}, {
Expand Down Expand Up @@ -803,9 +802,7 @@ export var create = function () {
_ref8$ignoreDuplicate = _ref8.ignoreDuplicate,
ignoreDuplicate = _ref8$ignoreDuplicate === undefined ? false : _ref8$ignoreDuplicate,
_ref8$options = _ref8.options,
options = _ref8$options === undefined ? {} : _ref8$options,
_ref8$pouchSettings = _ref8.pouchSettings,
pouchSettings = _ref8$pouchSettings === undefined ? {} : _ref8$pouchSettings;
options = _ref8$options === undefined ? {} : _ref8$options;
var db;
return _regeneratorRuntime.wrap(function _callee7$(_context7) {
while (1) {
Expand Down Expand Up @@ -856,7 +853,7 @@ export var create = function () {
if (!USED_COMBINATIONS[name]) USED_COMBINATIONS[name] = [];
USED_COMBINATIONS[name].push(adapter);

db = new RxDatabase(name, adapter, password, multiInstance, options, pouchSettings);
db = new RxDatabase(name, adapter, password, multiInstance, options);
_context7.next = 16;
return db.prepare();

Expand All @@ -880,35 +877,29 @@ export var create = function () {

function _spawnPouchDB2(dbName, adapter, collectionName, schemaVersion) {
var pouchSettings = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
var pouchOptions = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : {};

var pouchLocation = dbName + '-rxdb-' + schemaVersion + '-' + collectionName;
var pouchDbParameters = {
location: pouchLocation,
adapter: util.adapterObject(adapter),
settings: pouchSettings
};
var pouchDBOptions = Object.assign({}, pouchDbParameters.adapter, pouchOptions);
runPluginHooks('preCreatePouchDb', pouchDbParameters);
return new PouchDB(pouchDbParameters.location, pouchDBOptions, pouchDbParameters.settings);
return new PouchDB(pouchDbParameters.location, pouchDbParameters.adapter, pouchDbParameters.settings);
}

function _internalAdminPouch(name, adapter) {
var pouchOptions = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};

return _spawnPouchDB2(name, adapter, '_admin', 0, {
auto_compaction: false, // no compaction because this only stores local documents
revs_limit: 1
}, pouchOptions);
});
}

function _internalCollectionsPouch(name, adapter) {
var pouchOptions = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};

return _spawnPouchDB2(name, adapter, '_collections', 0, {
auto_compaction: false, // no compaction because this only stores local documents
revs_limit: 1
}, pouchOptions);
});
}

export var removeDatabase = function () {
Expand Down Expand Up @@ -953,7 +944,7 @@ export var removeDatabase = function () {
}, _callee8, this);
}));

return function removeDatabase(_x10, _x11) {
return function removeDatabase(_x7, _x8) {
return _ref9.apply(this, arguments);
};
}();
Expand Down Expand Up @@ -981,7 +972,7 @@ export var checkAdapter = function () {
}, _callee9, this);
}));

return function checkAdapter(_x12) {
return function checkAdapter(_x9) {
return _ref10.apply(this, arguments);
};
}();;
Expand Down
86 changes: 43 additions & 43 deletions dist/lib/overwritable.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

Object.defineProperty(exports, "__esModule", {
value: true
value: true
});

var _rxError = require('./rx-error');
Expand All @@ -11,53 +11,53 @@ var _rxError2 = _interopRequireDefault(_rxError);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }

var funs = {
/**
* validates if a password can be used
* @overwritten by plugin (optional)
* @param {any} password
* @throws if password not valid
* @return {void}
*/
validatePassword: function validatePassword() {
throw _rxError2['default'].pluginMissing('encryption');
},
/**
* validates if a password can be used
* @overwritten by plugin (optional)
* @param {any} password
* @throws if password not valid
* @return {void}
*/
validatePassword: function validatePassword() {
throw _rxError2['default'].pluginMissing('encryption');
},

/**
* creates a key-compressor for the given schema
* @param {RxSchema} schema
* @return {KeyCompressor}
*/
createKeyCompressor: function createKeyCompressor() {
throw _rxError2['default'].pluginMissing('keycompression');
},
/**
* creates a key-compressor for the given schema
* @param {RxSchema} schema
* @return {KeyCompressor}
*/
createKeyCompressor: function createKeyCompressor() {
throw _rxError2['default'].pluginMissing('keycompression');
},

/**
* creates a leader-elector for the given database
* @param {RxDatabase} database
* @return {LeaderElector}
*/
createLeaderElector: function createLeaderElector() {
throw _rxError2['default'].pluginMissing('leaderelection');
},
/**
* creates a leader-elector for the given database
* @param {RxDatabase} database
* @return {LeaderElector}
*/
createLeaderElector: function createLeaderElector() {
throw _rxError2['default'].pluginMissing('leaderelection');
},


/**
* checks if the given adapter can be used
* @return {any} adapter
*/
checkAdapter: function checkAdapter() {
throw _rxError2['default'].pluginMissing('adapter-check');
},
/**
* checks if the given adapter can be used
* @return {any} adapter
*/
checkAdapter: function checkAdapter() {
throw _rxError2['default'].pluginMissing('adapter-check');
},

/**
* overwritte to map error-codes to text-messages
* @param {string} message
* @return {string}
*/
tunnelErrorMessage: function tunnelErrorMessage(message) {
// TODO better text with link
return 'RxDB Error-Code ' + message + '.\n - To find out what this means, use the error-messages-plugin https://pubkey.github.io/rxdb/custom-build.html#error-messages\n - Or search for this code https://github.com/pubkey/rxdb/search?l=JavaScript&q=' + message + '%3A\n ';
}
/**
* overwritte to map error-codes to text-messages
* @param {string} message
* @return {string}
*/
tunnelErrorMessage: function tunnelErrorMessage(message) {
// TODO better text with link
return 'RxDB Error-Code ' + message + '.\n - To find out what this means, use the error-messages-plugin https://pubkey.github.io/rxdb/custom-build.html#error-messages\n - Or search for this code https://github.com/pubkey/rxdb/search?l=JavaScript&q=' + message + '%3A\n ';
}
}; /**
* functions that can or should be overwritten by plugins
*/
Expand Down
Loading

0 comments on commit bae376b

Please sign in to comment.