From 82ce0e7fec3b8fbdf1ed4d77f86e1e1802735914 Mon Sep 17 00:00:00 2001 From: caylazabel Date: Wed, 15 Feb 2017 15:04:50 -0800 Subject: [PATCH 1/3] some tests are working, now testing async --- .gitignore | 113 +++++++++++++++++++++++++++++++++++++++ data/one.txt | 1 + data/three.txt | 1 + data/two.txt | 1 + index.js | 13 +++++ lib/file-reader.js | 10 ++++ package.json | 27 ++++++++++ test/file-reader-test.js | 46 ++++++++++++++++ 8 files changed, 212 insertions(+) create mode 100644 .gitignore create mode 100644 data/one.txt create mode 100644 data/three.txt create mode 100644 data/two.txt create mode 100644 index.js create mode 100644 lib/file-reader.js create mode 100644 package.json create mode 100644 test/file-reader-test.js diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..51969f1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,113 @@ +# Created by https://www.gitignore.io/api/node,osx,windows + +### Node ### +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (http://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ + +# Typescript v1 declaration files +typings/ + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variables file +.env + + +### OSX ### +*.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +### Windows ### +# Windows thumbnail cache files +Thumbs.db +ehthumbs.db +ehthumbs_vista.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msm +*.msp + +# Windows shortcuts +*.lnk + +# End of https://www.gitignore.io/api/node,osx,windows diff --git a/data/one.txt b/data/one.txt new file mode 100644 index 0000000..8bfe1d1 --- /dev/null +++ b/data/one.txt @@ -0,0 +1 @@ +file number one diff --git a/data/three.txt b/data/three.txt new file mode 100644 index 0000000..17c1c0d --- /dev/null +++ b/data/three.txt @@ -0,0 +1 @@ +file number three diff --git a/data/two.txt b/data/two.txt new file mode 100644 index 0000000..2d8e623 --- /dev/null +++ b/data/two.txt @@ -0,0 +1 @@ +file number two diff --git a/index.js b/index.js new file mode 100644 index 0000000..4117578 --- /dev/null +++ b/index.js @@ -0,0 +1,13 @@ +'use strict'; + +const fs = require('fs'); +const filesToBeRead =[`${__dirname}/data/one.txt`, `${__dirname}/data/two.txt`, `${__dirname}/data/three.txt`]; + +module.exports = function readFiles(){ + filesToBeRead.forEach(function(files){ + fs.readFile(files, function(err, data){ + if (err) throw err; + return data.toString('utf8', 0, 8); + }); + }); +}; diff --git a/lib/file-reader.js b/lib/file-reader.js new file mode 100644 index 0000000..3e3c517 --- /dev/null +++ b/lib/file-reader.js @@ -0,0 +1,10 @@ +'use strict'; + +const fs = require('fs'); + +const fileReader = module.exports = function(file, callback){ + fs.readFile(file, function(err, data){ + if(err) return callback (err); + return callback(null, data.toString()); + }); +}; diff --git a/package.json b/package.json new file mode 100644 index 0000000..77fde18 --- /dev/null +++ b/package.json @@ -0,0 +1,27 @@ +{ + "name": "03-parallel_file_processing", + "version": "1.0.0", + "description": "![CF](https://camo.githubusercontent.com/70edab54bba80edb7493cad3135e9606781cbb6b/687474703a2f2f692e696d6775722e636f6d2f377635415363382e706e67) Lab 03: Parallel File Processing ===", + "main": "index.js", + "directories": { + "test": "test" + }, + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/caylazabel/03-parallel_file_processing.git" + }, + "keywords": [], + "author": "", + "license": "ISC", + "bugs": { + "url": "https://github.com/caylazabel/03-parallel_file_processing/issues" + }, + "homepage": "https://github.com/caylazabel/03-parallel_file_processing#readme", + "devDependencies": { + "chai": "^3.5.0", + "mocha": "^3.2.0" + } +} diff --git a/test/file-reader-test.js b/test/file-reader-test.js new file mode 100644 index 0000000..43525de --- /dev/null +++ b/test/file-reader-test.js @@ -0,0 +1,46 @@ +'use strict'; + +const expect = require('chai').expect; +const fileReader = require('../lib/file-reader.js'); + +describe('File Reader Thing', function(){ + describe('with an improper file', function(){ + it('should return an error', function(done){ + fileReader(`${__dirname}/not-a-file.txt`, function(err){ + expect(err).to.be.an('error'); + done(); + }); + }); + }); + describe('with a proper file path', function() { + it('should return the contents of file one', function(done) { + fileReader(`${__dirname}/../data/one.txt`, function(err, data) { + expect(err).to.equal(null); + expect(data).to.be.a('string'); + expect(data).to.equal('file number one\n'); + done(); + }); + }); + }); + describe('with a proper file path', function() { + it('should return the contents of file two', function(done) { + fileReader(`${__dirname}/../data/two.txt`, function(err, data) { + expect(err).to.equal(null); + expect(data).to.be.a('string'); + expect(data).to.equal('file number two\n'); + done(); + }); + }); + }); + describe('with a proper file path', function() { + it('should return the contents of file three', function(done) { + fileReader(`${__dirname}/../data/three.txt`, function(err, data) { + expect(err).to.equal(null); + expect(data).to.be.a('string'); + expect(data).to.equal('file number three\n'); + done(); + }); + }); + }); + +}); From e56ccdc7a29e3ffc00bf382638703f3b56a2a44c Mon Sep 17 00:00:00 2001 From: caylazabel Date: Wed, 15 Feb 2017 20:10:34 -0800 Subject: [PATCH 2/3] tests did work then broke again --- data/one.txt | 2 +- data/three.txt | 2 +- data/two.txt | 2 +- index.js | 24 +++++++++++-------- lib/file-reader.js | 29 +++++++++++++++++++---- test/file-reader-test.js | 50 +++++++++++++++++++--------------------- 6 files changed, 66 insertions(+), 43 deletions(-) diff --git a/data/one.txt b/data/one.txt index 8bfe1d1..c78e443 100644 --- a/data/one.txt +++ b/data/one.txt @@ -1 +1 @@ -file number one +1file number one diff --git a/data/three.txt b/data/three.txt index 17c1c0d..b0a0abc 100644 --- a/data/three.txt +++ b/data/three.txt @@ -1 +1 @@ -file number three +2file number three diff --git a/data/two.txt b/data/two.txt index 2d8e623..3274cf3 100644 --- a/data/two.txt +++ b/data/two.txt @@ -1 +1 @@ -file number two +3file number two diff --git a/index.js b/index.js index 4117578..a664281 100644 --- a/index.js +++ b/index.js @@ -1,13 +1,17 @@ 'use strict'; const fs = require('fs'); -const filesToBeRead =[`${__dirname}/data/one.txt`, `${__dirname}/data/two.txt`, `${__dirname}/data/three.txt`]; - -module.exports = function readFiles(){ - filesToBeRead.forEach(function(files){ - fs.readFile(files, function(err, data){ - if (err) throw err; - return data.toString('utf8', 0, 8); - }); - }); -}; +const readFiles = require('./lib/file-reader.js') +// const filesToBeRead =[`${__dirname}/data/one.txt`, `${__dirname}/data/two.txt`, `${__dirname}/data/three.txt`]; + + +// filesToBeRead.forEach(function(files){ +// fs.readFile(files, function(err, data){ +// if (err) throw err; +// var contents = data.toString('hex', 0, 8); +// console.log(contents); +// }); +// }); +// }; + +readFiles.readEveryFile(); diff --git a/lib/file-reader.js b/lib/file-reader.js index 3e3c517..77695a1 100644 --- a/lib/file-reader.js +++ b/lib/file-reader.js @@ -2,9 +2,30 @@ const fs = require('fs'); -const fileReader = module.exports = function(file, callback){ - fs.readFile(file, function(err, data){ - if(err) return callback (err); - return callback(null, data.toString()); + +module.exports = exports = {}; + +exports.readOneFile = function(file, callback) { + fs.readFile(file, function(err, data) { + if(err) return callback(err); + var buffer = new Buffer(data); + var hexStuff = buffer.toString('hex', 0, 8); + + return callback(null, hexStuff); + }); +}; + +exports.readEveryFile = function () { + exports.readOneFile(`${__dirname}/../data/one.txt`, function (err, data){ + if (err) throw err; + console.log('this is number one:', data); + + exports.readOneFile(`${__dirname}/../data/two.txt`, function (err, data){ + if (err) throw err; + + exports.readOneFile(`${__dirname}/../data/three.txt`, function (err, data){ + if (err) throw err; + }); + }); }); }; diff --git a/test/file-reader-test.js b/test/file-reader-test.js index 43525de..7f2ac08 100644 --- a/test/file-reader-test.js +++ b/test/file-reader-test.js @@ -3,44 +3,42 @@ const expect = require('chai').expect; const fileReader = require('../lib/file-reader.js'); -describe('File Reader Thing', function(){ - describe('with an improper file', function(){ - it('should return an error', function(done){ - fileReader(`${__dirname}/not-a-file.txt`, function(err){ - expect(err).to.be.an('error'); +describe('testing this file reader', function(){ + describe('These hex values should be in order', function() { + it('the first one should be 3166696c65206e75', function(done){ + fileReader.readOneFile(`${__dirname}/..data/one.txt`, function(err, data){ + expect(err).to.equal(err); + expect(data).to.equal('3166696c65206e75'); done(); }); }); - }); - describe('with a proper file path', function() { - it('should return the contents of file one', function(done) { - fileReader(`${__dirname}/../data/one.txt`, function(err, data) { - expect(err).to.equal(null); - expect(data).to.be.a('string'); - expect(data).to.equal('file number one\n'); + + it('the second one should be 3366696c65206e75', function(done){ + fileReader.readOneFile(`${__dirname}/..data/two.txt`, function(err, data){ + expect(err).to.equal(err); + expect(data).to.equal('3366696c65206e75'); done(); }); }); - }); - describe('with a proper file path', function() { - it('should return the contents of file two', function(done) { - fileReader(`${__dirname}/../data/two.txt`, function(err, data) { - expect(err).to.equal(null); - expect(data).to.be.a('string'); - expect(data).to.equal('file number two\n'); + + it('the third one should be 3266696c65206e75', function(done){ + fileReader.readOneFile(`${__dirname}/..data/three.txt`, function(err, data){ + expect(err).to.equal(err); + expect(data).to.equal('3266696c65206e75'); done(); }); }); }); - describe('with a proper file path', function() { - it('should return the contents of file three', function(done) { - fileReader(`${__dirname}/../data/three.txt`, function(err, data) { - expect(err).to.equal(null); - expect(data).to.be.a('string'); - expect(data).to.equal('file number three\n'); +}); + + +describe('File Reader Thing', function(){ + describe('with an improper file', function(){ + it('should return an error', function(done){ + fileReader(`${__dirname}/not-a-file.txt`, function(err){ + expect(err).to.be.an('error'); done(); }); }); }); - }); From 0e35124af25ebb4d8c478552ba33057b623a70f1 Mon Sep 17 00:00:00 2001 From: caylazabel Date: Thu, 16 Feb 2017 10:05:28 -0800 Subject: [PATCH 3/3] all tests are running correctly --- .eslintrc | 21 +++++++++++++++ index.js | 13 --------- lib/file-reader.js | 37 ++++++++++--------------- package.json | 2 ++ test/file-reader-test.js | 58 +++++++++++++++++----------------------- 5 files changed, 62 insertions(+), 69 deletions(-) create mode 100644 .eslintrc diff --git a/.eslintrc b/.eslintrc new file mode 100644 index 0000000..8dc6807 --- /dev/null +++ b/.eslintrc @@ -0,0 +1,21 @@ +{ + "rules": { + "no-console": "off", + "indent": [ "error", 2 ], + "quotes": [ "error", "single" ], + "semi": ["error", "always"], + "linebreak-style": [ "error", "unix" ] + }, + "env": { + "es6": true, + "node": true, + "mocha": true, + "jasmine": true + }, + "ecmaFeatures": { + "modules": true, + "experimentalObjectRestSpread": true, + "impliedStrict": true + }, + "extends": "eslint:recommended" +} diff --git a/index.js b/index.js index a664281..1cebb19 100644 --- a/index.js +++ b/index.js @@ -2,16 +2,3 @@ const fs = require('fs'); const readFiles = require('./lib/file-reader.js') -// const filesToBeRead =[`${__dirname}/data/one.txt`, `${__dirname}/data/two.txt`, `${__dirname}/data/three.txt`]; - - -// filesToBeRead.forEach(function(files){ -// fs.readFile(files, function(err, data){ -// if (err) throw err; -// var contents = data.toString('hex', 0, 8); -// console.log(contents); -// }); -// }); -// }; - -readFiles.readEveryFile(); diff --git a/lib/file-reader.js b/lib/file-reader.js index 77695a1..7fecfbf 100644 --- a/lib/file-reader.js +++ b/lib/file-reader.js @@ -2,29 +2,20 @@ const fs = require('fs'); - -module.exports = exports = {}; - -exports.readOneFile = function(file, callback) { - fs.readFile(file, function(err, data) { - if(err) return callback(err); - var buffer = new Buffer(data); - var hexStuff = buffer.toString('hex', 0, 8); - - return callback(null, hexStuff); - }); -}; - -exports.readEveryFile = function () { - exports.readOneFile(`${__dirname}/../data/one.txt`, function (err, data){ - if (err) throw err; - console.log('this is number one:', data); - - exports.readOneFile(`${__dirname}/../data/two.txt`, function (err, data){ - if (err) throw err; - - exports.readOneFile(`${__dirname}/../data/three.txt`, function (err, data){ - if (err) throw err; +const readFileHelper = module.exports = function(pathArray, callback) { + var result = []; + + fs.readFile(pathArray[0],function(err, data){ + if (err) return callback(err); + result.push(data.toString('hex', 0, 8)); + fs.readFile(pathArray[1], function(err, data){ + if (err) return callback(err); + result.push(data.toString('hex', 0, 8)); + fs.readFile(pathArray[2], function (err, data){ + if (err) return callback(err); + result.push(data.toString('hex', 0,8)); + console.log('my result:', result); + callback(null, result); }); }); }); diff --git a/package.json b/package.json index 77fde18..2d679b5 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,8 @@ "homepage": "https://github.com/caylazabel/03-parallel_file_processing#readme", "devDependencies": { "chai": "^3.5.0", + "gulp-eslint": "^3.0.1", + "gulp-mocha": "^3.0.1", "mocha": "^3.2.0" } } diff --git a/test/file-reader-test.js b/test/file-reader-test.js index 7f2ac08..7c96de2 100644 --- a/test/file-reader-test.js +++ b/test/file-reader-test.js @@ -1,44 +1,36 @@ 'use strict'; const expect = require('chai').expect; -const fileReader = require('../lib/file-reader.js'); +const readFile = require('../lib/file-reader.js'); -describe('testing this file reader', function(){ - describe('These hex values should be in order', function() { - it('the first one should be 3166696c65206e75', function(done){ - fileReader.readOneFile(`${__dirname}/..data/one.txt`, function(err, data){ - expect(err).to.equal(err); - expect(data).to.equal('3166696c65206e75'); - done(); - }); - }); - - it('the second one should be 3366696c65206e75', function(done){ - fileReader.readOneFile(`${__dirname}/..data/two.txt`, function(err, data){ - expect(err).to.equal(err); - expect(data).to.equal('3366696c65206e75'); - done(); - }); - }); - - it('the third one should be 3266696c65206e75', function(done){ - fileReader.readOneFile(`${__dirname}/..data/three.txt`, function(err, data){ - expect(err).to.equal(err); - expect(data).to.equal('3266696c65206e75'); - done(); +describe('Read File Helper Module', function(){ + describe('with bad file paths', function(){ + it('should return an error', function(){ + readFile([`${__dirname}/dont-exist.txt`], function(err){ + expect(!!err).to.equal(true); }); }); }); -}); - -describe('File Reader Thing', function(){ - describe('with an improper file', function(){ - it('should return an error', function(done){ - fileReader(`${__dirname}/not-a-file.txt`, function(err){ - expect(err).to.be.an('error'); - done(); - }); +describe('with file good file paths', function(){ + before((done) => { + this.paths = [ + `${__dirname}/../data/one.txt`, + `${__dirname}/../data/two.txt`, + `${__dirname}/../data/three.txt` + ]; + done(); + }); + it('should have correct order of hex strings', (done) => { + var expectedResult = ['3166696c65206e75', '3366696c65206e75', '3266696c65206e75']; + readFile(this.paths, function(err, data){ + expect(err).to.equal(null); + expect(data[0]).to.equal(expectedResult[0]); + expect(data[1]).to.equal(expectedResult[1]); + expect(data[2]).to.equal(expectedResult[2]); + console.log('data', data); + done(); }); }); }); +});