Request#get callback now receives both err and res

hakanensari · Feb 7, 2012 · 3627800 · 3627800
1 parent 5b3edfa
commit 3627800
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ req
     operation:   'ItemSearch'
     keywords:    'Deleuze'
     searchIndex: 'All'
-  .get (res) ->
+  .get (err, res) ->
     for item in res.find 'Item'
       console.dir item
 ```

diff --git a/examples/batch_lookup.coffee b/examples/batch_lookup.coffee
@@ -23,5 +23,5 @@ req.add
   'ItemLookup.1.ItemId':             asins[0..9]
   'ItemLookup.2.ItemId':             asins[10..19]
 
-req.get (res) ->
+req.get (err, res) ->
   console.log util.inspect res.toObject(), false, null
diff --git a/examples/item_lookup.coffee b/examples/item_lookup.coffee
@@ -10,5 +10,5 @@ req.add
   operation: 'ItemLookup'
   itemId:    '0816614024'
 
-req.get (res) ->
+req.get (err, res) ->
   console.log util.inspect res.find('Item'), false, null
diff --git a/examples/item_search.coffee b/examples/item_search.coffee
@@ -11,5 +11,5 @@ req.add
   keywords:    'Deleuze'
   searchIndex: 'All'
 
-req.get (res) ->
+req.get (err, res) ->
   console.log util.inspect res.find('Item'), false, null
diff --git a/examples/multiple_country_lookup.coffee b/examples/multiple_country_lookup.coffee
@@ -10,5 +10,5 @@ for locale in Object.keys Hoover::HOSTS
   .add
     operation: 'ItemLookup'
     itemId:    '0816614024'
-  .get (res) ->
+  .get (err, res) ->
     console.log util.inspect res.find('Item'), false, null
diff --git a/examples/remote_cart.coffee b/examples/remote_cart.coffee
@@ -11,7 +11,7 @@ req
     operation:     'ItemLookup'
     itemId:        '0816614024'
     responseGroup: 'Offers'
-  .get (res) ->
+  .get (err, res) ->
     id = res.find('OfferListingId')[0]
     req
       .reset()
@@ -20,5 +20,5 @@ req
         'Item.1.OfferListingId': id
         'Item.1.Quantity':       1
 
-      req.get (res) ->
-        console.log util.inspect res.find('Cart'), false, null
+      req.get (err, res) ->
+        console.log inspect res.find('Cart'), false, null
diff --git a/lib/hoover/request.js b/lib/hoover/request.js
@@ -48,21 +48,21 @@
       return this;
     };
 
-    Request.prototype.get = function(callback, errback) {
+    Request.prototype.get = function(callback) {
       var options;
       options = {
         host: this.host(),
         path: "/onca/xml?" + (this._query())
       };
-      return http.get(options, function(res) {
+      http.get(options, function(res) {
         var data;
         data = '';
         return res.on('data', function(chunk) {
           return data += chunk;
         }).on('end', function() {
-          return callback(new Response(data, res.statusCode));
+          return callback(null, new Response(data, res.statusCode));
         }).on('error', function(e) {
-          if (errback) return errback(e);
+          return callback(e);
         });
       });
     };

diff --git a/src/hoover/request.coffee b/src/hoover/request.coffee
@@ -50,8 +50,9 @@ class Request
 
     this
 
-  # Performs a request and returns a [Response](./response.html).
-  get: (callback, errback) ->
+  # Performs a request and takes a callback that will receive either a
+  # [Response](./response.html) or an error.
+  get: (callback) ->
     options =
       host: @host()
       path: "/onca/xml?#{@_query()}"
@@ -62,9 +63,11 @@ class Request
         .on 'data', (chunk) ->
           data += chunk
         .on 'end', ->
-          callback new Response data, res.statusCode
+          callback null, new Response data, res.statusCode
         .on 'error', (e) ->
-          errback e if errback
+          callback e
+
+    return
 
   # The Amazon endpoint.
   host: ->