Merge pull request #160 from iilab/singleton-search

Allow non-array search parameter.

.travis.yml

@@ -2,14 +2,12 @@ language: node_js
 sudo: false
 matrix:
   include:
-    - node_js: '0.10'
-      env: NO_WEB=1
-    - node_js: '0.12'
-      env: NO_WEB=1
     - node_js: '4'
       env: NO_WEB=1
     - node_js: '6'
       env: NO_WEB=1
+    - node_js: '7'
+      env: NO_WEB=1
     - node_js: '4'
       env: NO_WEB=
 script:

lib/levelgraph.js

@@ -126,6 +126,8 @@ searchStream = function(db, options) {
     if (!query || query.length === 0) {
       result.end();
       return result;
+    } else if (!Array.isArray(query)) {
+      query = [ query ];
     }
 
     planner(query, function(err, newquery) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "levelgraph",
-  "version": "1.3.1",
+  "version": "2.0.0",
   "description": "A graph database for Node.js and the browser built on top of LevelUp",
   "main": "lib/levelgraph.js",
   "scripts": {
@@ -43,7 +43,7 @@
     "jshint": "^2.9.2",
     "level-browserify": "^1.0.1",
     "level-sublevel": "^6.4.6",
-    "level-test": "^2.0.0",
+    "memdb": "^1.3.1",
     "mocha": "^2.2.5",
     "multilevel": "^7.2.0",
     "osenv": "^0.1.0",

test/abstract_join_algorithm.js

@@ -1,6 +1,6 @@
 
 var levelgraph = require('../lib/levelgraph');
-var level = require('level-test')();
+var level = require('memdb');
 
 module.exports = function(joinAlgorithm) {
 
@@ -29,6 +29,18 @@ module.exports = function(joinAlgorithm) {
     });
   });
 
+  it('should support non-array search parameter', function(done) {
+    db.search({
+      subject: db.v('x'),
+      predicate: 'friend',
+      object: 'daniele'
+    }, function(err, results) {
+      expect(results).to.have.property('length', 1);
+      expect(results[0]).to.have.property('x', 'matteo');
+      done();
+    });
+  });
+
   it('should do a join with two results', function(done) {
     db.search([{
       subject: db.v('x'),

test/abstract_sublevel_support.js

@@ -1,6 +1,6 @@
 
 var levelgraph = require('../lib/levelgraph')
-  , level = require('level-test')()
+  , level = require('memdb')
   , osenv = require('osenv');
 
 module.exports = function(sublevel) {

test/create_query.js

@@ -1,7 +1,7 @@
 
 var levelgraph = require('../lib/levelgraph')
   , createQuery = require('../lib/utilities').createQuery
-  , level = require('level-test')()
+  , level = require('memdb')
   , path = require('path')
   , osenv = require('osenv');
 

test/creation_api_spec.js

@@ -1,6 +1,6 @@
 
 var levelgraph = require('../lib/levelgraph')
-  , level = require('level-test')(),
+  , level = require('memdb'),
   os = require('os'),
   path = require('path');
 

test/multilevel_spec.js

@@ -1,6 +1,6 @@
 var levelgraph = require('../lib/levelgraph')
   , multilevel = require('multilevel')
-  , level = require('level-test')()
+  , level = require('memdb')
   , osenv = require('osenv');
 
 describe('a multileveled triple store', function() {

test/navigator_spec.js

@@ -1,6 +1,6 @@
 
 var levelgraph = require('../lib/levelgraph')
-  , level = require('level-test')();
+  , level = require('memdb');
 
 describe('navigator', function() {
 

test/properties_spec.js

@@ -1,5 +1,5 @@
 var levelgraph = require('../lib/levelgraph')
-  , level = require('level-test')();
+  , level = require('memdb');
 
 describe('a basic triple store', function() {
 

test/triple_store_spec.js

@@ -1,6 +1,6 @@
 
 var levelgraph = require('../lib/levelgraph')
-  , level = require('level-test')()
+  , level = require('memdb')
   , path = require('path')
   , osenv = require('osenv');
 

test/triple_unicode_store_spec.js

@@ -1,6 +1,6 @@
 
 var levelgraph = require('../lib/levelgraph')
-  , level = require('level-test')()
+  , level = require('memdb')
   , path = require('path')
   , osenv = require('osenv');