Merge upstream

.travis.yml

@@ -1,11 +1,21 @@
+sudo: required
+dist: trusty
+
 language: node_js
 
 node_js:
   - "5.1"
 
+addons:
+  apt:
+    sources:
+      - google-chrome
+    packages:
+      - google-chrome-stable
+
 before_install:
   - npm install -g gulp
-  - export CHROME_BIN=chromium-browser
+  - export CHROME_BIN=google-chrome
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
 

adapters.json

@@ -1,23 +1,27 @@
 [
     "aardvark",
     "adblade",
+    "adbund",
     "adbutler",
     "adequant",
     "adform",
     "adkernel",
     "admedia",
+    "vertamedia",
     "aol",
     "appnexus",
     "appnexusAst",
     "conversant",
     "districtmDMX",
     "fidelity",
-    "getintent",
     "gumgum",
     "hiromedia",
     "indexExchange",
     "kruxlink",
+    "getintent",
     "komoona",
+    "lifestreet",
+    "mantis",
     "openx",
     "piximedia",
     "pubmatic",
@@ -30,7 +34,10 @@
     "sonobi",
     "sovrn",
     "springserve",
+    "thoughtleadr",
+    "stickyadstv",
     "triplelift",
+    "twenga",
     "yieldbot",
     "nginad",
     "brightcom",
@@ -65,21 +72,41 @@
       "appnexusAst": {
         "supportedMediaTypes": ["video"]
       }
+    },    {
+      "vertamedia": {
+        "supportedMediaTypes": ["video"]
+      }
+    },
+    {
+      "appnexus": {
+        "alias": "matomy"
+      }
     },
     {
       "rubicon": {
-        "alias": "rubiconLite"
+        "alias": "rubiconLite",
+        "supportedMediaTypes": ["video"]
       }
     },
     {
       "appnexus": {
         "alias": "featureforward"
       }
+    },    
+    {
+      "appnexus": {
+        "alias": "oftmedia"
+      }
     },
     {
       "adkernel": {
         "alias": "headbidding"
       }
+    },
+    {
+      "getintent": {
+        "supportedMediaTypes" : ["video"]
+      }
     }
 
 ]

browsers.json

@@ -119,6 +119,14 @@
     "device": null,
     "os": "Windows"
   },
