Rename 'plugins' to 'modules'

diff --git a/server/client.js b/server/client.js
index 60912be9e4cfbe92ab0015eb4a4fe0d438354224..6ffe38c5a9330420e01a750782cb7903aad81b22 100755 (executable)
--- a/server/client.js
+++ b/server/client.js
@@ -47,7 +47,7 @@ var Client = function (websocket) {
         websocketError.apply(that, arguments);
     });
 
-    global.plugins.emit('client:connected', {client:this});
+    global.modules.emit('client:connected', {client:this});
 };
 util.inherits(Client, events.EventEmitter);
 

diff --git a/server/clientcommands.js b/server/clientcommands.js
index 9118ba5bde879935b7a07b10f59c3c4523c098e8..13b5243488fe7045091dbfbb2bba05d21bbfda13 100644 (file)
--- a/server/clientcommands.js
+++ b/server/clientcommands.js
@@ -26,7 +26,7 @@ var listeners = {
         data.args = args;\r
         data.client = null;\r
 \r
-        global.plugins.emit('client:commands:msg', data);\r
+        global.modules.emit('client:commands:msg', data);\r
 \r
         if (args.target && (args.msg)) {\r
             // TODO: Enable plugin support here again\r

diff --git a/server/kiwi.js b/server/kiwi.js
index fafc5cfd574d64c1a8d4253207ca9c596071f342..9e716a03d10d1b5d62e1926787090834e44bc79f 100755 (executable)
--- a/server/kiwi.js
+++ b/server/kiwi.js
@@ -3,7 +3,7 @@ var fs          = require('fs'),
     WebListener = require('./weblistener.js'),
     config      = require('./configuration.js'),
     rehash      = require('./rehash.js'),
-    plugins = require('./plugins');
+    modules = require('./modules.js');
 
 
 
@@ -57,10 +57,10 @@ if ((!global.config.servers) || (global.config.servers.length < 1)) {
 
 
 // Create a plugin interface
-global.plugins = new plugins.Publisher();
+global.modules = new modules.Publisher();
 
 // Register as the active imterfac
-plugins.registerPublisher(global.plugins);
+modules.registerPublisher(global.modules);
 
 require('../server_modules/example.js');
 

diff --git a/server/plugins.js b/server/modules.js
similarity index 76%
rename from server/plugins.js
rename to server/modules.js
index cb944277556658b8f5154f7378ee2e927d4e834f..3961785c465e568ab92a15b0dbf352002d168ee3 100644 (file)
--- a/server/plugins.js
+++ b/server/modules.js
@@ -8,7 +8,7 @@ var active_publisher;
 
 // Create a publisher to allow event subscribing
 function Publisher (obj) {
-       var EventPublisher = function pluginPublisher() {};
+       var EventPublisher = function modulePublisher() {};
        util.inherits(EventPublisher, events.EventEmitter);
 
        return new EventPublisher();
@@ -22,9 +22,9 @@ function registerPublisher (obj) {
 
 
 
-function Plugin (plugin_name) {
+function Module (module_name) {
 
-       // Holder for all the bound events by this plugin
+       // Holder for all the bound events by this module
        var bound_events = {};
 
        // Handy function to be a little more consistant with EventEmitter
@@ -33,25 +33,25 @@ function Plugin (plugin_name) {
        };
 
 
-       // Keep track of this plugins events and bind
+       // Keep track of this modules events and bind
        this.subscribe = function (event_name, fn) {
                bound_events[event_name] = bound_events[event_name] || [];
                bound_events[event_name].push(fn);
 
-               global.plugins.on(event_name, fn);
+               global.modules.on(event_name, fn);
        };
 
 
-       // Keep track of this plugins events and bind once
+       // Keep track of this modules events and bind once
        this.once = function (event_name, fn) {
                bound_events[event_name] = bound_events[event_name] || [];
                bound_events[event_name].push(fn);
 
-               global.plugins.once(event_name, fn);
+               global.modules.once(event_name, fn);
        };
 
 
-       // Remove any events by this plugin only
+       // Remove any events by this module only
        this.unsubscribe = function (event_name, fn) {
                var idx;
 
@@ -72,11 +72,11 @@ function Plugin (plugin_name) {
                        }
                }
 
-               global.plugins.removeListener(event_name, fn);
+               global.modules.removeListener(event_name, fn);
        };
 
 
-       // Clean up anything used by this plugin
+       // Clean up anything used by this module
        this.dispose = function () {
                this.unsubscribe();
        };
@@ -86,7 +86,7 @@ function Plugin (plugin_name) {
 
 module.exports = {
        // Objects
-       Plugin: Plugin,
+       Module: Module,
        Publisher: Publisher,
 
        // Methods

diff --git a/server_modules/example.js b/server_modules/example.js
index 9fa30cf623e7002aa5323355210ef433cf400a95..df1136091cfd29db422fbb0e1f02900ad48392af 100644 (file)
--- a/server_modules/example.js
+++ b/server_modules/example.js
@@ -1,14 +1,14 @@
-var kiwiPlugins = require('../server/plugins.js');
+var kiwiModules = require('../server/modules');
 
-var plugin = new kiwiPlugins.Plugin('Example Plugin');
+var module = new kiwiModules.Module('Example Module');
 
 
-plugin.subscribe('client:connected', function(data) {
-       console.log('Client connection:', data);
+module.subscribe('client:connected', function(data) {
+    console.log('Client connection:', data);
 });
 
 
-plugin.subscribe('client:commands:msg', function(data) {
-       console.log('Client msg:', data.args.target, ': ', data.args.msg);
-       data.args.msg += ' - modified!';
+module.subscribe('client:commands:msg', function(data) {
+    console.log('Client msg:', data.args.target, ': ', data.args.msg);
+    data.args.msg += ' - modified!';
 });
\ No newline at end of file