feat(interceptor): The parser module is now an interceptor

Moved the functionality from a pure parser module into an interceptor

BREAKING CHANGE

Author: Torsten Link

index.js

@@ -0,0 +1,10 @@
+/* jslint node: true, esnext: true */
+"use strict";
+
+const Interceptor = require('./lib/interceptor').Interceptor;
+
+exports.Interceptor = Interceptor;
+
+exports.registerWithManager = function (manager) {
+	manager.registerInterceptor(Interceptor);
+};

lib/data-hash.js

@@ -12,7 +12,7 @@ module.exports = {
 	createFunctions: function (chunkDefinition) {
 
 		// all the field names used to build the key for a record and a name to store the hash
-		const keyHashFields = chunkDefinition.keyFields;
+		const keyHashFields = chunkDefinition.keyHashFields;
 		const keyHashName = chunkDefinition.keyHashName;
 
 		// all the field names used to build the content hash for a record and a name to store the hash

lib/data-processor-chunk.js

@@ -46,7 +46,7 @@ class DataProcessorChunk extends stream.Transform {
 
 			if (validationErrors) {
 				// There where validation errors
-				this.throw(validationErrors);
+				throw (validationErrors);
 			}
 
 		}

lib/interceptor.js

@@ -0,0 +1,35 @@
+/* jslint node: true, esnext: true */
+"use strict";
+
+const Interceptor = require('kronos-interceptor').Interceptor;
+const parserFactory = require('./data-processor-chunk');
+
+/**
+ * This interceptor cares about the handling of the messages.
+ * It will add the hops and copies the messages
+ */
+class LineHeaderInterceptor extends Interceptor {
+
+	constructor(endpoint, config) {
+		super(endpoint, config);
+
+		this.streamFilter = parserFactory(config, true);
+	}
+
+	static get type() {
+		return "data-processor-chunk";
+	}
+
+	get type() {
+		return "data-processor-chunk";
+	}
+
+	receive(request, oldRequest) {
+		if (request.payload) {
+			const stream = request.payload;
+			request.payload = stream.pipe(this.streamFilter);
+		}
+		return this.connected.receive(request, oldRequest);
+	}
+}
+exports.Interceptor = LineHeaderInterceptor;

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "stream-object-data-processor-chunk",
+  "name": "kronos-interceptor-object-data-processor-chunk",
   "version": "0.0.0",
   "description": "Splits a line by a sparator into tokens.",
   "main": "lib/data-processor-chunk.js",
@@ -11,38 +11,37 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/Kronos-Integration/stream-object-data-processor-chunk.git"
+    "url": "git+https://github.com/Kronos-Integration/kronos-interceptor-object-data-processor-chunk.git"
   },
   "bugs": {
-    "url": "https://github.com/Kronos-Integration/stream-object-data-processor-chunk/issues"
+    "url": "https://github.com/Kronos-Integration/kronos-interceptor-object-data-processor-chunk/issues"
   },
-  "homepage": "https://github.com/Kronos-Integration/stream-object-data-processor-chunk#readme",
+  "homepage": "https://github.com/Kronos-Integration/kronos-interceptor-object-data-processor-chunk#readme",
   "release": {
     "debug": false
   },
   "dependencies": {
     "md5": " 2.0.0",
+    "kronos-interceptor": "^1.3.0",
     "z-schema": "3.16.1"
   },
   "devDependencies": {
     "chai": "3.4.1",
     "clone-deep": "0.2.4",
     "istanbul": "^0.4.2",
     "jsdoc": "3.4.0",
+    "kronos-test-interceptor": "^1.6.1",
     "mocha": "2.3.4",
     "semantic-release": "4.3.5",
     "underscore": "1.8.3"
   },
-  "contributors": [
-    {
-      "name": "Torsten Link",
-      "email": "torstenlink@gmx.de"
-    },
-    {
-      "name": "Markus Felten",
-      "email": "markus.felten@gmx.de"
-    }
-  ],
+  "contributors": [{
+    "name": "Torsten Link",
+    "email": "torstenlink@gmx.de"
+  }, {
+    "name": "Markus Felten",
+    "email": "markus.felten@gmx.de"
+  }],
   "license": "BSD-2-Clause",
   "engines": {
     "node": ">=4.2.1"

schema/chunk.json

@@ -3,7 +3,13 @@
 	"description": "The import description.",
 	"type": "object",
 	"additionalProperties": false,
-	"required": ["keyFields", "keyHashName"],
+	"required": ["keyHashFields", "keyHashName"],
+	"definitions": {
+		"severity": {
+			"type": "string",
+			"enum": ["abort_file", "abort_scope", "skip_record", "skip_field"]
+		}
+	},
 	"properties": {
 
 		"keyHashFields": {
@@ -52,10 +58,10 @@
 
 		"checks": {
 			"double_rows_same": {
-				"$ref": "#severity"
+				"$ref": "#/definitions/severity"
 			},
 			"double_rows_different": {
-				"$ref": "#severity"
+				"$ref": "#/definitions/severity"
 			}
 
 		}

tests/data-hash_test.js

@@ -15,7 +15,7 @@ const distinctData = require('./fixtures/distinct_data.json');
 
 
 const chunkDefinition = {
-	"keyFields": ["first", "last"],
+	"keyHashFields": ["first", "last"],
 	"keyHashName": "__key",
 	"contentHashFields": ["first", "last", "friends"],
 	"contentHashName": "__content",
@@ -25,15 +25,15 @@ const chunkDefinition = {
 };
 
 const chunkDefinition_without_scope = {
-	"keyFields": ["first", "last"],
+	"keyHashFields": ["first", "last"],
 	"keyHashName": "__key",
 	"contentHashFields": ["first", "last", "friends"],
 	"contentHashName": "__content",
 	"multiRowFields": ["friends"]
 };
 
 const chunkDefinition_keyOnly = {
-	"keyFields": ["first", "last"],
+	"keyHashFields": ["first", "last"],
 	"keyHashName": "__key"
 };
 
@@ -74,7 +74,7 @@ describe("data-processor-chunk:data-hash - Errors", function () {
 		let error;
 		try {
 			dataHashFactory({
-				"keyFields": ["first", "last"],
+				"keyHashFields": ["first", "last"],
 				"keyHashName": "__key",
 				"contentHashFields": ["last"]
 			});
@@ -90,7 +90,7 @@ describe("data-processor-chunk:data-hash - Errors", function () {
 		let error;
 		try {
 			dataHashFactory({
-				"keyFields": ["first", "last"],
+				"keyHashFields": ["first", "last"],
 				"keyHashName": "__key",
 				"scopeHashFields": ["last"]
 			});

tests/data-processor-chunk_test.js

@@ -14,7 +14,7 @@ const chunkProcessor = require('../lib/data-processor-chunk.js');
 const objData = require('./fixtures/data.json');
 
 const chunkDefinitionGroupFrinds = {
-	"keyFields": ["first", "last"],
+	"keyHashFields": ["first", "last"],
 	"keyHashName": "__key",
 	"contentHashFields": ["first", "last", "friends"],
 	"contentHashName": "__content",
@@ -24,7 +24,7 @@ const chunkDefinitionGroupFrinds = {
 };
 
 const chunkDefinitionNoGroup = {
-	"keyFields": ["first", "last"],
+	"keyHashFields": ["first", "last"],
 	"keyHashName": "__key",
 	"contentHashFields": ["friends", "street"],
 	"contentHashName": "__content"

tests/interceptor_test.js

@@ -0,0 +1,74 @@
+/* global describe, it, xit */
+/* jslint node: true, esnext: true */
+
+"use strict";
+
+/*
+ * Just test if the message will be passed through the interceptor
+ */
+
+const chai = require('chai'),
+  assert = chai.assert,
+  expect = chai.expect,
+  should = chai.should(),
+  InterceptorUnderTest = require('../index').Interceptor,
+  MockReceiveInterceptor = require('kronos-test-interceptor').MockReceiveInterceptor;
+
+
+const stepMock = {
+  "name": "dummy step name",
+  "type": "dummy step type"
+};
+
+const checkProperties = {
+  "keyHashFields": ["first", "last"],
+  "keyHashName": "__key",
+  "contentHashFields": ["first", "last", "friends"],
+  "contentHashName": "__content",
+  "scopeHashFields": ["street"],
+  "scopeHashName": "__scope",
+  "multiRowFields": ["friends"]
+};
+
+
+describe('Interceptor test', function () {
+
+  it('Create', function () {
+    const endpoint = {
+      "owner": stepMock,
+      "name": "gumboIn"
+    };
+    const messageHandler = new InterceptorUnderTest(endpoint, checkProperties);
+    assert.ok(messageHandler);
+  });
+
+  it('Send message', function (done) {
+    const endpoint = {
+      "owner": stepMock,
+      "name": "gumboIn"
+    };
+
+    const sendMessage = {
+      "info": "first message"
+    };
+
+    const messageHandler = new InterceptorUnderTest(endpoint, checkProperties);
+    const mockReceive = new MockReceiveInterceptor(function (request, oldRequest) {
+
+      assert.ok(request);
+
+      assert.deepEqual(request, {
+        "info": "first message"
+      });
+      done();
+    });
+
+    messageHandler.connected = mockReceive;
+
+    messageHandler.receive(sendMessage);
+
+  });
+
+
+
+});