refactored directory structure to be more JSish

Author: ehirsch

README.md

@@ -1,2 +1,16 @@
 # Caesar Bot
-## Übersetzt römische Ziffern in arabische
+
+## Minimal Facebook chat bot which translates roman numbers into arabic ones. Oh - and it's takling german only. 
+
+
+## Prerequisites
+ 
+ You should know [git](https://git-scm.com/ "Git Homepage") and [node.js](https://nodejs.org/en/ "Get nodejs") and have 
+ installed both.
+
+## Setup
+ 
+clone
+npm install
+npm test
+

src/main/ai/intention.js app/ai/intention.js

@@ -1,6 +1,6 @@
 let expect = require('chai').expect;
 let unroll = require('unroll');
-let intention = require('../../main/ai/intention');
+let intention = require('./intention');
 
 // wrap mochas it function
 unroll.use(it);
@@ -54,14 +54,14 @@ describe('Intention', () => {
 			['mach\'s gut', 'bye'],
 			['machs gut', 'bye'],
 			['machet jut', 'bye'],
-			['mach et jut', 'bye'],
+			['mach et jut', 'bye']
 
-			// offset
-			["Kann ich meine Brille von der Steuer absetzen?", "offset"],
-			["Kann ich eine brille von der Steuer absetzen?", "offset"],
-			["Kann ich Telefonkosten von der Steuer absetzen?", "offset"],
-			["Kann ich Telefonkosten abschreiben?", "offset"],
-			["Kann ich Telefonkosten absetzen?", "offset"]
+			// // TODO: roman numbers
+			// ["Kann ich meine Brille von der Steuer absetzen?", "offset"],
+			// ["Kann ich eine brille von der Steuer absetzen?", "offset"],
+			// ["Kann ich Telefonkosten von der Steuer absetzen?", "offset"],
+			// ["Kann ich Telefonkosten abschreiben?", "offset"],
+			// ["Kann ich Telefonkosten absetzen?", "offset"]
 
 	])
 });

src/test/ai/intention-test.js app/ai/intention.spec.js

@@ -5,8 +5,9 @@ let cookieParser = require('cookie-parser');
 let bodyParser = require('body-parser');
 
 let errorHandler = require('./error/handler');
+
 let index = require('./index/index');
-let fb = require('./fb/fb-webhook');
+let fb = require('./fb/webhook-router');
 
 let app = express();
 

src/main/app.js app/caesar.app.js

