Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"env": {
"node": true
"node": true,
"browser": true
},
"extends": "eslint:recommended",
"rules": {
Expand Down
35 changes: 2 additions & 33 deletions lib/angular/sync-ng.js
Original file line number Diff line number Diff line change
@@ -1,39 +1,8 @@
'use strict';

var sync = require('../client');

module.exports = 'wfm.sync.service';

angular.module('wfm.sync.service', [])

.factory('syncService', function($q) {
var syncService = {};

function ManagerWrapper(_manager) {
this.manager = _manager;
var self = this;

var methodNames = ['create', 'read', 'update', 'delete', 'list', 'start', 'stop', 'safeStop', 'getQueueSize', 'forceSync', 'waitForSync'];
methodNames.forEach(function(methodName) {
self[methodName] = function() {
return $q.when(self.manager[methodName].apply(self.manager, arguments));
};
});
}

syncService.init = function($fh, syncOptions) {
sync.init($fh, syncOptions);
};

syncService.manage = function(datasetId, options, queryParams, metaData) {
return $q.when(sync.manage(datasetId, options, queryParams, metaData))
.then(function(_manager) {
var manager = new ManagerWrapper(_manager);
manager.stream = _manager.stream;
return manager;
});
};

return syncService;
})
;
return require('../syncService')($q);
});
6 changes: 6 additions & 0 deletions lib/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
if (window && window.angular) {
module.exports = require('./angular/sync-ng');
} else {
var q = require('q');
module.exports = require('./syncService')(q);
}
33 changes: 33 additions & 0 deletions lib/syncService.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
var sync = require('./client');
module.exports = function(q) {
var syncService = {};

function ManagerWrapper(_manager) {
this.manager = _manager;
var self = this;

var methodNames = ['create', 'read', 'update', 'delete', 'list', 'start', 'stop', 'safeStop', 'getQueueSize', 'forceSync', 'waitForSync'];
methodNames.forEach(function(methodName) {
self[methodName] = function() {
return q.when(self.manager[methodName].apply(self.manager, arguments));
};
});
}

syncService.init = function($fh, syncOptions) {
sync.init($fh, syncOptions);
};

syncService.manage = function(datasetId, options, queryParams, metaData) {
return q.when(sync.manage(datasetId, options, queryParams, metaData))
.then(function(_manager) {
var manager = new ManagerWrapper(_manager);
manager.stream = _manager.stream;
return manager;
});
};

syncService.client = sync;

return syncService;
};
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "fh-wfm-sync",
"version": "0.0.16",
"description": "An sync module for WFM",
"main": "lib/angular/sync-ng.js",
"main": "lib/index.js",
"scripts": {
"test-watch": "mochify --watch test/client/**/*.spec.js",
"test-debug": "mochify --debug test/client/**/*.spec.js",
Expand Down Expand Up @@ -37,6 +37,7 @@
"fh-wfm-mediator": "0.0.15",
"grunt": "^1.0.1",
"grunt-eslint": "^18.0.0",
"md5": "^2.2.1",
"mochify": "2.17.0",
"nodemon": "1.9.1",
"should": "8.3.0"
Expand Down
21 changes: 9 additions & 12 deletions test/client/test-helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,20 @@

var _ = require('lodash');
var q = require('q');
var syncTestHelper = {};
var navigatorOnLine, navigatorOffLine, oldNavigator;

syncTestHelper.startLoggingNotifications = function(stream) {
exports.startLoggingNotifications = function(stream) {
var subscription = stream.subscribe(function(event) {
console.log('\x1b[36m%s\x1b[0m', '** sync event:', event.dataset_id, ':', event.code, ':', event.message);
});
return subscription;
};

syncTestHelper.stopLoggingNotifications = function(subscription) {
exports.stopLoggingNotifications = function(subscription) {
subscription.unsubscribe;
};

syncTestHelper.syncServerReset = function($fh, datasetId) {
exports.syncServerReset = function($fh, datasetId) {
var deferred = q.defer();
$fh.cloud({
path: '/sync/reset/' + datasetId,
Expand All @@ -29,7 +28,7 @@ syncTestHelper.syncServerReset = function($fh, datasetId) {
return deferred.promise;
};

syncTestHelper.syncServerInit = function($fh, datasetId) {
exports.syncServerInit = function($fh, datasetId) {
var deferred = q.defer();
$fh.cloud({
path: '/sync/init/' + datasetId,
Expand All @@ -42,7 +41,7 @@ syncTestHelper.syncServerInit = function($fh, datasetId) {
return deferred.promise;
};

syncTestHelper.syncServerStop = function($fh, datasetId) {
exports.syncServerStop = function($fh, datasetId) {
var deferred = q.defer();
$fh.cloud({
path: '/sync/stop/' + datasetId,
Expand All @@ -55,7 +54,7 @@ syncTestHelper.syncServerStop = function($fh, datasetId) {
return deferred.promise;
};

syncTestHelper.overrideNavigator = function() {
exports.overrideNavigator = function() {
// Overide window.navigator.onLine to make sync work
if (! oldNavigator) {
navigatorOnLine = _.clone(navigator);
Expand All @@ -67,20 +66,18 @@ syncTestHelper.overrideNavigator = function() {
}
};

syncTestHelper.restoreNavigator = function() {
exports.restoreNavigator = function() {
if (navigator.oldNavigator) {
navigator = navigator.oldNavigator;
}
};

syncTestHelper.setOnline = function(onLine) {
exports.setOnline = function(onLine) {
navigator = onLine ? navigatorOnLine : navigatorOffLine;
};

syncTestHelper.notificationPromise = function(stream, condition) {
exports.notificationPromise = function(stream, condition) {
return stream.filter(function(notification) {
return _.isMatch(notification, condition);
}).take(1).toPromise(q.Promise);
};

module.exports = syncTestHelper;