refactor

Author: radiovisual

lib/index.js

@@ -79,7 +79,7 @@ export default class TimeCard {
 		}
 
 		return new Promise(async resolve => {
-			await self.getTimeCardData();
+			await self.processTimeCardData();
 
 			if (self.clockoutIsPending) {
 				console.log(self.errors.clockOutIsPending);
@@ -117,7 +117,7 @@ export default class TimeCard {
 		}
 
 		return new Promise(async resolve => {
-			await self.getTimeCardData();
+			await self.processTimeCardData();
 
 			if (self.clockoutIsPending) {
 				const date = new Date().toString();
@@ -151,7 +151,7 @@ export default class TimeCard {
 		const self = this;
 
 		return new Promise(async resolve => {
-			await self.getTimeCardData();
+			await self.processTimeCardData();
 
 			let output = self.prettyPrintHeader();
 			self.timecardData.shifts.forEach(item => {

lib/utils.js

@@ -3,7 +3,7 @@ import fs from 'fs';
 import duration from 'pendel';
 import sort from 'lodash.sortby';
 import happyAsJson from 'happy-json';
-import {errors} from './messages.js';
+// import {errors} from './messages.js';
 
 // help node 0.10 with Promises
 require('native-promise-only');
@@ -13,42 +13,40 @@ require('native-promise-only');
  *
  * @returns {*} Promise
  */
-export function getTimeCardData() {
+export function processTimeCardData() {
 	const self = this;
 
 	return new Promise((resolve, reject) => {
-		fs.readFile(self.filepath, 'utf8', (err, data) => {
-			if (err) {
-				reject(err);
-			} else {
-				self.timecardData = JSON.parse(data);
-				self.name = self.timecardData.name;
-				const shifts = self.timecardData.shifts;
+		self.getTimeCard().then(data => {
+			self.timecardData = JSON.parse(data);
+			self.name = self.timecardData.name;
+			const shifts = self.timecardData.shifts;
 
-				// reset to zero each time the timecard data is read
-				self.totalSeconds = 0;
+			// reset to zero each time the timecard data is read
+			self.totalSeconds = 0;
 
-				if (shifts.length > 0) {
-					self.shifts = sort(shifts, shift => {
-						return shift.id;
-					});
+			if (shifts.length > 0) {
+				self.shifts = sort(shifts, shift => {
+					return shift.id;
+				});
 
-					const lastShift = self.shifts[self.shifts.length - 1];
-					if (lastShift.hasOwnProperty('startTime') && lastShift.hasOwnProperty('endTime') === false) {
-						self.clockoutIsPending = true;
-						self.pendingClockoutIndex = lastShift.id;
-					}
-					self.shifts.map(item => {
-						if (item.hasOwnProperty('startTime') && item.hasOwnProperty('endTime')) {
-							self.totalSeconds += duration(item.startTime, item.endTime).totalSeconds;
-						}
-					});
-					resolve(self.shifts);
-				} else {
-					self.shifts = [];
-					resolve(self.timecardData);
+				const lastShift = self.shifts[self.shifts.length - 1];
+				if (lastShift.hasOwnProperty('startTime') && lastShift.hasOwnProperty('endTime') === false) {
+					self.clockoutIsPending = true;
+					self.pendingClockoutIndex = lastShift.id;
 				}
+				self.shifts.map(item => {
+					if (item.hasOwnProperty('startTime') && item.hasOwnProperty('endTime')) {
+						self.totalSeconds += duration(item.startTime, item.endTime).totalSeconds;
+					}
+				});
+				resolve(self.shifts);
+			} else {
+				self.shifts = [];
+				resolve(self.timecardData);
 			}
+		}).catch(err => {
+			reject(err);
 		});
 	});
 }
@@ -71,6 +69,25 @@ export function writeTimeCard(data) {
 	});
 }
 
+/**
+ * Read the .timecard.json file from disk and return its contents
+ *
+ * @returns {*} Promise
+ */
+export function getTimeCard() {
+	const self = this;
+
+	return new Promise((resolve, reject) => {
+		fs.readFile(self.filepath, 'utf8', (err, data) => {
+			if (err) {
+				reject(err);
+			} else {
+				resolve(data);
+			}
+		});
+	});
+}
+
 /**
  * The blank .timecard.json value.
  */
@@ -82,15 +99,9 @@ export function blankTimecard(name) {
  * Check if .timecard.json is in a valid json format.
  */
 export function checkForValidTimecard() {
-	try {
-		var timecardData = require('../.timecard.json');
-
-		if (happyAsJson(timecardData) === false) {
-			throw new Error('Invalid timecard data.');
-		}
-	} catch (err) {
-		console.log(errors.invalidTimeCardJSON);
-		console.log('  ' + err);
-		process.exit(1);
-	}
+	this.getTimeCard().then(data => {
+		return happyAsJson(data);
+	}).catch(() => {
+		return false;
+	});
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "timecard",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "Keep track of your project development time",
   "main": "timecard.js",
   "scripts": {

test/test.js

@@ -87,10 +87,10 @@ test.serial('records total seconds', async t => {
 	t.true(timecard.totalSeconds >= 3);
 });
 
-test.serial('utils.getTimeCardData', async t => {
+test.serial('utils.processTimeCardData', async t => {
 	await timecard.create();
 	await timecard.clockin();
-	timecard.getTimeCardData().then(data => {
+	timecard.processTimeCardData().then(data => {
 		t.true(data);
 		t.is(typeof data, 'object');
 		t.is(data[0].id, 0);