@@ -5,8 +5,8 @@ describe('Smoke testing running app', function () {
 	let app, server;
 
 	beforeEach(function () {
-		delete require.cache[require.resolve('../main/app')];
-		app = require('../main/app');
+		delete require.cache[require.resolve('./caesar.app')];
+		app = require('./caesar.app');
 		server = http.createServer(app);
 		server.listen();
 	});

src/test/app-smoke-test.js app/caesar.app.spec.js

@@ -1,6 +1,6 @@
 let expect = require('chai').expect;
 
-let errorHandler = require('../../main/error/handler');
+let errorHandler = require('./handler');
 
 function createMockResponse() {
 	let res = {};

src/main/error/handler.js app/error/handler.js

@@ -1,6 +1,6 @@
 let request = require("request");
 
-const FB_ACCESS_TOKEN = "EAAPbJ9GulzQBAKOOo5gD4EAtEYTI3Oj7xhtbB3ChUvfYd9oCZBIs7QnJ1AEevbZCwam0IdnjYzlZCJ286scYgabnF0twdvYmz9RiebxmaMHdLE7wGQ5eUlXVRF9FtYw0LfvWx9p811bzbX2mKdepgP42Co5GZBZBrpKdbyB3rPgZDZD";
+const FB_ACCESS_TOKEN = "";
 
 
 function errorHandler(error, response/*, body*/) {

src/test/error/handler-test.js app/error/handler.spec.js

@@ -1,13 +1,13 @@
 let expect = require('chai').expect;
 let mockRequire = require('proxyquire');
-let MockConsole = require('../util/mock-console');
+let MockConsole = require('../test-util/mock-console');
 
 
 describe('Sending facebook messages', () => {
 
 	let requestCallArguments;
 
-	let fbSendMessage = mockRequire('../../main/fb/fb-send-message', {
+	let fbSendMessage = mockRequire('./fb-send-message', {
 		'request': (options, callback) => {
 			requestCallArguments = {
 				options: options,

src/main/fb/fb-send-message.js app/fb/fb-send-message.js

@@ -1,4 +1,4 @@
-let template = require('./fb-message-template.json');
+let template = require('./incomming-test-message.template.json');
 
 function cloneJson(json) {
 	return JSON.parse(JSON.stringify(json));

src/test/fb/fb-send-message-test.js app/fb/fb-send-message.spec.js

@@ -1,7 +1,7 @@
 let expect = require('chai').expect;
 let sinon = require('sinon');
 
-let webhookGet = require('../../main/fb/webhook-get');
+let webhookGet = require('./webhook-get');
 
 describe('Webhook GET', () => {
 

src/test/fb/fb-text-message.js app/fb/incomming-test-message.js

@@ -1,9 +1,7 @@
 let sendTextMessage = require('./fb-send-message').sendTextMessage;
 
-const roman = /(Ciao|Bis bald|Adios|Auf Wieder|Bis denne|Tschü|Tschö|mach'?s?\W?(et)? (g|j)ut)/i;
 
 function getFirstMessaging(req) {
-	// console.log( JSON.stringify(req.body, null, 2));
 	return req.body.entry[0].messaging;
 }
 

src/test/fb/fb-message-template.json app/fb/incomming-test-message.template.json

@@ -1,13 +1,13 @@
 let expect = require('chai').expect;
 let mockRequire = require('proxyquire');
-let mockTextMessage = require('./fb-text-message');
+let mockTextMessage = require('./incomming-test-message');
 
 
 describe('Webhook POST', () => {
 
 	let req,res,sendMessage,statusCode;
 
-	let webhookPost = mockRequire('../../main/fb/webhook-post', {
+	let webhookPost = mockRequire('./webhook-post', {
 		'./fb-send-message': {
 			sendTextMessage: (sender, text) => {
 				sendMessage = {

src/main/fb/webhook-get.js app/fb/webhook-get.js

@@ -1,8 +1,8 @@
 let expect = require('chai').expect;
 let sinon = require('sinon');
 
-let indexImpl = require('../../main/index/index-get');
-let info = require('../../main/index/info');
+let indexImpl = require('./index-get');
+let info = require('./info');
 
 describe('Index implementation', () => {
 

src/test/fb/webhook-get-test.js app/fb/webhook-get.spec.js

@@ -1,4 +1,4 @@
-let packageJson = require('../../../package.json');
+let packageJson = require('../../package.json');
 
 let indexInfo = {
 	description: `This is the ${packageJson.name}`,

src/main/fb/webhook-post.js app/fb/webhook-post.js

@@ -1,13 +1,11 @@
-
-module.exports =
-class MockConsole {
+module.exports = class MockConsole {
 	constructor() {
 		this.orgLogMethod = this.getOriginalLogMethod();
 		this.logCalls = [];
 	}
 
 	getOriginalLogMethod() {
-		if(this.orgLogMethod === undefined) {
+		if (this.orgLogMethod === undefined) {
 			return console.log;
 		} else {
 			return this.orgLogMethod;
@@ -25,4 +23,4 @@ class MockConsole {
 		console.log = this.orgLogMethod;
 	}
 
-}
+};

src/test/fb/webhook-post-test.js app/fb/webhook-post.spec.js

@@ -4,7 +4,7 @@
  * Module dependencies.
  */
 
-var app = require('../src/main/app');
+var app = require('../app/caesar.app');
 var debug = require('debug')('caesar-bot:server');
 var http = require('http');
 

src/main/fb/fb-webhook.js app/fb/webhook-router.js

@@ -4,9 +4,8 @@
   "private": true,
   "scripts": {
     "start": "babel-node bin/server",
-    "test": "mocha --compilers js:babel-register src/test/**/*-test.js",
-    "test_fb": "mocha --compilers js:babel-register src/test/fb/webhook-post-test.js",
-    "cover": "babel-node node_modules/.bin/isparta cover _mocha -- --reporter dot src/test/**/*-test.js",
+    "test": "mocha --compilers js:babel-register app/**/*.spec.js",
+    "cover": "babel-node node_modules/.bin/isparta cover _mocha -- --reporter dot app/**/*.spec.js",
     "clean": "rm -rf ./build"
   },
   "dependencies": {
@@ -21,7 +20,6 @@
     "request": "^2.72.0"
   },
   "devDependencies": {
-    "babel-cli": "^6.10.1",
     "chai": "^3.5.0",
     "isparta": "^4.0.0",
     "istanbul": "^0.4.3",