fix adapter matching, add test

doc/CHANGELOG.md

@@ -1,8 +1,9 @@
 # Changelog
 
 
-##### 1.1.1 (2015-08-20)
+##### 1.1.2 (2015-08-20)
 - Fix: sorting implementation in built-in adapters.
+- Fix: matching implementation in built-in adapters.
 
 
 ##### 1.1.0 (2015-08-20)

lib/adapter/adapters/common.js

@@ -43,34 +43,31 @@ export function applyOptions (count, fields, records, options) {
 }
 
 
-const primitiveTypes = new Set([ Number, String, Boolean, Symbol ])
-
 const matchCheck = new WeakMap([
   [ Date, (a, b) => a.getTime() === b.getTime() ],
   [ Buffer, (a, b) => a.equals(toBuffer(b)) ],
   [ Object, () => false ]
 ])
 
-function check (a, b) {
-  return this.isPrimitive ? a === b : matchCheck.get(this.type)(a, b)
+
+function check (type, a, b) {
+  if (b === null) return a === null
+  const matcher = matchCheck.get(type)
+  return matcher ? matcher(a, b) : a === b
 }
 
 
 function matchByField (fields, match, record) {
-  for (let field in match) {
-    if (record[field] === null) return false
-
-    const type = fields[field][keys.type]
-    const isPrimitive = fields[field][keys.link] || primitiveTypes.has(type)
+  const checkValue = (fieldDefinition, a, b) =>
+    fieldDefinition[keys.isArray] ?
+      a.some(check.bind(null, fieldDefinition[keys.type], b)) :
+      check(fieldDefinition[keys.type], b, a)
 
+  for (let field in match) {
     let matches = match[field]
     if (!Array.isArray(match[field])) matches = [ matches ]
-
-    for (let x of matches)
-      if (fields[field][keys.isArray] ?
-        !record[field].some(check.bind({ isPrimitive, type }, x)) :
-        !check.call({ isPrimitive, type }, x, record[field]))
-        return false
+    if (!matches.some(checkValue.bind(null, fields[field], record[field])))
+      return false
   }
 
   return true

package.json

@@ -1,7 +1,7 @@
 {
   "name": "fortune",
   "description": "High-level I/O for web applications.",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "license": "MIT",
   "author": {
     "email": "[email protected]",

test/unit/adapter.js

@@ -110,7 +110,7 @@ export default function () {
   run(() => {
     comment('find: match (string)')
     return test(adapter =>
-      adapter.find(type, null, { match: { name: 'john' } })
+      adapter.find(type, null, { match: { name: [ 'john', 'xyz' ], age: 36 } })
       .then(records => {
         equal(records.length, 1, 'match length is correct')
         equal(records[0].name, 'john', 'matched correct record')
@@ -128,6 +128,15 @@ export default function () {
       }))
   })
 
+  run(() => {
+    comment('find: match (nothing)')
+    return test(adapter =>
+      adapter.find(type, null, { match: { name: 'bob', age: 36 } })
+      .then(records => {
+        equal(records.length, 0, 'match length is correct')
+      }))
+  })
+
   run(() => {
     comment('find: sort ascending')
     return test(adapter =>