frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Merge pull request #375 from hindessm/rename-red-utils

Browse Source 
Rename RED.utils to RED.util
This commit is contained in:
Nick O'Leary 2014-09-03 13:54:31 +01:00
commit 5a81ce8569
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nodes/core/io/22-websocket.js
View File

@ -160,7 +160,7 @@ module.exports = function(RED) {
delete msg._session;
payload = JSON.stringify(msg);
} else {
payload = RED.utils.ensureString(msg.payload);
payload = RED.util.ensureString(msg.payload);
}
if (msg._session && msg._session.type == "websocket") {
node.serverConfig.send(msg._session.id,payload);

2
nodes/core/social/61-email.js
View File

@ -73,7 +73,7 @@ module.exports = function(RED) {
if (msg != null) {
if (smtpTransport) {
node.status({fill:"blue",shape:"dot",text:"sending"});
var payload = RED.utils.ensureString(msg.payload);
var payload = RED.util.ensureString(msg.payload);
smtpTransport.sendMail({
from: node.userid, // sender address

2
nodes/core/storage/65-redisout.js
View File

@ -83,7 +83,7 @@ module.exports = function(RED) {
var k = this.key || msg.topic;
if (k) {
if (this.structtype == "string") {
this.client.set(k,RED.utils.ensureString(msg.payload));
this.client.set(k,RED.util.ensureString(msg.payload));
} else if (this.structtype == "hash") {
var r = hashFieldRE.exec(msg.payload);
if (r) {

4
red/red.js
View File

@ -19,7 +19,7 @@ var nodes = require("./nodes");
var library = require("./library");
var comms = require("./comms");
var log = require("./log");
var utils = require("./utils");
var util = require("./util");
var fs = require("fs");
var settings = null;
var credentials = require("./nodes/credentials");
@ -49,7 +49,7 @@ var RED = {
events: events,
log: log,
comms: comms,
utils: utils,
util: util,
version: function () {
var p = require(path.join(process.env.NODE_RED_HOME,"package.json"));
if (fs.existsSync(path.join(process.env.NODE_RED_HOME,".git"))) {

0
red/utils.js → red/util.js
View File

12
test/red/utils_spec.js → test/red/util_spec.js
View File

@ -14,25 +14,25 @@
* limitations under the License.
**/
var should = require("should");
var utils = require("../../red/utils");
var util = require("../../red/util");
describe("red/utils", function() {
describe("red/util", function() {
describe('ensureString', function() {
it('strings are preserved', function() {
utils.ensureString('string').should.equal('string');
util.ensureString('string').should.equal('string');
});
it('Buffer is converted', function() {
var s = utils.ensureString(new Buffer('foo'));
var s = util.ensureString(new Buffer('foo'));
s.should.equal('foo');
(typeof s).should.equal('string');
});
it('Object is converted to JSON', function() {
var s = utils.ensureString({foo: "bar"});
var s = util.ensureString({foo: "bar"});
(typeof s).should.equal('string');
should.deepEqual(JSON.parse(s), {foo:"bar"});
});
it('stringifies other things', function() {
var s = utils.ensureString(123);
var s = util.ensureString(123);
(typeof s).should.equal('string');
s.should.equal('123');
});