added tests and error handling

Author: silverbucket

index.js

@@ -37,9 +37,17 @@ SecureStore.prototype.save = function (postfix, key, data, cb) {
   assert(typeof key === 'string', 'no hash key specified');
   assert(typeof data !== 'undefined', 'no data to save provided');
 
-  var encData = dsCrypt.encrypt(JSON.stringify(data), this.secret);
+  if (typeof data === 'object') {
+    try {
+      data = JSON.stringify(data);
+    } catch (e) {
+      throw new Error(e);
+    }
+  }
 
-  this.pool.hset(this.namespace + postfix, shasum(key), encData, function (err, reply) {
+  data = dsCrypt.encrypt(data, this.secret);
+
+  this.pool.hset(this.namespace + postfix, shasum(key), data, function (err, reply) {
     cb(err, reply);
   });
 };
@@ -63,7 +71,20 @@ SecureStore.prototype.get = function (postfix, key, cb) {
     } else if (typeof reply !== 'string') {
        cb('record not found');
     } else {
-      cb(null, JSON.parse(dsCrypt.decrypt(reply, self.secret)));
+
+      var data;
+
+      try {
+        data = dsCrypt.decrypt(reply, self.secret);
+      } catch (e) {
+        return cb('unable to decrypt');
+      }
+
+      try {
+        data = JSON.parse(data);
+      } catch (e) {}
+
+      cb(null, data);
     }
   });
 };

test/basics-suite.js

@@ -0,0 +1,140 @@
+function getTests() {
+  return [
+    {
+      desc: '# get something that does not exist',
+      run: function (env, test) {
+        env.mod.get('blahblah', function (err, data) {
+          test.assertTypeAnd(data, 'undefined');
+          test.assert(err, 'record not found');
+        });
+      }
+    },
+
+    {
+      desc: '# save string',
+      run: function (env, test) {
+        env.mod.save('foo', 'hallo', function (err, data) {
+          test.assert(err, null);
+        });
+      }
+    },
+
+    {
+      desc: '# get string',
+      run: function (env, test) {
+        env.mod.get('foo', function (err, data) {
+          test.assertAnd(err, null);
+          test.assertTypeAnd(data, 'string');
+          test.assert(data, 'hallo');
+        });
+      }
+    },
+
+    {
+      desc: '# save object',
+      run: function (env, test) {
+        env.mod.save('foo', { bar: 'baz', wang: 'bang' }, function (err, data) {
+          test.assert(err, null);
+        });
+      }
+    },
+
+    {
+      desc: '# get object',
+      run: function (env, test) {
+        env.mod.get('foo', function (err, data) {
+          test.assertAnd(err, null);
+          test.assertTypeAnd(data, 'object');
+          test.assert(data, { bar: 'baz', wang: 'bang' });
+        });
+      }
+    },
+
+    {
+      desc: '# new scope',
+      run: function (env, test) {
+        env.mod2 = new env.Mod({
+          namespace: 'secure-store-redis-tests',
+          secret: 'i dont know the key :(',
+          redis: {
+            host: '127.0.0.1',
+            port: 6379
+          }
+        });
+        test.assertTypeAnd(env.mod2, 'object');
+        test.assertTypeAnd(env.mod2.get, 'function');
+        test.assertType(env.mod2.save, 'function');
+      }
+    },
+
+
+    {
+      desc: '# get (wrong secret)',
+      run: function (env, test) {
+        env.mod2.get('foo', function (err, data) {
+          test.assertAnd(err, 'unable to decrypt');
+          test.assertType(data, 'undefined');
+        });
+      }
+    },
+
+    {
+      desc: '# save complex object',
+      run: function (env, test) {
+        env.complexObj = {
+          foo: 'bar',
+          bad: 'obj',
+          this: true,
+          me: {
+            o: {
+              me: {
+                o: [true, false, true, null, 'this', 'that', true, 9]
+              }
+            }
+          }
+        };
+        env.mod2.save('complex', env.complexObj, function (err) {
+          test.assert(err, null);
+        });
+      }
+    },
+
+    {
+      desc: '# get complex object',
+      run: function (env, test) {
+        env.mod2.get('complex', function (err, data) {
+          test.assertAnd(err, null);
+          test.assertTypeAnd(data, 'object');
+          test.assert(data, env.complexObj);
+        });
+      }
+    },
+
+  ];
+}
+
+if (typeof define !== 'function') {
+  var define = require('amdefine')(module);
+}
+define(['require'], function (require) {
+  return [{
+    desc: "basic tests",
+    abortOnFail: true,
+    setup: function (env, test) {
+      env.Mod = require('./../index');
+      test.assertTypeAnd(env.Mod, 'function');
+      env.mod = new env.Mod({
+        namespace: 'secure-store-redis-tests',
+        secret: 'sssh dont say nuthin!',
+        redis: {
+          host: '127.0.0.1',
+          port: 6379
+        }
+      });
+      test.assertTypeAnd(env.mod, 'object');
+      test.assertTypeAnd(env.mod.get, 'function');
+      test.assertType(env.mod.save, 'function');
+    },
+    tests: getTests(),
+  }];
+});