Merge 0437fcb into 359a479

SparkPost · Feb 23, 2016 · df65cd7 · df65cd7
2 parents 359a479 + 0437fcb
commit df65cd7
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 3 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -45,12 +45,15 @@ module.exports = function(grunt) {
       }
     },
     shell: {
-      test: {
+      coverage: {
         command : '<%= config.binPath %>/istanbul cover --report lcov --dir test/reports/ <%= config.binPath %>/_mocha test/spec -- --reporter ' + reporter,
         options : {
           stdout : true,
           failOnError : true
         }
+      },
+      test: {
+        command: '<%= config.binPath %>/_mocha test/spec'
       }
     },
     coveralls: {
@@ -69,7 +72,8 @@ module.exports = function(grunt) {
   // grunt test - runs linting and then our unit tests
   grunt.registerTask('test', [
     'lint',
-    'shell:test'
+    'shell:test',
+    'shell:coverage'
   ]);
 
   // register default grunt command as grunt test

diff --git a/lib/sparkpost.js b/lib/sparkpost.js
@@ -84,6 +84,11 @@ SparkPost.prototype.request = function( options, callback ) {
   // set Strict SSL (Always true)
   options.strictSSL = true;
 
+  // default to accepting gzipped responses
+  if (typeof options.gzip === 'undefined') {
+    options.gzip = true;
+  }
+
   request(options, function(err, res, body) {
     var invalidCodeRegex = /(5|4)[0-9]{2}/;
     if(err) {

diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
     "jshint-stylish": "0.4.0",
     "matchdep": "0.3.0",
     "mocha": "1.21.4",
-    "nock": "^1.6.1",
+    "nock": "^7.2.2",
     "proxyquire": "1.0.1",
     "sinon": "^1.14.1",
     "sinon-chai": "2.5.0",

diff --git a/test/spec/sparkpost.spec.js b/test/spec/sparkpost.spec.js
@@ -2,6 +2,7 @@ var chai = require('chai')
   , expect = chai.expect
   , sinon = require('sinon')
   , sinonChai = require('sinon-chai')
+  , zlib = require('zlib')
   , nock = require('nock')
   , SparkPost = require('../../lib/sparkpost');
 
@@ -165,6 +166,64 @@ describe('SparkPost Library', function() {
         done();
       });
     });
+
+    it('should accept gzipped responses', function(done) {
+      var TEST_MESSAGE = 'This is a compressible test and it is full of compressible test stuff.'
+        , compressedMsg
+        , gzipNock
+        , options = {
+          method: 'GET'
+          , uri: 'https://test.sparkpost.com/test'
+          };
+
+      zlib.gzip(TEST_MESSAGE+TEST_MESSAGE, function(err, gzipped) {
+        expect(err).to.be.null;
+        compressedMsg = gzipped;
+        gzipNock = nock('https://test.sparkpost.com', {
+            reqheaders: {
+              'accept-encoding': 'gzip'
+            }
+          })
+          .get('/test')
+          .reply(200, compressedMsg, {
+            'X-Transfer-Length': String(compressedMsg.length)
+            , 'Content-Length': undefined
+            , 'Content-Encoding': 'gzip'
+          });
+        client.request(options, function(err, data) {
+          expect(err).to.be.null;
+          expect(data.statusCode).to.equal(200);
+          expect(data.body).to.equal(TEST_MESSAGE + TEST_MESSAGE);
+
+          // finish async test
+          done();
+        });
+      });
+    });
+
+    it('should support explicitly disabled gzip option', function(done) {
+      var TEST_MESSAGE = 'This is an uncompressed test message';
+
+      nock('https://test.sparkpost.com')
+        .get('/test')
+        .reply(200, TEST_MESSAGE);
+
+      var options = {
+        method: 'GET'
+        , uri: 'https://test.sparkpost.com/test'
+        , gzip: false
+      };
+
+      client.request(options, function(err, data) {
+        expect(err).to.be.null;
+        expect(data.statusCode).to.equal(200);
+        expect(data.body).to.equal(TEST_MESSAGE);
+        expect(data.headers).not.to.have.property('content-encoding');
+
+        // finish async test
+        done();
+      });
+    });
   });
 
   describe('get method', function() {