Skip to content

Commit

Permalink
using ordu
Browse files Browse the repository at this point in the history
  • Loading branch information
rjrodger committed Sep 16, 2016
1 parent f7e5784 commit 700c500
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 171 deletions.
2 changes: 1 addition & 1 deletion .eslintrc
@@ -1,3 +1,3 @@
{
"extends": "seneca"
}
}
84 changes: 0 additions & 84 deletions lib/ward.js

This file was deleted.

5 changes: 3 additions & 2 deletions package.json
Expand Up @@ -85,12 +85,13 @@
"minimist": "1.2.0",
"nid": "0.3.2",
"norma": "0.3.0",
"ordu": "0.0.1",
"patrun": "0.5.1",
"rolling-stats": "0.1.1",
"semver": "5.3.0",
"seneca-log-filter": "0.1.0",
"seneca-transport": "2.1.0",
"use-plugin": "0.3.1",
"seneca-log-filter": "0.1.0"
"use-plugin": "0.3.1"
},
"devDependencies": {
"async": "2.0.x",
Expand Down
20 changes: 10 additions & 10 deletions seneca.js
Expand Up @@ -17,12 +17,12 @@ var Nid = require('nid')
var Norma = require('norma')
var Patrun = require('patrun')
var Stats = require('rolling-stats')
var Ordu = require('ordu')


// Internal modules.
var Actions = require('./lib/actions')
var Common = require('./lib/common')
var Ward = require('./lib/ward')
var Errors = require('./lib/errors')
var Legacy = require('./lib/legacy')
var Optioner = require('./lib/optioner')
Expand Down Expand Up @@ -412,7 +412,7 @@ function make_seneca (initial_options) {
private$.ready_list = []


private$.inward = Ward({name: 'inward'})
private$.inward = Ordu({name: 'inward'})
private$.inward.add(Actions.inward.act_default)
private$.inward.add(Actions.inward.act_not_found)

Expand Down Expand Up @@ -879,7 +879,7 @@ function make_seneca (initial_options) {
var execute_action = function execute_action (act_instance, action_done) {
actmeta = actmeta || act_instance.find(args, {catchall: so.internal.catchall})

var wardctxt = {
var inwardctxt = {
seneca: act_instance,
actmeta: actmeta,
options: act_instance.options(),
Expand All @@ -893,15 +893,15 @@ function make_seneca (initial_options) {
__origargs: origargs
}
var msg = args // _.clone(origmsg)
var wardres = private$.inward.process(wardctxt, msg)
// console.log('WARD', actmeta && actmeta.pattern, wardres)
var inwardres = private$.inward.process(inwardctxt, msg)
// console.log('WARD', actmeta && actmeta.pattern, inwardres)

if (wardres) {
if ('error' === wardres.kind) {
return action_done.call(act_instance, wardres.error)
if (inwardres) {
if ('error' === inwardres.kind) {
return action_done.call(act_instance, inwardres.error)
}
else if ('result' === wardres.kind) {
return action_done.call(act_instance, null, wardres.result)
else if ('result' === inwardres.kind) {
return action_done.call(act_instance, null, inwardres.result)
}
}

Expand Down
74 changes: 0 additions & 74 deletions test/ward.test.js

This file was deleted.

0 comments on commit 700c500

Please sign in to comment.