Some structures require a key

chriso · May 12, 2011 · c6dfba5 · c6dfba5
1 parent 667bca1
commit c6dfba5
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/lib/Channel.js b/lib/Channel.js
@@ -21,6 +21,9 @@ var EventEmitter = require('events').EventEmitter;
  */
 
 var Channel = exports.Channel = function (client, channel_name) {
+    if (!channel_name) {
+        throw new Error('A channel key is required');
+    }
     this.name = channel_name;
     this.setClient(client);
 }

diff --git a/lib/Structure.js b/lib/Structure.js
@@ -181,6 +181,9 @@ Structure.prototype.extend = function (methods) {
     var structure = function (client, key, namespace, init_args) {
         this.client = client;
         this.namespace = namespace || '';
+        if (!key) {
+            throw new Error('A key is required');
+        }
         if (Array.isArray(key)) {
             key = key.join(':');
         }

diff --git a/test/structure.test.js b/test/structure.test.js
@@ -4,7 +4,7 @@ var redback = require('redback'),
     Hash = redback.Hash,
     List = redback.List;
 
-var hash = new Hash(), list = new List(), structure = new Structure();
+var hash = new Hash(null, 'hash'), list = new List(null, 'list'), structure = new Structure(null, 'structure');
 
 module.exports = {
 
@@ -44,6 +44,19 @@ module.exports = {
         assert.equal('bar', hash.bar());
         assert.ok(typeof structure.bar === 'undefined');
         assert.ok(typeof list.bar === 'undefined');
+    },
+
+    'test creating a structure with no key': function () {
+        var structures = [
+            'List','Hash','Set','SortedSet','CappedList','DensitySet',
+            'Channel','KeyPair','SocialGraph'
+        ];
+
+        structures.forEach(function (structure) {
+            assert.throws(function () {
+                redback['create' + Structure]();
+            });
+        });
     }
 
 }