diff --git a/.versions b/.versions index b0be024..d459b07 100644 --- a/.versions +++ b/.versions @@ -3,10 +3,8 @@ ejson@1.0.5 http@1.0.10 json@1.0.2 meteor@1.1.4 -meteorhacks:async@1.0.0 -meteorhacks:npm@1.2.2 -ostrio:neo4jdriver@0.2.7 -ostrio:neo4jreactivity@0.5.0 +ostrio:neo4jdriver@0.2.10 +ostrio:neo4jreactivity@0.5.3 reactive-dict@1.0.5 reactive-var@1.0.4 session@1.0.5 diff --git a/ostrio:neo4jreactivity_driver.js b/ostrio:neo4jreactivity_driver.js index 3680e3f..0936604 100644 --- a/ostrio:neo4jreactivity_driver.js +++ b/ostrio:neo4jreactivity_driver.js @@ -8,8 +8,9 @@ /*global Neo4jCacheCollection:false */ if (Meteor.isServer) { - - var Fiber = Meteor.npmRequire('fibers'); + var bound = Meteor.bindEnvironment(function(callback){ + callback() + }); Meteor.N4JDB = {}; this.N4JDB = Meteor.N4JDB; } @@ -426,11 +427,11 @@ Meteor.neo4j = { type: 'READ' }); - Fiber(function() { + bound(function() { affectedRecords.forEach(function(value){ Meteor.neo4j.run(value.uid, value.query, value.opts, value.created); }); - }).run(); + }); } } }); @@ -452,13 +453,13 @@ Meteor.neo4j = { this.check(query); Meteor.N4JDB.query(query, opts, function(error, data) { - Fiber(function() { + bound(function() { if (error) { throw new Meteor.Error('500', 'Meteor.N4JDB.query: [Meteor.neo4j.run]: ' + [error, uid, query, opts, date].toString()); } else { return Meteor.neo4j.cache.put(uid, data || null, query, opts, date); } - }).run(); + }); }); } : undefined, diff --git a/package.js b/package.js index 891bdd4..2c1f405 100644 --- a/package.js +++ b/package.js @@ -1,23 +1,18 @@ Package.describe({ name: 'ostrio:neo4jreactivity', - summary: 'Meteor.js Neo4j database pseudo-reactivity layer', - version: '0.5.0', + summary: 'Meteor.js Neo4j database reactivity layer', + version: '0.5.3', git: 'https://github.com/VeliovGroup/ostrio-Neo4jreactivity.git' }); Package.onUse(function(api) { api.versionsFrom('1.0'); api.addFiles(['ostrio:neo4jreactivity_driver.js', 'ostrio:neo4jreactivity_collection.js', 'ostrio:neo4jreactivity_methods.js']); - api.use('underscore', ['client', 'server']); - api.use('tracker', 'client'); - api.use('session', 'client'); - api.use('reactive-var', 'client'); - api.use('sha', ['client', 'server']); - api.use('ostrio:neo4jdriver@0.2.7'); - api.use('meteorhacks:npm@1.2.2'); + api.use(['underscore', 'sha'], ['client', 'server']); + api.use(['tracker', 'session', 'reactive-var'], 'client'); + api.use('ostrio:neo4jdriver@0.2.10'); }); Npm.depends({ - neo4j: '1.1.1', - fibers: '1.0.2' + neo4j: '1.1.1' }); \ No newline at end of file diff --git a/packages.json b/packages.json deleted file mode 100644 index 077404a..0000000 --- a/packages.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - -} \ No newline at end of file diff --git a/packages/npm-container/index.js b/packages/npm-container/index.js deleted file mode 100644 index 1025083..0000000 --- a/packages/npm-container/index.js +++ /dev/null @@ -1,9 +0,0 @@ - Meteor.npmRequire = function(moduleName) { // 85 - var module = Npm.require(moduleName); // 86 - return module; // 87 - }; // 88 - // 89 - Meteor.require = function(moduleName) { // 90 - console.warn('Meteor.require is deprecated. Please use Meteor.npmRequire instead!'); // 91 - return Meteor.npmRequire(moduleName); // 92 - }; // 93 \ No newline at end of file diff --git a/packages/npm-container/package.js b/packages/npm-container/package.js deleted file mode 100644 index 91eaf73..0000000 --- a/packages/npm-container/package.js +++ /dev/null @@ -1,21 +0,0 @@ - var path = Npm.require('path'); // 97 - var fs = Npm.require('fs'); // 98 - // 99 - Package.describe({ // 100 - summary: 'Contains all your npm dependencies', // 101 - version: '1.0.0', // 102 - name: 'npm-container' // 103 - }); // 104 - // 105 - var packagesJsonFile = path.resolve('./packages.json'); // 106 - try { // 107 - var fileContent = fs.readFileSync(packagesJsonFile); // 108 - var packages = JSON.parse(fileContent.toString()); // 109 - Npm.depends(packages); // 110 - } catch(ex) { // 111 - console.error('ERROR: packages.json parsing error [ ' + ex.message + ' ]'); // 112 - } // 113 - // 114 - Package.onUse(function(api) { // 115 - api.add_files(['index.js', '../../packages.json'], 'server'); // 116 - }); // 117 \ No newline at end of file diff --git a/versions.json b/versions.json deleted file mode 100644 index 95ad522..0000000 --- a/versions.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "dependencies": [ - [ - "base64", - "1.0.1" - ], - [ - "ejson", - "1.0.4" - ], - [ - "json", - "1.0.1" - ], - [ - "meteor", - "1.1.3" - ], - [ - "meteorhacks:async", - "1.0.0" - ], - [ - "meteorhacks:npm", - "1.2.2" - ], - [ - "ostrio:neo4jdriver", - "0.2.2" - ], - [ - "reactive-dict", - "1.0.4" - ], - [ - "session", - "1.0.4" - ], - [ - "tracker", - "1.0.3" - ], - [ - "underscore", - "1.0.1" - ] - ], - "pluginDependencies": [], - "toolVersion": "meteor-tool@1.0.36", - "format": "1.0" -} \ No newline at end of file