dont defer init for assumepageview

Author: Han Kim

lib/protos.js

@@ -5,7 +5,6 @@
  */
 
 var Emitter = require('component-emitter');
-var after = require('@ndhoule/after');
 var each = require('@ndhoule/each');
 var events = require('analytics-events');
 var every = require('@ndhoule/every');
@@ -187,19 +186,14 @@ exports.invoke = function(method) {
 };
 
 /**
- * Queue a `method` with `args`. If the integration assumes an initial
- * pageview, then let the first call to `page` pass through.
+ * Queue a `method` with `args`.
  *
  * @api private
  * @param {string} method
  * @param {Array} args
  */
 
 exports.queue = function(method, args) {
-  if (method === 'page' && this._assumesPageview && !this._initialized) {
-    return this.page.apply(this, args);
-  }
-
   this._queue.push({ method: method, args: args });
 };
 
@@ -336,12 +330,10 @@ exports._wrapInitialize = function() {
     this.emit('initialize');
     return ret;
   };
-
-  if (this._assumesPageview) this.initialize = after(2, this.initialize);
 };
 
 /**
- * Wrap the page method to call `initialize` instead if the integration assumes
+ * Wrap the page method to call to noop the first page call if the integration assumes
  * a pageview.
  *
  * @api private
@@ -350,8 +342,10 @@ exports._wrapInitialize = function() {
 exports._wrapPage = function() {
   var page = this.page;
   this.page = function() {
-    if (this._assumesPageview && !this._initialized) {
-      return this.initialize.apply(this, arguments);
+    if (this._assumesPageview) {
+      if (this._initialPageNooped) return page.apply(this, arguments);
+
+      return this._initialPageNooped = true;
     }
 
     return page.apply(this, arguments);

lib/statics.js

@@ -74,15 +74,16 @@ exports.global = function(key) {
 };
 
 /**
- * Mark the integration as assuming an initial pageview, so to defer loading
- * the script until the first `page` call, noop the first `initialize`.
+ * Mark the integration as assuming an initial pageview, so to defer the first page call, keep track of
+ * whether we already nooped the first page call.
  *
  * @api public
  * @return {Integration}
  */
 
 exports.assumesPageview = function() {
   this.prototype._assumesPageview = true;
+  this.prototype._initialPageNooped = false;
   return this;
 };
 

package.json

@@ -21,7 +21,6 @@
   },
   "homepage": "https://github.com/segmentio/analytics.js-integration#readme",
   "dependencies": {
-    "@ndhoule/after": "^1.0.0",
     "@ndhoule/clone": "^1.0.0",
     "@ndhoule/defaults": "^2.0.1",
     "@ndhoule/each": "^2.0.1",

test/index.test.js

@@ -209,13 +209,11 @@ describe('integration', function() {
       assert(integration._initialized === true);
     });
 
-    it('should be a noop the first time if the integration assumes a pageview', function() {
+    it('should still initialize if the integration assumes a pageview', function() {
       var initialize = Integration.prototype.initialize = spy();
       Integration.assumesPageview();
       var integration = new Integration();
       integration.initialize();
-      assert(!initialize.called);
-      integration.initialize();
       assert(initialize.called);
     });
   });
@@ -322,9 +320,9 @@ describe('integration', function() {
       integration.initialize = spy();
     });
 
-    it('should transform #page to #initialize when a pageview is assumed', function() {
+    it('should not transform #page to #initialize when a pageview is assumed', function() {
       integration.queue('page', [{ name: 'page' }]);
-      assert(integration.initialize.calledWith({ name: 'page' }));
+      assert(!integration.initialize.calledWith({ name: 'page' }));
     });
 
     it('should push the method and args onto the queue', function() {
@@ -343,12 +341,12 @@ describe('integration', function() {
   });
 
   describe('#page', function() {
-    it('should call initialize the first time when a page view is assumed', function() {
+    it('should not call initialize the first time when a page view is assumed', function() {
       Integration.assumesPageview();
       integration = new Integration();
       integration.initialize = spy();
       integration.page({ name: 'page name' });
-      assert(integration.initialize.calledWith({ name: 'page name' }));
+      assert(!integration.initialize.calledWith({ name: 'page name' }));
     });
 
     it('should return the value', function() {