Merge branch 'promise'

Conflicts:
	config.js
	lib/recognize/google.js

Author: antirek

app.js

@@ -0,0 +1,6 @@
+
+var config = require('./config');
+var Voicer = require('../index');
+
+var voicer = new Voicer(config);
+voicer.start();

example/app.js

@@ -1,7 +1,7 @@
 module.exports = {
     port: 3000,
     debug: true,
-    record: {    	
+    record: {
     	directory: '/tmp',
     	type: 'wav',
     	duration: 2,
@@ -10,14 +10,25 @@ module.exports = {
     	directory: '/tmp',
     	type: 'google',  // ['yandex', 'google']
     	options: {
-    		//developer_key: ''
-    		developer_key: ''
+    		developer_key: 'AIzaSyDlK5-IadfJtgrfJsi5mdOF-9kzTS_tqh0'
     	}
     },
     lookup: {
         type: 'file',  // ['file', 'mongodb', 'mysql']
         options: {
             dataFile: 'data/peernames.json'
         }
+    },
+    logger: {
+        console: {
+            colorize: true
+        },
+        syslog: {
+            host: 'localhost'
+        },
+        file: {
+            filename: '/var/log/voicer.log',
+            json: false
+        }
     }
-};
+};

config.js renamed to example/config.js

@@ -1,5 +1,5 @@
 [{
-    "name": "Дмитриев", 
+    "name": "лопата", 
     "channel": "SIP/1234"
 },
 {

data/peernames.json renamed to example/data/peernames.json

@@ -0,0 +1,34 @@
+
+var dingDong = require('ding-dong');
+
+var Handler = require('./lib/handler');
+var Logger = require('./lib/logger');
+
+var SourceFactory = require('./lib/source/sourceFactory');
+var RecognizerFactory = require('./lib/recognize/recognizerFactory');
+
+var Server = function (config) {
+
+    this.start = function () {
+
+        var source = (new SourceFactory(config['lookup'])).make();
+        var recognizer = (new RecognizerFactory(config['recognize'])).make();
+
+        var handler = new Handler(source, recognizer, config);
+
+        if (config['logger']) {
+            var logger = new Logger(config['logger']);
+            handler.setLogger(logger);
+        }
+
+        dingDong
+            .createServer(handler.handle)
+            .listen(config['port']);
+
+        if (logger) {
+            logger.info('server started');
+        }
+    };
+};
+
+module.exports = Server;

index.js

@@ -0,0 +1,83 @@
+'use strict';
+
+var Q = require('q');
+
+var ContextWrapper = function (context) {
+    this.on = function (eventName) {
+        var defer = Q.defer();
+        context.on(eventName, function (result) {
+            defer.resolve(result);
+        });
+        return defer.promise;
+    };
+    
+    this.answer = function () {
+        var defer = Q.defer();
+        context.answer(function (err) {
+            if (err) {
+                defer.reject(err);
+            } else {
+                defer.resolve();
+            }
+        });
+        return defer.promise;
+    };
+    
+    this.streamFile = function (filename, acceptDigits) {
+        var defer = Q.defer();
+        context.streamFile(filename, acceptDigits, function (err) {
+            if (err) {
+                defer.reject(err);
+            } else {
+                defer.resolve();
+            }
+        });
+        return defer.promise;
+    };
+    
+    this.recordFile = function (filename, format, escape_digits, timeout) {
+        var defer = Q.defer();
+        context.recordFile(filename, format, escape_digits, timeout, function (err) {
+            if (err) {
+                defer.reject(err);
+            } else {
+                defer.resolve();
+            }
+        });
+        return defer.promise;
+    };
+
+    this.setVariable = function (varName, value) {
+        var defer = Q.defer();
+        context.setVariable(varName, value, function (err) {
+            if (err) {
+                defer.reject(err);
+            } else {
+                defer.resolve();
+            }
+        });
+        return defer.promise;
+    };
+    
+    this.dial = function (channel, timeout, params) {
+        var defer = Q.defer();
+        context.dial(channel, timeout, params, function (err) {
+            if (err) {
+                defer.reject(err);
+            } else {
+                defer.resolve();
+            }
+        });
+        return defer.promise;
+    };
+    
+    this.end = function () {
+        var defer = Q.defer();
+        context.end(function () {
+            defer.resolve();
+        });
+        return defer.promise;
+    };
+};
+
+module.exports = ContextWrapper;