Skip to content

added ability to pass undefined instead of callback #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mranney merged 2 commits into from
Nov 15, 2011
Merged

added ability to pass undefined instead of callback #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f30ecbe
added ability to pass undefined instead of callback
bobrik Oct 2, 2011
0c1c8ca
added test for optional callbacks
bobrik Oct 15, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ function Command(command, args, sub_command, callback) {
}

RedisClient.prototype.send_command = function (command, args, callback) {
var arg, this_args, command_obj, i, il, elem_count, stream = this.stream, buffer_args, command_str = "", buffered_writes = 0;
var arg, this_args, command_obj, i, il, elem_count, stream = this.stream, buffer_args, command_str = "", buffered_writes = 0, last_arg_type;

if (typeof command !== "string") {
throw new Error("First argument to send_command must be the command name string, not " + typeof command);
Expand All @@ -500,9 +500,11 @@ RedisClient.prototype.send_command = function (command, args, callback) {
// send_command(command, [arg1, arg2, cb]);
// client.command(arg1, arg2); (callback is optional)
// send_command(command, [arg1, arg2]);
if (typeof args[args.length - 1] === "function") {
callback = args[args.length - 1];
args.length -= 1;
// client.command(arg1, arg2, undefined); (callback is undefined)
// send_command(command, [arg1, arg2, undefined]);
last_arg_type = typeof args[args.length - 1];
if (last_arg_type === "function" || last_arg_type === "undefined") {
callback = args.pop();
}
} else {
throw new Error("send_command: last argument must be a callback or undefined");
Expand Down
14 changes: 14 additions & 0 deletions test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1175,6 +1175,20 @@ tests.TTL = function () {
}, 500);
};

tests.OPTIONAL_CALLBACK = function() {
var name = "OPTIONAL_CALLBACK";
client.del("op_cb1");
client.set("op_cb1", "x");
client.get("op_cb1", last(name, require_string("x", name)));
};

tests.OPTIONAL_CALLBACK_UNDEFINED = function() {
var name = "OPTIONAL_CALLBACK_UNDEFINED";
client.del("op_cb2");
client.set("op_cb2", "y", undefined);
client.get("op_cb2", last(name, require_string("y", name)));
}

all_tests = Object.keys(tests);
all_start = new Date();
test_count = 0;
Expand Down