Merge pull request #146 from SparkPost/145-single-suppression

Fixes #145

Author: richleland

examples/suppressionList/upsert.js

@@ -3,14 +3,28 @@
 var key = 'YOURAPIKEY'
   , SparkPost = require('sparkpost')
   , client = new SparkPost(key)
-  , recipient = {
-    email: '[email protected]'
-    , transactional: false
-    , non_transactional: true
-    , description: 'Test description'
-  };
+  , recipients = [
+    {
+      email: '[email protected]'
+      , transactional: false
+      , non_transactional: true
+      , description: 'Test description 1'
+    },
+    {
+      email: '[email protected]'
+      , transactional: true
+      , non_transactional: true
+      , description: 'Test description 2'
+    },
+    {
+      email: '[email protected]'
+      , transactional: true
+      , non_transactional: false
+      , description: 'Test description 3'
+    }
+  ];
 
-client.suppressionList.upsert(recipient, function(err, res) {
+client.suppressionList.upsert(recipients, function(err, res) {
   if (err) {
     console.log(err);
   } else {

examples/suppressionList/upsert_bulk.js

@@ -45,31 +45,29 @@ module.exports = function(client) {
       };
       client['delete'](options, callback);
     },
-    upsert: function(recipient, callback) {
-      if(typeof recipient === 'function') {
-        callback = recipient;
-        recipient = null;
+    upsert: function(recipients, callback) {
+      var options;
+
+      if(typeof recipients === 'function') {
+        callback = recipients;
+        recipients = null;
       }
 
-      if(!recipient) {
+      if(!recipients) {
         callback(new Error('recipient is required'));
         return;
       }
 
-      var options = {
-        uri: api + '/' + recipient.email
-        , json: recipient
-      };
-
-      // Check for bulk upsert
-      if(recipient.constructor === Array) {
-        options.uri = api;
-        options.json = { recipients: toApiFormat(recipient) };
-      } else if(!recipient.email) {
-        callback(new Error('email is required in the recipient object'));
-        return;
+      if(!Array.isArray(recipients)) {
+        recipients = [recipients];
       }
 
+      recipients = toApiFormat(recipients);
+      options = {
+        uri: api,
+        json: { recipients: recipients }
+      };
+
       client.put(options, callback);
     }
   };

lib/suppressionList.js

@@ -79,21 +79,15 @@ describe('Suppression List Library', function() {
   });
 
   describe('upsert Method', function() {
-    it('should call client put method with the appropriate uri', function(done) {
-      suppressionList.upsert({email: '[email protected]'}, function(err, data) {
-        expect(client.put.firstCall.args[0].uri).to.equal('suppression-list/[email protected]');
-        done();
-      });
-    });
-
-    it('should accept an array of recipients for bulk upsert', function(done) {
+    it('should accept an array of recipients', function(done) {
       var recipients = [
-        {email: '[email protected]'}
-        , {email: '[email protected]'}
+        { email: '[email protected]' },
+        { email: '[email protected]' }
       ];
 
       suppressionList.upsert(recipients, function(err, data) {
         expect(client.put.firstCall.args[0].uri).to.equal('suppression-list');
+        expect(client.put.firstCall.args[0].json.recipients).to.deep.equal(recipients);
         done();
       });
     });
@@ -114,10 +108,10 @@ describe('Suppression List Library', function() {
       });
     });
 
-    it('should throw an error if email is missing on recipient object', function(done) {
-      suppressionList.upsert({name: 'test'}, function(err, data) {
-        expect(err.message).to.equal('email is required in the recipient object');
-        expect(client.put).not.to.have.been.called;
+    it('should upsert a single recipient as an array', function(done) {
+      var recipient = { email: 'test1@test.com' };
+      suppressionList.upsert(recipient, function(err, data) {
+        expect(client.put.firstCall.args[0].json.recipients).to.deep.equal([recipient]);
         done();
       });
     });