Comparing version 1.5.1 to 2.0.0
@@ -37,3 +37,3 @@ var async = require('async'); | ||
barrel.setWarper = function( division, warper ){ | ||
barrel.setWarper = function( division, warper, callback ){ | ||
var self = this; | ||
@@ -43,4 +43,6 @@ if( division && !this.warpers[division] && warper ){ | ||
warper.barrel = self; | ||
self.newDivision( division ); | ||
self.newDivision( division, callback ); | ||
} | ||
else if(callback) callback(); | ||
}; | ||
@@ -57,4 +59,4 @@ | ||
barrel.addDivision = function( division ){ | ||
this.setWarper( division, liner ); | ||
barrel.addDivision = function( division, callback ){ | ||
this.setWarper( division, liner, callback ); | ||
}; | ||
@@ -140,3 +142,3 @@ | ||
*/ | ||
barrel.affiliate = function( firestarter ){ | ||
barrel.affiliate = function( firestarter, callback ){ | ||
this.logger.harconlog( null, 'Affiliate', { name: firestarter.name, division: firestarter.division, context: firestarter.context, events: firestarter.event || firestarter.events }, 'info' ); | ||
@@ -150,3 +152,4 @@ | ||
this.firestarters.push( firestarter ); | ||
this.addDivision( firestarter.division ); | ||
this.addDivision( firestarter.division, callback ); | ||
return firestarter; | ||
@@ -202,3 +205,3 @@ }; | ||
return self.appease( comm, new Error('Communication has been blocked.'), [] ); | ||
//console.log( '--------', comm ); | ||
var matching = this.matching( comm ); | ||
@@ -205,0 +208,0 @@ |
@@ -8,3 +8,3 @@ var Communication = require('../lib/Communication'); | ||
var VERSION = exports.VERSION = '1.5.1'; | ||
var VERSION = exports.VERSION = '2.0.0'; | ||
@@ -85,2 +85,4 @@ var _ = require('lodash'); | ||
Communication.setupSecurity( self.options.idLength || 16 ); | ||
this.barrel = new this.Barrel( ); | ||
@@ -95,4 +97,2 @@ this.barrel.init( extend( this.options.barrel || {}, { name: this.name, division: this.division, logger: this.logger } ), function(err){ | ||
Communication.setupSecurity( self.options.idLength || 16 ); | ||
self.sliceArguments = function( ){ | ||
@@ -120,8 +120,5 @@ var args = new Array(arguments.length); | ||
sliceArguments: self.sliceArguments | ||
} ); | ||
}, {}, callback ); | ||
self.logger.harconlog( null, 'Harcon started.', { }, 'info' ); | ||
if( callback ) | ||
callback(err); | ||
} ); | ||
@@ -188,3 +185,3 @@ } | ||
*/ | ||
inflicter.addicts = function( object, options ){ | ||
inflicter.addicts = function( object, options, callback ){ | ||
var self = this; | ||
@@ -215,3 +212,3 @@ this.detracts( object ); | ||
return this.barrel.affiliate( fss ); | ||
return this.barrel.affiliate( fss, callback ); | ||
}; | ||
@@ -218,0 +215,0 @@ |
@@ -101,2 +101,1 @@ var fs = require('fs'); | ||
}; | ||
{ | ||
"name": "harcon", | ||
"version": "1.5.1", | ||
"version": "2.0.0", | ||
"description": "Messaging/Service Bus for the harmonic convergence of node-based enterprise entities.", | ||
@@ -50,3 +50,3 @@ "keywords": [ | ||
}, | ||
"_id": "harcon@1.5.1" | ||
"_id": "harcon@2.0.0" | ||
} |
@@ -38,8 +38,16 @@ var chai = require("chai"); | ||
describe("Harcon workflow", function () { | ||
describe("Test Harcon status calls", function () { | ||
it('Patient...', function(done){ | ||
setTimeout( function(){ console.log( inflicter.divisions() ); }, 1000 ); | ||
setTimeout( function(){ console.log( inflicter.listeners() ); done(); }, 1500 ); | ||
setTimeout( function(){ | ||
var divisions = inflicter.divisions(); | ||
expect( divisions ).to.eql( [ 'Inflicter', 'Inflicter.click' ] ); | ||
var listeners = inflicter.listeners(); | ||
expect( listeners ).to.eql( [ 'Inflicter', 'Publisher', 'peter', 'walter', 'Alizee', 'Claire', 'Julie', 'Marie' ] ); | ||
done(); | ||
}, 1000 ); | ||
}); | ||
}); | ||
describe("Harcon workflow", function () { | ||
it('Simple greetings by name is', function(done){ | ||
@@ -46,0 +54,0 @@ // Sending a greetings message with 2 parameters and waiting for the proper answer |
@@ -6,3 +6,3 @@ var winston = require('winston'); | ||
if( options.console ){ | ||
return new (winston.Logger)({ transports: [ new (winston.transports.Console)({ colorize: 'true' }) ] }); | ||
return new (winston.Logger)({ transports: [ new (winston.transports.Console)({ level: options.level || 'debug', colorize: 'true' }) ] }); | ||
} | ||
@@ -9,0 +9,0 @@ |
Sorry, the diff of this file is not supported yet
1003978
16947