Module level headers

.jshintrc

@@ -23,6 +23,7 @@
     "define": true,
     "describe": true,
     "it": true,
-    "expect": true
+    "expect": true,
+    "Promise": true
   }
 }

lib/fuel-rest.js

@@ -51,10 +51,10 @@ var FuelRest = function( options ) {
 	this.version = version;
 
 	// setting up default headers
-	this.defaultHeaders = {
+	this.defaultHeaders = _.merge({
 		'User-Agent': 'node-fuel/' + this.version
 		, 'Content-Type': 'application/json'
-	};
+	}, options.headers);
 
 	this.origin = options.origin || options.restEndpoint || 'https://www.exacttargetapis.com';
 };

package.json

@@ -19,10 +19,11 @@
     "grunt-contrib-jshint": "~0.11.0",
     "grunt": "~0.4.5",
     "mocha": "~2.2.1",
+    "promise": "~6.1.0",
     "sinon": "~1.13.0"
   },
   "dependencies": {
-    "fuel-auth": "~0.5.3",
+    "fuel-auth": "~1.0.0",
     "lodash": "~3.5.0",
     "request": "~2.53.0"
   }

test/specs/function-apiRequest.js

@@ -25,12 +25,14 @@
 */
 
 var expect     = require( 'chai' ).expect;
-var sinon      = require( 'sinon' );
-var mockServer = require( '../mock-server' );
-var FuelRest   = require( '../../lib/fuel-rest' );
 var FuelAuth   = require( 'fuel-auth' );
+var FuelRest   = require( '../../lib/fuel-rest' );
+var mockServer = require( '../mock-server' );
 var port       = 4550;
-var localhost  = 'http://127.0.0.1:' + port;
+var Promiser   = (typeof Promise === 'undefined') ? require('promise') : Promise;
+var sinon      = require( 'sinon' );
+
+var localhost = 'http://127.0.0.1:' + port;
 
 describe( 'apiRequest method', function() {
 	'use strict';
@@ -226,9 +228,10 @@ describe( 'apiRequest method', function() {
 
 	it( 'should handle an error from the Auth Client', function( done ) {
 		// stubbing response from auth client with no access token
-		sinon.stub( FuelAuth.prototype, '_requestToken', function( requestOptions, callback ) {
-			callback( new Error( 'error from auth client' ), null );
-			return;
+		sinon.stub( FuelAuth.prototype, '_requestToken', function() {
+			return new Promiser(function(resolve, reject) {
+				reject(new Error( 'error from auth client' ));
+			});
 		});
 
 		// creating local rest client so we can use stubbed auth function
@@ -263,9 +266,10 @@ describe( 'apiRequest method', function() {
 
 	it( 'should try request again if 401 stating token is invalid', function( done ) {
 		var requestSpy = sinon.spy( FuelRest.prototype, 'apiRequest' );
-		sinon.stub( FuelAuth.prototype, '_requestToken', function( requestOptions, callback ) {
-			callback( null, { accessToken: 'testing', expiresIn: 3600 } );
-			return;
+		sinon.stub( FuelAuth.prototype, '_requestToken', function() {
+			return new Promiser(function(resolve) {
+				resolve({ accessToken: 'testing', expiresIn: 3600 });
+			});
 		});
 		// creating local rest client so we can use stubbed auth function
 		var initOptions = {

test/specs/general-tests.js

@@ -93,6 +93,23 @@ describe( 'General Tests', function() {
 		expect( RestClient.origin ).to.equal( 'https://www.exacttarget.com' );
 	});
 
+	it('should merge module level headers into default headers', function() {
+		var options = {
+			auth: {
+				clientId: 'testing'
+				, clientSecret: 'testing'
+			}
+			, headers: {
+				'test': 1
+			}
+		};
+
+		// testing default initialization
+		var RestClient = new FuelRest( options );
+
+		expect(RestClient.defaultHeaders.test).to.equal(1);
+	});
+
 	it( 'should have apiRequest on prototype', function() {
 		expect( FuelRest.prototype.apiRequest ).to.be.a( 'function' );
 	});