Set bid response ID to bid request ID for triplelift.

.gitignore

@@ -7,6 +7,10 @@ test/app
 gpt.html
 gpt-each-bidder3.html
 
+# Selenium files
+bin
+selenium*.log
+
 # Dev File
 
 integrationExamples/gpt/gpt.html

adapters.json

@@ -5,6 +5,8 @@
     "admedia",
     "aol",
     "appnexus",
+    "appnexusAst",
+    "fan",
     "indexExchange",
     "kruxlink",
     "openx",
@@ -21,6 +23,8 @@
     "brightcom",
     "wideorbit",
     "jcm",
+    "underdogmedia",
+    "memeglobal",
     {
       "appnexus": {
         "alias": "brealtime"

integrationExamples/gpt/pbjs_example_gpt.html

@@ -193,7 +193,13 @@
 								spaceId: 14071,  	// REQUIRED int. To get one, contact http://www.sekindo.com
 								bidfloor: 0.2		// OPTIONAL float bid floor in $ CPM
 							}
-					}
+					},
+                    {
+                        bidder: 'memeglobal',
+                        params: {
+                            tagid: 007,  	// REQUIRED int. To get one, contact http://www.memeglobal.com
+                        }
+                    }
                 ]
             }, {
                 code: 'div-gpt-ad-12345678-1',
@@ -282,6 +288,12 @@
                             pbId: 123, // REQUIRED Publisher Id,
                             pId: 123456 // REQUIRED Placement Id
                         }
+                    },
+                    {
+                        bidder: 'memeglobal',
+                        params: {
+                            tagid: 007,  	// REQUIRED int. To get one, contact http://www.memeglobal.com
+                        }
                     }
                 ]
             }

integrationExamples/gpt/pbjs_partial_refresh_gpt.html

@@ -82,6 +82,11 @@
                             publisherId: 'TO ADD',
                             adSlot: 'TO ADD@300x600'
                         }
+                    }, {
+                        bidder: 'fan',
+                        params: {
+                            placementId: 'TO ADD'
+                        }
                     }
                 ]
             }, {

karma.conf.js

@@ -4,7 +4,7 @@ var webpackConfig = require('./webpack.conf');
 webpackConfig.module.postLoaders = [
   {
     test: /\.js$/,
-    exclude: /(node_modules)|(test)|(integrationExamples)|(build)/,
+    exclude: /(node_modules)|(test)|(integrationExamples)|(build)|polyfill.js/,
     loader: 'istanbul-instrumenter'
   }
 ];

loaders/adapterLoader.js

@@ -49,13 +49,8 @@ function insertAdapters() {
   }
 
   return inserts.map(name => {
-    if (name === 'appnexusAst') {
-      return `import { AppnexusAst } from './adapters/appnexusAst';
-        exports.registerBidAdapter(new AppnexusAst('appnexus'), 'appnexus');\n`;
-    } else {
-      return `var ${adapterName(name)} = require('./adapters/${name}.js');
-        exports.registerBidAdapter(new ${adapterName(name)}${useCreateNew(name)}(), '${name}');\n`;
-    }
+    return `var ${adapterName(name)} = require('./adapters/${name}.js');
+    exports.registerBidAdapter(new ${adapterName(name)}${useCreateNew(name)}(), '${name}');\n`;
   })
     .concat(aliases.map(adapter => {
       const name = Object.keys(adapter)[0];
@@ -80,7 +75,7 @@ function adapterName(adapter) {
  * @returns {string}
  */
 function useCreateNew(adapter) {
-  return adapter === 'appnexus' ? '.createNew' : '';
+  return ['appnexus', 'appnexusAst'].includes(adapter) ? '.createNew' : '';
 }
 
 /**

package.json

@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "0.12.0-pre",
+  "version": "0.12.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

src/adapters/analytics/ga.js

@@ -18,7 +18,6 @@ var _enableCheck = true;
 var _category = 'Prebid.js Bids';
 var _eventCount = 0;
 var _enableDistribution = false;
-var _timedOutBidders = [];
 var _trackerSend = null;
 
 /**
@@ -56,7 +55,8 @@ exports.enableAnalytics = function ({ provider, options }) {
       sendBidResponseToGa(bid);
 
     } else if (eventObj.eventType === BID_TIMEOUT) {
-      _timedOutBidders = args.bidderCode;
+      const bidderArray = args;
+      sendBidTimeouts(bidderArray);
     } else if (eventObj.eventType === BID_WON) {
       bid = args;
       sendBidWonToGa(bid);
@@ -73,12 +73,11 @@ exports.enableAnalytics = function ({ provider, options }) {
   //bidResponses
   events.on(BID_RESPONSE, function (bid) {
     sendBidResponseToGa(bid);
-    sendBidTimeouts(bid);
   });
 
   //bidTimeouts
   events.on(BID_TIMEOUT, function (bidderArray) {
-    _timedOutBidders = bidderArray;
+    sendBidTimeouts(bidderArray);
   });
 
   //wins
@@ -131,17 +130,17 @@ function getLoadTimeDistribution(time) {
   if (time >= 0 && time < 200) {
     distribution = '0-200ms';
   } else if (time >= 200 && time < 300) {
-    distribution = '200-300ms';
+    distribution = '0200-300ms';
   } else if (time >= 300 && time < 400) {
-    distribution = '300-400ms';
+    distribution = '0300-400ms';
   } else if (time >= 400 && time < 500) {
-    distribution = '400-500ms';
+    distribution = '0400-500ms';
   } else if (time >= 500 && time < 600) {
-    distribution = '500-600ms';
+    distribution = '0500-600ms';
   } else if (time >= 600 && time < 800) {
-    distribution = '600-800ms';
+    distribution = '0600-800ms';
   } else if (time >= 800 && time < 1000) {
-    distribution = '800-1000ms';
+    distribution = '0800-1000ms';
   } else if (time >= 1000 && time < 1200) {
     distribution = '1000-1200ms';
   } else if (time >= 1200 && time < 1500) {
@@ -224,18 +223,14 @@ function sendBidResponseToGa(bid) {
   checkAnalytics();
 }
 
-function sendBidTimeouts(bid) {
+function sendBidTimeouts(timedOutBidders) {
 
-  if (bid && bid.bidder) {
-    _analyticsQueue.push(function () {
-      utils._each(_timedOutBidders, function (bidderCode) {
-        if (bid.bidder === bidderCode) {
-          _eventCount++;
-          window[_gaGlobal](_trackerSend, 'event', _category, 'Timeouts', bidderCode, bid.timeToRespond, _disableInteraction);
-        }
-      });
+  _analyticsQueue.push(function () {
+    utils._each(timedOutBidders, function (bidderCode) {
+      _eventCount++;
+      window[_gaGlobal](_trackerSend, 'event', _category, 'Timeouts', bidderCode, _disableInteraction);
     });
-  }
+  });
 
   checkAnalytics();
 }