From 6fe47f5fa9860d90c63cdd4f205b215a07adac09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <github@kkaefer.com>
Date: Tue, 21 Jun 2011 16:39:14 +0200
Subject: [PATCH] return real error objects

---
 lib/mbtiles.js    | 10 +++++-----
 test/read.test.js |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/mbtiles.js b/lib/mbtiles.js
index 7039fc5..6d352dc 100644
--- a/lib/mbtiles.js
+++ b/lib/mbtiles.js
@@ -65,7 +65,7 @@ MBTiles.prototype.setup = function(callback) {
 //   has key/value pairs as a hash corresponding to column name and row value.
 // - `callback` Function.
 MBTiles.prototype.insert = function(table, objects, callback) {
-    if (!objects.length) return callback();
+    if (!objects.length) return callback(null);
     var keys = _(objects[0]).keys();
     var placeholders = [];
     _(keys).each(function(k) { placeholders.push('?'); });
@@ -213,7 +213,7 @@ MBTiles.prototype.tile = function(x, y, z, callback) {
         z, x, y,
         function(err, row) {
             if (err) callback(err);
-            else if (!row || !row.tile_data) callback('Tile does not exist');
+            else if (!row || !row.tile_data) callback(new Error('Tile does not exist'));
             else callback(null, row.tile_data);
         });
 };
@@ -241,7 +241,7 @@ MBTiles.prototype.grid = function(x, y, z, callback) {
         },
         function(err, row, rows) {
             if (err) return callback(err);
-            if (!row || !row.grid) return callback('Grid does not exist');
+            if (!row || !row.grid) return callback(new Error('Grid does not exist'));
 
             try {
                 var grid = zlib.inflate(
@@ -255,7 +255,7 @@ MBTiles.prototype.grid = function(x, y, z, callback) {
                     }, {});
                 callback(null, _(JSON.parse(grid)).extend({ data: data }));
             } catch (err) {
-                callback('Grid is invalid');
+                callback(new Error('Grid is invalid'));
             }
         }
     );
@@ -269,7 +269,7 @@ MBTiles.prototype.metadata = function(key, callback) {
         key,
         function(err, row) {
             if (err) callback(err);
-            else if (!row) callback('Key does not exist');
+            else if (!row) callback(new Error('Key does not exist'));
             else callback(null, row.value);
         });
 };
diff --git a/test/read.test.js b/test/read.test.js
index e825288..911567d 100644
--- a/test/read.test.js
+++ b/test/read.test.js
@@ -19,7 +19,7 @@ exports['get metadata'] = function(beforeExit) {
     mbtiles.metadata('version', function(err, value) { if (err) throw err; completion.version = value; });
     mbtiles.metadata('formatter', function(err, value) { if (err) throw err; completion.formatter = value; });
     mbtiles.metadata('bounds', function(err, value) { if (err) throw err; completion.bounds = value; });
-    mbtiles.metadata('invalid', function(err, value) { completion.invalid = err; });
+    mbtiles.metadata('invalid', function(err, value) { completion.invalid = err.message; });
 
     beforeExit(function() {
         assert.deepEqual(completion, {
@@ -36,7 +36,7 @@ exports['get metadata'] = function(beforeExit) {
 
 function yieldsError(status, error, msg) {
     return function(err) {
-        assert.equal(err, msg);
+        assert.equal(err.message, msg);
         status[error]++;
     };
 }