ShardClient blocks unnecessary static properties, more tests

Author: Ben Buckman

lib/sharding.js

@@ -57,7 +57,7 @@ util.inherits(RedisShardingClient, events.EventEmitter);
 // meant purely for sanity check. avoid calling un-implemented methods in your app.
 RedisShardingClient.prototype.notYetImplemented = function NotSupported(command) {
   command = ("Command " + command).trim();
-  throw new Error(command + " is not yet supported in RedisShardingClient.");
+  throw new Error(command + " is not supported in RedisShardingClient.");
 };
 
 // helper, and for testing: get index of client to use, based on key.
@@ -132,7 +132,8 @@ RedisShardingClient.prototype.waitForConnected = function waitForConnected() {
 };
 
 
-// not-yet-implemented methods throw an error.
+// not-yet-implemented methods throw an error
+// (everything not explicitly re-defined below, and some specific ones.)
 var unImplementedMethods = SingleClientCommands.concat([ 'end', 'send_command', 'server_info' ]);
 unImplementedMethods.forEach(function(command){
   RedisShardingClient.prototype[command] =
@@ -142,6 +143,18 @@ unImplementedMethods.forEach(function(command){
 });
 
 
+// not-yet-implemented static properties
+[ 'connection_id', 'connections', 'commands_sent', 'connect_timeout',
+  'monitoring', 'closing', 'server_info', 'stream'
+].forEach(function(staticProp){
+    RedisShardingClient.prototype.__defineGetter__(staticProp, function(){
+      throw new Error("Property " + staticProp + " is not supported in RedisShardingClient.");
+    });
+    // == no need for setters ==
+  });
+
+
+
 // implement a subset of redis commands,
 // with a simpler input syntax.
 // throw errors on anything not supported.
@@ -260,9 +273,6 @@ RedisShardingClient.prototype.DBSIZE = function(callback) {
 };
 
 
-// @todo dbsize() should return aggregate size
-// @todo keys() should check all clients
-
 
 
 // @TODO this is duplicated between sentinal and sharding, consolidate.

test/test_sharding.js

@@ -528,6 +528,33 @@ describe('RedisShardingClient', function(){
 
     });
 
+
+    it('blocks unnecessary static properties', function(){
+      [ 'connection_id', 'connections', 'commands_sent', 'connect_timeout',
+        'monitoring', 'closing', 'server_info', 'stream'
+      ].forEach(function(staticProp){
+        assert.throws(function(){
+          var x = shardClient[staticProp];
+        },
+        /not supported/);
+      });
+    });
+
+    it('blocks unnecessary methods', function(){
+      [ 
+      // some by design
+      'end', 'send_command', 'server_info',
+      
+      // some @todo
+      'watch', 'unwatch', 'migrate', 'dump', 'select', /* and lots more... */
+      ].forEach(function(command){
+        assert.throws(function(){
+          shardClient[command]();
+        },
+        /not supported/);
+      });
+    });
+
     /*
     @todo
     'persist', 'lpop', 'rpop',
@@ -538,8 +565,6 @@ describe('RedisShardingClient', function(){
     'expire', 'expireat', 'pexpire', 'pexpireat'
 
     'hset', 'hsetnx', 'hdel', 'hincrby', 'sadd', 'setex', 'psetex', 'srem', 'lpush', 'rpush'
-
-    connections, other static properties
     */
 
   });