Update the tests to cache locally if possible. Add the \!\! operator, and clean up using truthy in all boolean ops.

Author: jwadhams

.gitignore

@@ -1,2 +1,3 @@
 node_modules
+tests/tests.json
 

README.md

@@ -10,7 +10,7 @@ The same format can also be executed in PHP by the library [json-logic-php](http
 
 ### Simple
 ```js
-jsonLogic( { "==" : [1, 1] } );
+jsonLogic.apply( { "==" : [1, 1] } );
 // true
 ```
 
@@ -24,7 +24,7 @@ This is a simple test, equivalent to `1 == 1`.  A few things about the format:
 Here we're beginning to nest rules. 
 
 ```js
-jsonLogic(
+jsonLogic.apply(
 	{"and" : [
 	  { ">" : [3,1] },
 	  { "<" : [1,3] }
@@ -44,7 +44,7 @@ In an infix language (like JavaScript) this could be written as:
 Obviously these rules aren't very interesting if they can only take static literal data. Typically `jsonLogic` will be called with a rule object and a data object. You can use the `var` operator to get attributes of the data object:
 
 ```js
-jsonLogic(
+jsonLogic.apply(
 	{ "var" : ["a"] }, // Rule
 	{ a : 1, b : 2 }   // Data
 );
@@ -54,7 +54,7 @@ jsonLogic(
 If you like, we support [syntactic sugar](https://en.wikipedia.org/wiki/Syntactic_sugar) on unary operators to skip the array around values:
 
 ```js
-jsonLogic(
+jsonLogic.apply(
 	{ "var" : "a" },
 	{ a : 1, b : 2 }
 );
@@ -64,7 +64,7 @@ jsonLogic(
 You can also use the `var` operator to access an array by numeric index:
 
 ```js
-jsonLogic(
+jsonLogic.apply(
 	{"var" : 1 },
 	[ "apple", "banana", "carrot" ]
 );
@@ -81,7 +81,7 @@ var rules = { "and" : [
 
 var data = { "temp" : 100, "pie" : { "filling" : "apple" } };
 
-jsonLogic(rules, data);
+jsonLogic.apply(rules, data);
 // true
 ```
 
@@ -90,11 +90,11 @@ Sometimes the rule you want to process is "Always" or "Never."  If the first par
 
 ```js
 //Always
-jsonLogic(true, data_will_be_ignored);
+jsonLogic.apply(true, data_will_be_ignored);
 // true
 
 //Never
-jsonLogic(false, i_wasnt_even_supposed_to_be_here);
+jsonLogic.apply(false, i_wasnt_even_supposed_to_be_here);
 // false
 ```
 

logic.js

@@ -48,13 +48,16 @@ var jsonLogic = {},
 		"<="  : function(a,b,c){ 
 			return (c === undefined) ?  a <= b : (a <= b) && (b <= c);
 		},
-		"!"   : function(a){ return !a; },
+		"!!"   : function(a){ return jsonLogic.truthy(a); },
+		"!"   : function(a){ return !jsonLogic.truthy(a); },
 		"%"  : function(a,b){ return a % b; },
-		"and" : function(){ 
-			return Array.prototype.reduce.call(arguments, function(a,b){ return a && b; });
+		"and" : function(){ //Return first falsy, or last
+			for(var i in arguments){ if( ! jsonLogic.truthy(arguments[i])){ return arguments[i]; } }
+			return arguments[i];
 		},
-		"or"  : function(){
-			return Array.prototype.reduce.call(arguments, function(a,b){ return a || b; });
+		"or"  : function(){ //Return first truthy, or last
+			for(var i in arguments){ if(jsonLogic.truthy(arguments[i])){ return arguments[i]; } }
+			return arguments[i];
 		},
 		"log" : function(a){ console.log(a); return a; },
 		"in"  : function(a, b){ 
@@ -111,7 +114,8 @@ jsonLogic.apply = function(logic, data){
 	data = data || {};
 
 	var op = Object.keys(logic)[0],
-		values = logic[op];
+		values = logic[op],
+		i;
 
 	//easy syntax for unary operators, like {"var" : "x"} instead of strict {"var" : ["x"]}
 	if( ! Array.isArray(values)){ values = [values]; } 
@@ -131,7 +135,7 @@ jsonLogic.apply = function(logic, data){
 			given one parameter, evaluate and return it. (it's an Else and all the If/ElseIf were false)
 			given 0 parameters, return NULL (not great practice, but there was no Else)
 		*/
-		for(var i = 0 ; i < values.length - 1 ; i += 2){
+		for(i = 0 ; i < values.length - 1 ; i += 2){
 			if( jsonLogic.truthy( jsonLogic.apply(values[i], data) ) ){
 				return jsonLogic.apply(values[i+1], data);
 			}
@@ -148,7 +152,7 @@ jsonLogic.apply = function(logic, data){
 	if(op === "var"){
 		var not_found = values[1] || null,
 			sub_props = String(values[0]).split(".");
-		for(var i = 0 ; i < sub_props.length ; i++){
+		for(i = 0 ; i < sub_props.length ; i++){
 			//Descending into data
 			data = data[ sub_props[i] ];
 			if(data === undefined){ return not_found; } 

tests/tests.js

@@ -1,32 +1,22 @@
-var jsonLogic = require('../logic.js');
-
-var real_console = console.log, last_console;
-console.log = function(logged){ last_console = logged; real_console.apply(this, arguments); };
-
-QUnit.test( "Bad operator", function( assert ) {
-	assert.throws(
-		function(){ jsonLogic.apply({"fubar": []}); }, 
-		/Unrecognized operation/
-	);
-});
+var jsonLogic = require('../logic.js'),
+	http = require('http'),
+	fs = require('fs');
 
+var download = function(url, dest, cb) {
+  var file = fs.createWriteStream(dest);
+  var request = http.get(url, function(response) {
+    response.pipe(file);
+    file.on('finish', function() {
+      file.close(cb);  // close() is async, call cb after close completes.
+    });
+  }).on('error', function(err) { // Handle errors
+    fs.unlink(dest); // Delete the file async. (But we don't check the result)
+    if (cb) cb(err.message);
+  });
+};
 
-
-QUnit.test( "Shared JsonLogic.com tests ", function( assert ){
-	//Only waiting on the request() is async
-	stop();
-
-	/*
-	var fs = require('fs');
-	fs.readFile('tests.json', 'utf8', function (error, body) {
-	*/
-	var request = require('request');
-	request('http://jsonlogic.com/tests.json', function (error, response, body) {
-		if (error || response.statusCode != 200) {
-			console.log("Failed to load tests from JsonLogic.com:", error, response.statusCode);
-			start();
-			return;
-		}
+var process_test_file = function (filename){
+	fs.readFile(filename, 'utf8', function (error, body) {
 		try{
 			tests = JSON.parse(body);
 		}catch(e){
@@ -52,6 +42,39 @@ QUnit.test( "Shared JsonLogic.com tests ", function( assert ){
 
 		start();
 	});
+};
+
+var real_console = console.log, last_console;
+console.log = function(logged){ last_console = logged; real_console.apply(this, arguments); };
+
+QUnit.test( "Bad operator", function( assert ) {
+	assert.throws(
+		function(){ jsonLogic.apply({"fubar": []}); }, 
+		/Unrecognized operation/
+	);
+});
+
+
+
+QUnit.test( "Shared JsonLogic.com tests ", function( assert ){
+	//Only waiting on the request() is async
+	stop();
+
+	var local_file = 'tests.json';
+
+	fs.stat(local_file, function(err, stats){
+			if(err){
+				console.log("Downloading shared tests from JsonLogic.com");
+				download('http://jsonlogic.com/tests.json', local_file, function(){
+					process_test_file(local_file);
+				});
+			}else{
+				console.log("Using cached tests");
+				process_test_file(local_file);
+			}
+	});
+
+
 });
 
 QUnit.test( "logging", function( assert ) {