Removed all promises.

examples/lookup2.js

@@ -1,14 +1,15 @@
 var sys = require('sys'),
     geoip = require('../lib/geoip');
 
-con = new geoip.Connection('/usr/local/share/GeoIP/GeoLiteCity.dat');
-
+var dbpath = '/usr/local/share/GeoIP/GeoLiteCity.dat';
 var ip = '216.236.135.152';
+
 sys.puts('Looking up ip: ' + ip + '...\n');
-con.query(ip).addCallback(function (result) {
-  for (var attr in result) {
-    sys.puts(attr + ' : ' + result[attr]);
-  }
+var con = new geoip.Connection(dbpath, function(con) {
+  con.query(ip, function(result) {
+    for (var attr in result) {
+      sys.puts(attr + ' : ' + result[attr]);
+    }
+    con.close();
+  });
 });
-
-con.close();

lib/geoip.js

@@ -1,11 +1,12 @@
 var sys = require('sys'),
   ceoip = require('./ceoip');
 
-function Connection(dbpath) {
+function Connection(dbpath, callback) {
   this.con = new ceoip.Connection();
   this.queue = [];
   this.connected = false;
   this.currentQuery = null;
+  this.callback = callback;
 
   var self = this;
 
@@ -16,11 +17,12 @@ function Connection(dbpath) {
 
   this.con.addListener('connected', function() {
     self.connected = true;
+    self.callback(self);
     self.processQueue();
   });
 
   this.con.addListener('result', function(result) {
-    self.currentQuery[0].emitSuccess(result);
+    self.currentQuery[0](result);
     self.currentQuery = null;
     self.processQueue();
   });
@@ -30,15 +32,13 @@ function Connection(dbpath) {
 
 sys.inherits(Connection, process.EventEmitter);
 
-Connection.prototype.addJob = function(promise, ipAddress) {
-  this.queue.push([promise, ipAddress]);
+Connection.prototype.addJob = function(callback, ipAddress) {
+  this.queue.push([callback, ipAddress]);
   this.processQueue();
 };
 
-Connection.prototype.query = function(ipAddress) {
-  var promise = new process.Promise;
-  this.addJob(promise, ipAddress);
-  return promise;
+Connection.prototype.query = function(ipAddress, callback) {
+  this.addJob(callback, ipAddress);
 };
 
 Connection.prototype.processQueue = function () {