+  "bs_chrome_56_mac_sierra": {
+    "base": "BrowserStack",
+    "os": "OS X",
+    "os_version": "Sierra",
+    "browser": "chrome",
+    "device": null,
+    "browser_version": "56.0"
+  },
   "bs_safari_9.1_mac_elcapitan": {
     "base": "BrowserStack",
     "os_version": "El Capitan",

gulpHelpers.js

@@ -53,10 +53,10 @@ module.exports = {
 
   createEnd2EndTestReport : function(targetDestinationDir) {
     var browsers = require('./browsers.json');
-    var env = ['default'];
+    var env = [];
     var input = 'bs';
     for(var key in browsers) {
-      if(key.substring(0, input.length) === input) {
+      if(key.substring(0, input.length) === input && browsers[key].browser !== 'iphone') {
         env.push(key);
       }
     }

gulpfile.js

@@ -21,6 +21,7 @@ var header = require('gulp-header');
 var zip = require('gulp-zip');
 var replace = require('gulp-replace');
 var shell = require('gulp-shell');
+var optimizejs = require('gulp-optimize-js');
 
 var CI_MODE = process.env.NODE_ENV === 'ci';
 var prebid = require('./package.json');
@@ -73,6 +74,7 @@ gulp.task('webpack', function () {
     .pipe(replace('$prebid.version$', prebid.version))
     .pipe(uglify())
     .pipe(header(banner, { prebid: prebid }))
+    .pipe(optimizejs())
     .pipe(gulp.dest('build/dist'))
     .pipe(connect.reload());
 });
@@ -219,45 +221,46 @@ gulp.task('docs', ['clean-docs'], function () {
 });
 
 gulp.task('e2etest', function() {
-  var cmd = '--env default';
+  var cmdQueue = [];
   if(argv.browserstack) {
     var browsers = require('./browsers.json');
-    var env = [];
-    var input = 'bs';
-    for(var key in browsers) {
-      if(key.substring(0, input.length) === input) {
-        env.push(key);
-      }
+    delete browsers['bs_ie_9_windows_7'];
+
+    var cmdStr = ' --config nightwatch.conf.js';
+    if (argv.group) {
+      cmdStr = cmdStr + ' --group ' + argv.group;
     }
-    cmd = '--env default,' + env.join(',');
-  }
+    cmdStr = cmdStr + ' --reporter ./test/spec/e2e/custom-reporter/pbjs-html-reporter.js';
 
-  if(argv.browserstack) {
-    cmd = cmd + ' --config nightwatch.conf.js';
-  } else {
-    cmd = cmd + ' --config nightwatch.json';
-  }
+    var startWith = 'bs';
 
-  if (argv.group) {
-    cmd = cmd + ' --group ' + argv.group;
+    Object.keys(browsers).filter(function(v){
+      return v.substring(0, startWith.length) === startWith && browsers[v].browser !== 'iphone';
+    }).map(function(v,i,arr) {
+      var newArr = (i%2 === 0) ? arr.slice(i,i+2) : null;
+      if(newArr) {
+        var cmd = 'nightwatch --env ' + newArr.join(',') + cmdStr;
+        cmdQueue.push(cmd);
+      }
+    });
   }
 
-  cmd = cmd + ' --reporter ./test/spec/e2e/custom-reporter/pbjs-html-reporter.js';
   return gulp.src('')
-    .pipe(shell('nightwatch ' + cmd));
+    .pipe(shell(cmdQueue.join(';')));
 });
 
 gulp.task('e2etest-report', function() {
+  var reportPort = 9010;
   var targetDestinationDir = './e2etest-report';
   helpers.createEnd2EndTestReport(targetDestinationDir);
   connect.server({
-    port: port,
+    port: reportPort,
     root: './',
     livereload: true
   });
 
   setTimeout(function() {
-    opens('http://localhost:' + port + '/' + targetDestinationDir.slice(2) + '/results.html');
+    opens('http://localhost:' + reportPort + '/' + targetDestinationDir.slice(2) + '/results.html');
   }, 5000);
 
 });

integrationExamples/gpt/pbjs_example_gpt.html

@@ -201,14 +201,14 @@
                     {
                         bidder: 'memeglobal',
                         params: {
-                            tagid: 007,  	// REQUIRED int. To get one, contact http://www.memeglobal.com
+                            tagid: 007,     // REQUIRED int. To get one, contact http://www.memeglobal.com
                         }
                     },
                     {
                         bidder: 'adblade',
                         params: {
                             partnerId: 42980,
-                            bidfloor: 0.01		// OPTIONAL float bid floor in $ CPM
+                            bidfloor: 0.01      // OPTIONAL float bid floor in $ CPM
                         }
                     },
                     {
@@ -231,6 +231,13 @@
                             cur: 'EUR'
                         }
                     },
+                    {
+                        bidder: 'adbund',
+                        params: {
+                            sid: '110238', // REQUIRED int. To get one, sign up http://www.adbund.com
+                            bidfloor: 0.036 // OPTIONAL float bid floor in $ CPM
+                        }
+                    },
                     {
                         bidder: 'smartyads',
                         params: {
@@ -326,22 +333,22 @@
                         }
                     },
                     {
-                        bidder: 'wideorbit',
+                        bidder: 'memeglobal',
                         params: {
-                            pbId: 123, // REQUIRED Publisher Id,
-                            pId: 123456 // REQUIRED Placement Id
+                            tagid: 007,     // REQUIRED int. To get one, contact http://www.memeglobal.com
                         }
                     },
                     {
-                        bidder: 'memeglobal',
+                        bidder: 'gumgum',
                         params: {
-                            tagid: 007,  	// REQUIRED int. To get one, contact http://www.memeglobal.com
+                            inScreen: 'ggumtest' // REQUIRED str Tracking Id
                         }
                     },
                     {
-                        bidder: 'gumgum',
+                        bidder: 'wideorbit',
                         params: {
-                            inScreen: 'ggumtest' // REQUIRED str Tracking Id
+                            pbId: 123, // REQUIRED Publisher Id,
+                            pId: 123456 // REQUIRED Placement Id
                         }
                     }
                 ]
@@ -352,7 +359,7 @@
         $$PREBID_GLOBAL$$.addAdUnits(adUnits);
 
         //register a callback handler
-				$$PREBID_GLOBAL$$.addCallback('adUnitBidsBack', function (adUnitCode) {
+                $$PREBID_GLOBAL$$.addCallback('adUnitBidsBack', function (adUnitCode) {
             console.debug('ad unit bids back for:', adUnitCode);
         });
 

integrationExamples/gpt/x-domain/creative.html

@@ -0,0 +1,72 @@
+<script>
+// this script can be returned by an ad server delivering a cross domain iframe, into which the
+// creative will be rendered, e.g. DFP delivering a SafeFrame
+
+var urlParser = document.createElement('a');
+urlParser.href = '%%PATTERN:url%%';
+var publisherDomain = urlParser.protocol + '//' + urlParser.hostname;
+var adServerDomain = 'https://tpc.googlesyndication.com';
+
+function renderAd(ev) {
+    var key = ev.message ? 'message' : 'data';
+    var adObject = {};
+    try {
+      adObject = JSON.parse(ev[key]);
+    } catch (e) {
+      return;
+    }
+
+    var origin = ev.origin || ev.originalEvent.origin;
+    if (adObject.message && adObject.message === 'Prebid Response' &&
+        publisherDomain === origin &&
+        adObject.adId === '%%PATTERN:hb_adid%%' &&
+        (adObject.ad || adObject.adUrl)) {
+      var body = window.document.body;
+      var ad = adObject.ad;
+      var url = adObject.adUrl;
+      var width = adObject.width;
+      var height = adObject.height;
+
+      if (adObject.mediaType === 'video') {
+        console.log('Error trying to write ad.');
+      } else
+
+      if (ad) {
+        var frame = document.createElement('iframe');
+        frame.setAttribute('FRAMEBORDER', 0);
+        frame.setAttribute('SCROLLING', 'no');
+        frame.setAttribute('MARGINHEIGHT', 0);
+        frame.setAttribute('MARGINWIDTH', 0);
+        frame.setAttribute('TOPMARGIN', 0);
+        frame.setAttribute('LEFTMARGIN', 0);
+        frame.setAttribute('ALLOWTRANSPARENCY', 'true');
+        frame.setAttribute('width', width);
+        frame.setAttribute('height', height);
+        body.appendChild(frame);
+        frame.contentDocument.open();
+        frame.contentDocument.write(ad);
+        frame.contentDocument.close();
+      } else if (url) {
+        body.insertAdjacentHTML('beforeend', '<IFRAME SRC="' + url + '" FRAMEBORDER="0" SCROLLING="no" MARGINHEIGHT="0" MARGINWIDTH="0" TOPMARGIN="0" LEFTMARGIN="0" ALLOWTRANSPARENCY="true" WIDTH="' + width + '" HEIGHT="' + height + '"></IFRAME>');
+      } else {
+        console.log('Error trying to write ad. No ad for bid response id: ' + id);
+      }
+    }
+  }
+
+function requestAdFromPrebid() {
+  var message = JSON.stringify({
+    message: 'Prebid Request',
+    adId: '%%PATTERN:hb_adid%%',
+    adServerDomain: adServerDomain
+  });
+  window.parent.postMessage(message, publisherDomain);
+}
+
+function listenAdFromPrebid() {
+  window.addEventListener('message', renderAd, false);
+}
+
+listenAdFromPrebid();
+requestAdFromPrebid();
+</script>