Revert "Add destination mw (#148)"

This reverts commit c515df7.

Author: Matthew Ault

lib/analytics.js

@@ -14,8 +14,6 @@ var Identify = require('segmentio-facade').Identify;
 var SourceMiddlewareChain = require('./middleware').SourceMiddlewareChain;
 var IntegrationMiddlewareChain = require('./middleware')
   .IntegrationMiddlewareChain;
-var DestinationMiddlewareChain = require('./middleware')
-  .DestinationMiddlewareChain;
 var Page = require('segmentio-facade').Page;
 var Track = require('segmentio-facade').Track;
 var bindAll = require('bind-all');
@@ -52,7 +50,6 @@ function Analytics() {
   this.Integrations = {};
   this._sourceMiddlewares = new SourceMiddlewareChain();
   this._integrationMiddlewares = new IntegrationMiddlewareChain();
-  this._destinationMiddlewares = {};
   this._integrations = {};
   this._readied = false;
   this._timeout = 300;
@@ -114,7 +111,6 @@ Analytics.prototype.addSourceMiddleware = function(middleware) {
 
 /**
  * Define a new `IntegrationMiddleware`
- * DEPRECATED
  *
  * @param {Function} Middleware
  * @return {Analytics}
@@ -125,32 +121,6 @@ Analytics.prototype.addIntegrationMiddleware = function(middleware) {
   return this;
 };
 
-/**
- * Define a new `DestinationMiddleware`
- * Destination Middleware is chained after integration middleware
- *
- * @param {String} integrationName
- * @param {Array} Middlewares
- * @return {Analytics}
- */
-
-Analytics.prototype.addDestinationMiddleware = function(
-  integrationName,
-  middlewares
-) {
-  var self = this;
-  middlewares.forEach(function(middleware) {
-    if (!self._destinationMiddlewares[integrationName]) {
-      self._destinationMiddlewares[
-        integrationName
-      ] = new DestinationMiddlewareChain();
-    }
-
-    self._destinationMiddlewares[integrationName].add(middleware);
-  });
-  return self;
-};
-
 /**
  * Initialize with the given integration `settings` and `options`.
  *
@@ -764,6 +734,11 @@ Analytics.prototype._invoke = function(method, facade) {
           result = new Facade(result);
         }
 
+        self.emit('invoke', result);
+        metrics.increment('analytics_js.invoke', {
+          method: method
+        });
+
         applyIntegrationMiddlewares(result);
       }
     );
@@ -816,53 +791,12 @@ Analytics.prototype._invoke = function(method, facade) {
                 result = new Facade(result);
               }
 
-              // apply destination middlewares
-              // Apply any integration middlewares that exist, then invoke the integration with the result.
-              if (self._destinationMiddlewares[integration.name]) {
-                self._destinationMiddlewares[integration.name].applyMiddlewares(
-                  facadeCopy,
-                  integration.name,
-                  function(result) {
-                    // A nullified payload should not be sent to an integration.
-                    if (result === null) {
-                      self.log(
-                        'Payload to destination "%s" was null and dropped by a middleware.',
-                        name
-                      );
-                      return;
-                    }
-
-                    // Check if the payload is still a Facade. If not, convert it to one.
-                    if (!(result instanceof Facade)) {
-                      result = new Facade(result);
-                    }
-
-                    self.emit('invoke', result);
-                    metrics.increment('analytics_js.invoke', {
-                      method: method
-                    });
-
-                    metrics.increment('analytics_js.integration.invoke', {
-                      method: method,
-                      integration_name: integration.name
-                    });
-
-                    integration.invoke.call(integration, method, result);
-                  }
-                );
-              } else {
-                self.emit('invoke', result);
-                metrics.increment('analytics_js.invoke', {
-                  method: method
-                });
-
-                metrics.increment('analytics_js.integration.invoke', {
-                  method: method,
-                  integration_name: integration.name
-                });
-
-                integration.invoke.call(integration, method, result);
-              }
+              metrics.increment('analytics_js.integration.invoke', {
+                method: method,
+                integration_name: integration.name
+              });
+
+              integration.invoke.call(integration, method, result);
             }
           );
         } catch (e) {

lib/middleware.js

@@ -34,20 +34,6 @@ module.exports.IntegrationMiddlewareChain = function IntegrationMiddlewareChain(
   };
 };
 
-module.exports.DestinationMiddlewareChain = function DestinationMiddlewareChain() {
-  var apply = middlewareChain(this);
-
-  this.applyMiddlewares = function(facade, integration, callback) {
-    return apply(
-      function(mw, payload, next) {
-        mw({ payload: payload, integration: integration, next: next });
-      },
-      facade,
-      callback
-    );
-  };
-};
-
 // Chain is essentially a linked list of middlewares to run in order.
 function middlewareChain(dest) {
   var middlewares = [];

test/analytics.test.js

@@ -495,7 +495,7 @@ describe('Analytics', function() {
     });
 
     it('should emit "invoke" with facade', function(done) {
-      var opts = { All: true };
+      var opts = { All: false };
       var identify = new Identify({ testVal: 'success', options: opts });
       analytics.on('invoke', function(msg) {
         assert(msg instanceof Facade);
@@ -2058,51 +2058,6 @@ describe('Analytics', function() {
     });
   });
 
-  describe('#addDestinationMiddleware', function() {
-    it('should have a defined _integrationMiddlewares property', function() {
-      assert(analytics._destinationMiddlewares !== undefined);
-    });
-
-    it('should allow users to add a valid Middleware', function() {
-      try {
-        analytics.addDestinationMiddleware('foo', [function() {}]);
-      } catch (e) {
-        // This assert should not run.
-        assert(false, 'error was incorrectly thrown!');
-      }
-    });
-
-    it('should throw an error if the selected Middleware is not a function', function() {
-      try {
-        analytics.addDestinationMiddleware('foo', [7]);
-
-        // This assert should not run.
-        assert(false, 'error was not thrown!');
-      } catch (e) {
-        assert(
-          e.message === 'attempted to add non-function middleware',
-          'wrong error return'
-        );
-      }
-    });
-
-    it('should not throw an error if AJS has already initialized', function() {
-      analytics.init();
-      try {
-        analytics.addDestinationMiddleware('foo', [function() {}]);
-      } catch (e) {
-        // This assert should not run.
-        assert(false, 'error was thrown!');
-      }
-    });
-
-    it('should return the analytics object', function() {
-      assert(
-        analytics === analytics.addDestinationMiddleware('foo', [function() {}])
-      );
-    });
-  });
-
   describe('#addSourceMiddleware', function() {
     it('should have a defined _sourceMiddlewares property', function() {
       assert(analytics._sourceMiddlewares !== undefined);