From 4f94c8702ef18c210e4feb8c0d466ae7425cf1a5 Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Sun, 7 Feb 2016 14:39:09 -0500 Subject: [PATCH] Rename syndicate.js to network.js --- js/README.md | 2 +- js/src/ack.js | 8 ++++---- js/src/demand-matcher.js | 1 - js/src/dom-driver.js | 14 ++++++++------ js/src/ground.js | 3 +-- js/src/jquery-driver.js | 9 +++++---- js/src/main.js | 2 +- js/src/{syndicate.js => network.js} | 0 8 files changed, 20 insertions(+), 19 deletions(-) rename js/src/{syndicate.js => network.js} (100%) diff --git a/js/README.md b/js/README.md index c378d9b..f08255a 100644 --- a/js/README.md +++ b/js/README.md @@ -7,5 +7,5 @@ Source files in `src/`, from most general to most specific: - `reflect.js`: Reflection on function formal parameter lists. - `util.js`: Functions `extend` and `kwApply`. - `route.js`: Implementation of dataspace trie structure. - - `syndicate.js`: Implementation of core leaf actors and networks. + - `network.js`: Implementation of core leaf actors and networks. - `main.js`: Main package entry point. diff --git a/js/src/ack.js b/js/src/ack.js index 7e7f3c2..45e22fe 100644 --- a/js/src/ack.js +++ b/js/src/ack.js @@ -1,7 +1,7 @@ // Utility protocol for measuring when a stateChange takes effect. var RandomID = require('./randomid.js'); -var Syndicate = require('./syndicate.js'); +var Network = require('./network.js').Network; var Route = require('./route.js'); var Patch = require('./patch.js'); @@ -14,12 +14,12 @@ function Ack(metaLevel, id) { } Ack.prototype.arm = function () { - Syndicate.Network.stateChange(Patch.sub([$Ack, this.id], this.metaLevel)); - Syndicate.Network.send([$Ack, this.id], this.metaLevel); + Network.stateChange(Patch.sub([$Ack, this.id], this.metaLevel)); + Network.send([$Ack, this.id], this.metaLevel); }; Ack.prototype.disarm = function () { - Syndicate.Network.stateChange(Patch.unsub([$Ack, this.id], this.metaLevel)); + Network.stateChange(Patch.unsub([$Ack, this.id], this.metaLevel)); }; Ack.prototype.check = function (e) { diff --git a/js/src/demand-matcher.js b/js/src/demand-matcher.js index fe95dd0..d5bba33 100644 --- a/js/src/demand-matcher.js +++ b/js/src/demand-matcher.js @@ -1,5 +1,4 @@ var Immutable = require('immutable'); -var Syndicate = require('./syndicate.js'); var Route = require('./route.js'); var Patch = require('./patch.js'); var Util = require('./util.js'); diff --git a/js/src/dom-driver.js b/js/src/dom-driver.js index 39e4243..2b2532a 100644 --- a/js/src/dom-driver.js +++ b/js/src/dom-driver.js @@ -1,11 +1,13 @@ // DOM fragment display driver -var Syndicate = require("./syndicate.js"); var Patch = require("./patch.js"); var DemandMatcher = require('./demand-matcher.js').DemandMatcher; +var Ack = require('./ack.js').Ack; var Seal = require('./seal.js').Seal; -var Network = Syndicate.Network; -var __ = Syndicate.__; -var _$ = Syndicate._$; + +var Network_ = require("./network.js"); +var Network = Network_.Network; +var __ = Network_.__; +var _$ = Network_._$; function spawnDOMDriver(domWrapFunction, jQueryWrapFunction) { domWrapFunction = domWrapFunction || defaultWrapFunction; @@ -35,7 +37,7 @@ function DOMFragment(selector, fragmentClass, fragmentSpec, domWrapFunction, jQu this.domWrapFunction = domWrapFunction; this.jQueryWrapFunction = jQueryWrapFunction; this.demandExists = false; - this.subscriptionEstablished = new Syndicate.Ack(); + this.subscriptionEstablished = new Ack(); this.nodes = this.buildNodes(); } @@ -49,7 +51,7 @@ DOMFragment.prototype.boot = function () { self.jQueryWrapFunction); Network.spawn({ demandExists: false, - subscriptionEstablished: new Syndicate.Ack(1), + subscriptionEstablished: new Ack(1), boot: function () { this.subscriptionEstablished.arm(); return Patch.sub(Patch.advertise(specification), 1); diff --git a/js/src/ground.js b/js/src/ground.js index c0be063..9fc0cd6 100644 --- a/js/src/ground.js +++ b/js/src/ground.js @@ -1,8 +1,7 @@ "use strict"; var Immutable = require('immutable'); -var Syndicate = require('./syndicate.js'); -var Network = Syndicate.Network; +var Network = require('./network.js').Network; function Ground(bootFn) { var self = this; diff --git a/js/src/jquery-driver.js b/js/src/jquery-driver.js index 622f962..c3c77a5 100644 --- a/js/src/jquery-driver.js +++ b/js/src/jquery-driver.js @@ -1,10 +1,11 @@ // JQuery event driver -var Syndicate = require("./syndicate.js"); var Patch = require("./patch.js"); var DemandMatcher = require('./demand-matcher.js').DemandMatcher; -var Network = Syndicate.Network; -var __ = Syndicate.__; -var _$ = Syndicate._$; + +var Network_ = require("./network.js"); +var Network = Network_.Network; +var __ = Network_.__; +var _$ = Network_._$; function spawnJQueryDriver(baseSelector, metaLevel, wrapFunction) { metaLevel = metaLevel || 0; diff --git a/js/src/main.js b/js/src/main.js index 6c92c80..41f93db 100644 --- a/js/src/main.js +++ b/js/src/main.js @@ -6,7 +6,7 @@ function copyKeys(keys, to, from) { } } -module.exports = require("./syndicate.js"); +module.exports = require("./network.js"); module.exports.Route = require("./route.js"); copyKeys(['__', '_$', '$Capture', '$Special', diff --git a/js/src/syndicate.js b/js/src/network.js similarity index 100% rename from js/src/syndicate.js rename to js/src/network.js