From 8fbd4dd2209481c529f6b23f29f8a26c6d5c775b Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <gerwitm@lovullo.com>
Date: Tue, 12 May 2015 14:24:24 -0400
Subject: [PATCH] XhrHttpImpl#serveError

---
 src/dapi/http/XhrHttpImpl.js      | 51 +++++++++++++++++++++++++------
 test/dapi/http/XhrHttpImplTest.js | 32 +++++++++++++++++++
 2 files changed, 73 insertions(+), 10 deletions(-)

diff --git a/src/dapi/http/XhrHttpImpl.js b/src/dapi/http/XhrHttpImpl.js
index 04ac100..a2482ee 100644
--- a/src/dapi/http/XhrHttpImpl.js
+++ b/src/dapi/http/XhrHttpImpl.js
@@ -109,10 +109,15 @@ module.exports = Class( 'XhrHttpImpl' )
      * Subtypes may override this method to alter the ready state change
      * actions taken (e.g. to display progress, handle errors, etc.)  If
      * only the HTTP status needs to be checked, subtypes may override
-     * success/failure determination via `#isSuccessful'.
+     * success/failure determination via `#isSuccessful'.  If the error
+     * response needs to be customized, override `#serveError'.
      *
-     * @param {XMLHttpRequest}   req      request to hook
-     * @param {function(string)} callback continuation to invoke with response
+     * When overriding this method, please either call the parent method or
+     * invoke the aforementioned two methods.
+     *
+     * @param {XMLHttpRequest}          req      request to hook
+     * @param {function(?Error,string)} callback continuation to invoke with
+     *                                           response
      *
      * @return {undefined}
      *
@@ -131,13 +136,7 @@ module.exports = Class( 'XhrHttpImpl' )
             }
             else if ( !( _self.isSuccessful( req.status ) ) )
             {
-                callback(
-                    Error( req.status + " error from server" ),
-                    {
-                        status: req.status,
-                        data:   req.responseText
-                    }
-                );
+                _self.serveError( req, callback );
                 return;
             }
 
@@ -161,6 +160,38 @@ module.exports = Class( 'XhrHttpImpl' )
     'virtual protected isSuccessful': function( status )
     {
         return ( +status >= 200 ) && ( +status < 300 );
+    },
+
+
+    /**
+     * Serve an error response
+     *
+     * The default behavior is to return an Error and content containing the
+     * HTTP status and response text.
+     *
+     * When overriding this method, keep in mind that it should always
+     * return an Error for the first argument, or set it to null, indicating
+     * a success.
+     *
+     * This method exposes the original XMLHttpRequest used to make the
+     * request, so it can be used to perform additional analysis for error
+     * handling, or to override the error and instead return a successful
+     * response.
+     *
+     * @param {XMLHttpRequest}          req      request to hook
+     * @param {function(?Error,string)} callback continuation to invoke with
+     *                                           response
+     * @return {undefined}
+     */
+    'virtual protected serveError': function( req, callback )
+    {
+        callback(
+            Error( req.status + " error from server" ),
+            {
+                status: req.status,
+                data:   req.responseText
+            }
+        );
     }
 } );
 
diff --git a/test/dapi/http/XhrHttpImplTest.js b/test/dapi/http/XhrHttpImplTest.js
index 1256f1c..eeebde3 100644
--- a/test/dapi/http/XhrHttpImplTest.js
+++ b/test/dapi/http/XhrHttpImplTest.js
@@ -222,6 +222,38 @@ describe( 'XhrHttpImpl', function()
         } );
 
 
+        it( 'allows customizing error', function( done )
+        {
+            var _self = this,
+                chk   = {};
+
+            var StubXhr = createStubXhr();
+            StubXhr.prototype.status = 404;
+
+            Sut.extend(
+            {
+                'override protected serveError': function( req, callback )
+                {
+                    var e = Error( 'foobunny' );
+                    e.foo = true;
+
+                    expect( req ).to.be.an.instanceOf( StubXhr );
+
+                    callback( e, chk );
+                },
+            } )( StubXhr )
+                .requestData( 'http://foo', 'GET', '', function( err, resp )
+                {
+                    expect( ( err || {} ).foo ).to.be.ok;
+                    expect( resp ).to.equal( chk );
+
+                    done();
+                } );
+
+            StubXhr.inst.send( '' );
+        } );
+
+
         it( 'returns self', function()
         {
             var sut = Sut( function() {} ),