Handle undefined elements.

adzerk · Aug 1, 2013 · b7ddcc5 · b7ddcc5
1 parent 450ad68
commit b7ddcc5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/src/zerkel-parser.js b/src/zerkel-parser.js
diff --git a/src/zerkel-parser.pegjs b/src/zerkel-parser.pegjs
@@ -54,7 +54,7 @@ numComp
   = left:value optionalSpace op:numCompOp optionalSpace right:value { return left + op + right; }
 
 contains
-  = left:value requiredSpace containsOp requiredSpace right:value { return "(" + left + ".indexOf(" + right + ")" + " >= 0)"; }
+  = left:value requiredSpace containsOp requiredSpace right:value { return "(" + left + "&&" + left + ".indexOf(" + right + ")" + " >= 0)"; }
 
 like
   = left:value requiredSpace likeOp requiredSpace right:value { return "_helpers['match'](" + left + "," + right + ")"; }

diff --git a/src/zerkel.coffee b/src/zerkel.coffee
@@ -6,7 +6,7 @@ module.exports.match = match = (val, pattern) ->
     pattern = val
     val = pattern
   if pattern == '*' then return true
-  if pattern[0] == '*' and pattern[pattern.length - 1] == '*' 
+  if pattern[0] == '*' and pattern[pattern.length - 1] == '*'
     pattern = pattern[1..-3]
     return (val.indexOf(pattern) >= 0) and val.length > pattern.length + 1
   if pattern[0] == '*'
@@ -20,4 +20,4 @@ module.exports.helpers = helpers = {match: match}
 module.exports.compile = (query) ->
   body = "return " + parser.parse(query)
   fn = new Function('_helpers', '_env', body)
-  return (env) -> fn helpers, env
+  return (env) -> Boolean fn helpers, env
diff --git a/test/zerkel.tests.coffee b/test/zerkel.tests.coffee
@@ -37,6 +37,7 @@ makeTest('((keywords contains "c#" and keywords contains "performance") or (keyw
 makeTest '"foo" = x', {x: "foo"}, true
 makeTest 'x like "foo*"', {x: "foobar"}, true
 makeTest 'x like "foo*"', {x: "foo"}, false
+makeTest 'array contains "Foo"', {}, false
 
 makeTest = (a, b, expected) ->
   it "#{a} like #{b} should be #{expected}", ->