Merge branch 'dev'

Author: cheton

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gcode-interpreter",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "G-code Interpreter",
   "author": "Cheton Wu <cheton@gmail.com>",
   "homepage": "https://github.com/cheton/gcode-interpreter",
@@ -26,7 +26,7 @@
   },
   "main": "lib/index.js",
   "dependencies": {
-    "gcode-parser": "^1.0.0"
+    "gcode-parser": "^1.1.0"
   },
   "devDependencies": {
     "babel-core": "^6.21.0",

src/index.js

@@ -1,4 +1,10 @@
-import { parseFile, parseStream, parseString } from 'gcode-parser';
+import {
+    parseStream,
+    parseFile,
+    parseFileSync,
+    parseString,
+    parseStringSync
+} from 'gcode-parser';
 
 const noop = () => {};
 
@@ -105,13 +111,27 @@ class GCodeInterpreter {
         });
         return s;
     }
+    loadFromFileSync(file) {
+        const list = parseFileSync(file);
+        for (let i = 0; i < list.length; ++i) {
+            interpret(this, list[i]);
+        }
+        return list;
+    }
     loadFromString(str, callback = noop) {
         const s = parseString(str, callback);
         s.on('data', (data) => {
             interpret(this, data);
         });
         return s;
     }
+    loadFromStringSync(str) {
+        const list = parseStringSync(str);
+        for (let i = 0; i < list.length; ++i) {
+            interpret(this, list[i]);
+        }
+        return list;
+    }
 }
 
 export {

test/index.js

@@ -88,6 +88,25 @@ describe('G-code Interpreter', () => {
                     expect(results.length).to.be.equal(7);
                 });
         });
+
+        it('loadFromFileSync() should return expected result.', (done) => {
+            const file = 'test/fixtures/circle.nc';
+            const runner = new GCodeInterpreter();
+            const results = runner.loadFromFileSync(file);
+            expect(results).to.be.an('array');
+            expect(results.length).to.be.equal(7);
+            done();
+        });
+
+        it('loadFromStringSync() should return expected result.', (done) => {
+            const file = 'test/fixtures/circle.nc';
+            const string = fs.readFileSync(file, 'utf8');
+            const runner = new GCodeInterpreter();
+            const results = runner.loadFromStringSync(string);
+            expect(results).to.be.an('array');
+            expect(results.length).to.be.equal(7);
+            done();
+        });
     });
 
     describe('G-code: circle (calls GCodeInterpreter)', () => {
@@ -125,10 +144,8 @@ describe('G-code Interpreter', () => {
                 done();
             });
         });
-
     });
 
-
     describe('G-code: circle (extends GCodeInterpreter)', () => {
         const calls = {};
 
@@ -151,13 +168,18 @@ describe('G-code Interpreter', () => {
         }
 
         it('should call each function with the expected number of times.', (done) => {
+            const file = 'test/fixtures/circle.nc';
+            const string = fs.readFileSync(file, 'utf8');
             const runner = new GCodeRunner();
-            runner.loadFromFile('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();
-            });
+            runner.loadFromFileSync(file);
+            expect(calls.G0).to.equal(2);
+            expect(calls.G1).to.equal(1);
+            expect(calls.G2).to.equal(4);
+            runner.loadFromStringSync(string);
+            expect(calls.G0).to.equal(2 * 2);
+            expect(calls.G1).to.equal(1 * 2);
+            expect(calls.G2).to.equal(4 * 2);
+            done();
         });
     });
 
@@ -198,13 +220,18 @@ describe('G-code Interpreter', () => {
         }
 
         it('should call each function with the expected number of times.', (done) => {
+            const file = 'test/fixtures/one-inch-circle.nc';
+            const string = fs.readFileSync(file, 'utf8');
             const runner = new GCodeRunner();
-            runner.loadFromFile('test/fixtures/one-inch-circle.nc', (err, results) => {
-                expect(calls.G0).to.equal(4);
-                expect(calls.G1).to.equal(2);
-                expect(calls.G2).to.equal(4);
-                done();
-            });
+            runner.loadFromFileSync(file);
+            expect(calls.G0).to.equal(4);
+            expect(calls.G1).to.equal(2);
+            expect(calls.G2).to.equal(4);
+            runner.loadFromStringSync(string);
+            expect(calls.G0).to.equal(4 * 2);
+            expect(calls.G1).to.equal(2 * 2);
+            expect(calls.G2).to.equal(4 * 2);
+            done();
         });
     });