Skip to content
This repository has been archived by the owner on Apr 7, 2021. It is now read-only.

Commit

Permalink
Merge pull request #3 from deepstreamIO/greenkeeper-update-all
Browse files Browse the repository at this point in the history
Update all dependencies 馃尨
  • Loading branch information
yasserf committed May 27, 2016
2 parents 660e7dd + 463ff62 commit 7f804dc
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@
"homepage": "https://github.com/deepstreamIO/deepstream.io-provider-search-rethinkdb",
"dependencies": {
"rethinkdb": "2.3.1",
"deepstream.io-client-js": "*"
"deepstream.io-client-js": "0.5.0"
},
"devDependencies": {
"coveralls": "^2.11.9",
"deepstream.io": "^0.9.0",
"deepstream.io-storage-rethinkdb": "^0.1.0",
"grunt": "~0.4.5",
"grunt-release": "0.9.0",
"istanbul": "^0.4.3",
"jasmine": "2.4.1"
"jasmine": "2.4.1",
"grunt": "1.0.1",
"grunt-release": "0.13.1"
}
}
12 changes: 6 additions & 6 deletions src/provider.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ var rethinkdb = require( 'rethinkdb' ),
*
* @constructor
* @extends EventEmitter
*
*
* @param {Object} config please consuld README.md for details
*/
var Provider = function( config ) {
Expand Down Expand Up @@ -72,7 +72,7 @@ Provider.prototype.log = function( message, level ) {

var date = new Date(),
time = date.toLocaleTimeString() + ':' + date.getMilliseconds();

console.log( time + ' | ' + message );
};

Expand Down Expand Up @@ -107,7 +107,7 @@ Provider.prototype._initialiseDbConnection = function() {
*
* @param {RqlDriverError} error (or null for no error)
* @param {RethinkdbConnection} connection
*
*
* @private
* @returns void
*/
Expand All @@ -131,14 +131,14 @@ Provider.prototype._onRethinkdbConnection = function( error, connection ) {
*/
Provider.prototype._initialiseDeepstreamClient = function() {
this.log( 'Initialising Deepstream connection', 1 );

if( this._config.deepstreamClient ) {
this._deepstreamClient = this._config.deepstreamClient;
this.log( 'Deepstream connection established', 1 );
this._ready();
} else {
if( !this._config.deepstreamUrl ) {
throw new Error( 'Can\'t connect to deepstream, neither deepstreamClient nor deepstreamUrl where provided', 1 );
throw new Error( 'Can\'t connect to deepstream, neither deepstreamClient nor deepstreamUrl were provided', 1 );
}

if( !this._config.deepstreamCredentials ) {
Expand Down Expand Up @@ -206,7 +206,7 @@ Provider.prototype._onSubscription = function( name, subscribed ) {
} else {
this.log( 'discard subscription for ' + name, 2 );
}

var parsedInput = this._queryParser.parseInput( name ),
query;

Expand Down
4 changes: 2 additions & 2 deletions src/query-parser.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ var QueryParser = function( provider ) {
* "ne" (not equal)
*
* @todo Support for OR might come in handy
*
*
* @param {String} name The recordName for the list, including search parameters
*
* @public
Expand Down Expand Up @@ -63,7 +63,7 @@ QueryParser.prototype.createQuery = function( parsedInput ) {
* @returns {Object) parsedInput
*/
QueryParser.prototype.parseInput = function( input ) {

var operators = [ 'eq', 'match', 'gt', 'lt', 'ne'],
search,
parsedInput,
Expand Down
4 changes: 2 additions & 2 deletions src/search.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ var r = require( 'rethinkdb' ),

/**
* This class represents a single realtime search query against RethinkDb.
*
*
* It creates two cursors, one to
* retrieve the initial matches, one to listen for incoming changes. It then
* creates a deepstream list and populates it with the changes
Expand Down Expand Up @@ -56,7 +56,7 @@ Search.prototype.destroy = function( deleteList ) {
if( deleteList ) {
this._list.delete();
}

this._changeFeedCursor.close();
this._changeFeedCursor = null;
this._list = null;
Expand Down

0 comments on commit 7f804dc

Please sign in to comment.