Adds handlers option

Author: cheton

README.md

@@ -9,24 +9,22 @@
 ## Usage
 
 ```js
-var fs = require('fs');
-var util = require('util');
 var GCodeInterpreter = require('gcode-interpreter').GCodeInterpreter;
 
 var GCodeRunner = function() {
-    GCodeInterpreter.call(this);
+    var handlers = {
+        'G0': (args) => {
+            console.log('G0', args);
+        },
+        'G1': (args) => {
+            console.log('G1', args);
+        }
+    };
+
+    return new GCodeInterpreter({ handlers: handlers })
 };
-util.inherits(GCodeRunner, GCodeInterpreter);
 
-GCodeRunner.prototype.G0 = function(args) {
-    console.log('G0', args);
-};
-
-GCodeRunner.prototype.G1 = function(args) {
-    console.log('G1', args);
-};
-
-var runner = new GCodeRunner();
+var runner = new GCodeRunner()
 
 // Interpret G-code from file
 var file = 'example.nc';

dist/index.js

@@ -60,7 +60,7 @@ var interpret = function interpret(self, data) {
         var word = words[0] || [];
         var letter = word[0];
         var arg = word[1];
-        var cmd = (letter + arg).replace('.', '_');
+        var cmd = letter + arg;
         var args = {};
 
         if (_lodash2.default.includes(['G', 'M'], letter)) {
@@ -80,6 +80,11 @@ var interpret = function interpret(self, data) {
                 args = _lodash2.default.zipObject(words); // returns an object composed from arrays of property names and values.
             }
 
+        if (typeof self.handlers[cmd] === 'function') {
+            var func = self.handlers[cmd];
+            func(args);
+        }
+
         if (typeof self[cmd] === 'function') {
             var func = self[cmd].bind(self);
             func(args);
@@ -88,14 +93,20 @@ var interpret = function interpret(self, data) {
 };
 
 var GCodeInterpreter = (function () {
-    function GCodeInterpreter() {
+    function GCodeInterpreter(options) {
         _classCallCheck(this, GCodeInterpreter);
 
         this.cmd = '';
+        this.handlers = {};
         this._callbacks = {
             'data': [],
             'end': []
         };
+
+        options = options || {};
+        options.handlers = options.handlers || {};
+
+        this.handlers = options.handlers;
     }
 
     _createClass(GCodeInterpreter, [{

index.js

@@ -38,7 +38,7 @@ const interpret = (self, data) => {
         let word = words[0] || [];
         let letter = word[0];
         let arg = word[1];
-        let cmd = (letter + arg).replace('.', '_');
+        let cmd = (letter + arg);
         let args = {};
 
         if (_.includes(['G', 'M'], letter)) {
@@ -58,6 +58,11 @@ const interpret = (self, data) => {
             args = _.zipObject(words); // returns an object composed from arrays of property names and values.
         }
 
+        if (typeof self.handlers[cmd] === 'function') {
+            let func = self.handlers[cmd];
+            func(args);
+        }
+
         if (typeof self[cmd] === 'function') {
             let func = self[cmd].bind(self);
             func(args);
@@ -67,11 +72,19 @@ const interpret = (self, data) => {
 
 class GCodeInterpreter {
     cmd = '';
+    handlers = {};
+
     _callbacks = {
         'data': [],
         'end': []
     };
 
+    constructor(options) {
+        options = options || {};
+        options.handlers = options.handlers || {};
+
+        this.handlers = options.handlers;
+    }
     on(evt, callback) {
         this._callbacks[evt] && this._callbacks[evt].push(callback);
         return this;

test/index.js

@@ -59,7 +59,46 @@ describe('G-code Interpreter', (done) => {
         });
     });
 
-    describe('G-code: circle', (done) => {
+    describe('G-code: circle (calls GCodeInterpreter)', (done) => {
+        it('should call each function with the expected number of times.', (done) => {
+            let calls = {};
+
+            class GCodeRunner {
+                loadFile(file, callback) {
+                    const handlers = {
+                        'G0': (args) => {
+                            calls.G0 = (calls.G0 || 0) + 1;
+                            expect(args).to.be.an('object');
+                        },
+                        'G1': (args) => {
+                            calls.G1 = (calls.G1 || 0) + 1;
+                            expect(args).to.be.an('object');
+                        },
+                        'G2': (args) => {
+                            calls.G2 = (calls.G2 || 0) + 1;
+                            expect(args).to.be.an('object');
+                        }
+                    };
+
+                    let interpreter = new GCodeInterpreter({ handlers: handlers })
+                    interpreter.interpretFile(file, callback);
+
+                    return interpreter;
+                }
+            };
+
+            new GCodeRunner().loadFile('test/fixtures/circle.nc', (err, results) => {
+                expect(calls.G0).to.equal(2);
+                expect(calls.G1).to.equal(1);
+                expect(calls.G2).to.equal(4);
+                done();
+            });
+        });
+
+    });
+
+
+    describe('G-code: circle (extends GCodeInterpreter)', (done) => {
         let calls = {};
 
         class GCodeRunner extends GCodeInterpreter {