Moved identifiers into payload

Author: fblundun

src/js/lib/detectors.js

@@ -36,7 +36,6 @@
 
 	var 
 		lodash = require('./lodash'),
-		identifiers = require('./identifiers'),
 		helpers = require('./helpers'),
 		murmurhash3_32_gc = require('murmurhash').v3,
 		tz = require('jstimezonedetect').jstz.determine(),

src/js/lib/identifiers.js

@@ -36,7 +36,6 @@
 
 	var
 		lodash = require('./lib/lodash'),
-		identifiers = require('./lib/identifiers'),
 		json2 = require('JSON'),
 		Base64 = require('Base64'),
 		base64encode = Base64.btoa,
@@ -72,6 +71,28 @@
 		return Math.floor(date / 86400000);
 	}
 
+	/*
+	 * Is property a JSON?
+	 */
+	object.isJson = function (property) {
+		return (!lodash.isUndefined(property) && !lodash.isNull(property) && property.constructor === {}.constructor);
+	}
+
+	/*
+	 * Is property a non-empty JSON?
+	 */
+	object.isNonEmptyJson = function (property) {
+		if (!object.isJson(property)) {
+			return false;
+		}
+		for (var key in property) {
+			if (property.hasOwnProperty(key)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	/**
 	 * A helper to build a Snowplow request string from an
 	 * an optional initial value plus a set of individual
@@ -142,7 +163,7 @@
 						}
 
 						// ... for JSON objects
-						if (identifiers.isJson(value)) {
+						if (object.isJson(value)) {
 							value = recurse(value);
 						}
 
@@ -166,7 +187,7 @@
 
 		var addJson = function (keyIfEncoded, keyIfNotEncoded, json) {
 
-			if (identifiers.isNonEmptyJson(json)) {
+			if (object.isNonEmptyJson(json)) {
 				var typed = appendTypes(json);
 				var str = json2.stringify(typed);
 

src/js/payload.js

@@ -75,7 +75,6 @@
 
 	// Load all our modules (at least until we fully modularize & remove grunt-concat)
 	var
-		identifiers = require('./lib/identifiers'),
 		tracker = require('./tracker'),
 		helpers = require('./lib/helpers'),
 		queue = require('./queue'),

src/js/snowplow.js

@@ -1,6 +1,6 @@
 define({
 
 // Non-functional test suites
-suites: ['tests/queueT', 'tests/payloadT', 'tests/identifiersT'],
+suites: ['tests/queueT', 'tests/payloadT'],
 
 });

tests/identifiersT.js

@@ -24,6 +24,30 @@ define([
 
 		name: 'Payload test',
 
+		'Identify JSON': function() {
+			var json = {
+				'name': 'john',
+				'properties': {
+					'age': 30,
+					'languages': ['English', 'French']
+				}
+			};
+
+			assert.strictEqual(payload.isJson(json), true, 'JSON should be identified');
+		},
+
+		'Identify non-JSON': function() {
+			var nonJson = [1,2,3];
+
+			assert.strictEqual(payload.isJson(nonJson), false, 'non-JSON should be rejected');
+		},
+
+		'Identify empty JSON': function() {
+			var emptyJson = {};
+
+			assert.strictEqual(payload.isNonEmptyJson(emptyJson), false, 'identify {} as empty')
+		},
+
 		'build payload': function () {
 
 			var sb = payload.payloadBuilder(false);