hummingbird-core
Advanced tools
Comparing version 0.0.1 to 0.0.2
43
app.js
@@ -12,3 +12,2 @@ var express = require('express'); | ||
Responder = require('./lib/responder.js'); | ||
Pipeline = require('./lib/pipeline.js'); | ||
@@ -22,9 +21,7 @@ | ||
var Waterline = require('waterline'); | ||
var disk_adapter = require('sails-disk'); | ||
var da = require('sails-disk'); | ||
// Accounts | ||
var account = Waterline.Collection.extend(require('./models/account.js')); | ||
new account({ | ||
adapters: { disk: disk_adapter } | ||
}, function(err, account) { | ||
new account({ adapters: { disk: da }}, function(err, account) { | ||
Account = account; | ||
@@ -35,5 +32,3 @@ }); | ||
var keyword = Waterline.Collection.extend(require('./models/keyword.js')); | ||
new keyword({ | ||
adapters: { disk: disk_adapter } | ||
}, function(err, keyword) { | ||
new keyword({ adapters: { disk: da }}, function(err, keyword) { | ||
Keyword = keyword; | ||
@@ -46,3 +41,3 @@ }); | ||
// Connect queue | ||
// Init queue | ||
Queue.connect(); | ||
@@ -52,4 +47,5 @@ | ||
// Initialize services | ||
Services = require('./lib/services.js'); | ||
// Init services | ||
Services = require('./lib/services.js'); | ||
Services.load(); | ||
@@ -72,2 +68,6 @@ Services.boot(); | ||
/** | ||
* Init Express | ||
*/ | ||
var app = express(); | ||
@@ -79,10 +79,23 @@ | ||
app.post('/accounts', accounts.create); | ||
app.del('/accounts', accounts.destroy); | ||
/** | ||
* Routes | ||
*/ | ||
app.post('/accounts', accounts.create ); | ||
app.del( '/accounts', accounts.destroy); | ||
app.post('/keywords', keywords.create); | ||
app.del('/keywords', keywords.destroy); | ||
app.post('/keywords', keywords.create ); | ||
app.del( '/keywords', keywords.destroy); | ||
app.get( '/callback/:service', callbacks.receive); | ||
app.post('/callback/:service', callbacks.receive); | ||
/** | ||
* Go | ||
*/ | ||
app.listen(hummingbird.config.port); |
@@ -8,3 +8,3 @@ /** | ||
// Forward to proper handler | ||
var response = Responder.response(req.param('service'), req); | ||
var response = Responder.response(req.params.service, req); | ||
res.send(response.content || null, response.code); | ||
@@ -11,0 +11,0 @@ } |
@@ -22,2 +22,3 @@ var sugar = require('sugar'); | ||
self._services[service] = s; | ||
Responder.addService(service, s.Responder); | ||
self.connect(s); | ||
@@ -24,0 +25,0 @@ } |
{ | ||
"name": "hummingbird-core", | ||
"version": "0.0.1", | ||
"version": "0.0.2", | ||
"description": "Core components for hummingbird.", | ||
@@ -5,0 +5,0 @@ "main": "app.js", |
14962
474