Release/1.19.0

.github/PULL_REQUEST_TEMPLATE.md

@@ -6,7 +6,7 @@ Thank you for your pull request. Please make sure this PR is scoped to one chang
 <!-- Remove items that don't apply and/or select an item by changing [ ] to [x] -->
 - [ ] Bugfix
 - [ ] Feature
-- [ ] New bidder adapter
+- [ ] New bidder adapter  <!--  IMPORTANT: if checking here, also submit your bidder params documentation here https://github.com/prebid/prebid.github.io/tree/master/dev-docs/bidders --> 
 - [ ] Code style update (formatting, local variables)
 - [ ] Refactoring (no functional changes, no api changes)
 - [ ] Build related changes

.jshintignore

@@ -0,0 +1 @@
+# Ingnored files

CHANGELOG

@@ -1,3 +1,24 @@
+AOL Prebid 1.19.0
+----------------
+Updated to Prebid 0.21.0
+
+
+AOL Prebid 1.18.0
+----------------
+Updated to Prebid 0.20.0
+
+
+AOL Prebid 1.17.0
+----------------
+Added functionality for rendering pixels once.
+
+
+AOL Prebid 1.16.0
+----------------
+Added Audience Network adapter.
+Added creative key field in bid response for Sharethrough adapter.
+
+
 AOL Prebid 1.15.0
 ----------------
 Nexage API implemented.

README.md

@@ -36,6 +36,7 @@ This URL is designed specifically for the Container Tag library and it supports
 [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/prebid/Prebid.js.svg)](http://isitmaintained.com/project/prebid/Prebid.js "Average time to resolve an issue")
 [![Code Climate](https://codeclimate.com/github/prebid/Prebid.js/badges/gpa.svg)](https://codeclimate.com/github/prebid/Prebid.js)
 [![Coverage Status](https://coveralls.io/repos/github/prebid/Prebid.js/badge.svg)](https://coveralls.io/github/prebid/Prebid.js)
+[![devDependencies Status](https://david-dm.org/prebid/Prebid.js/dev-status.svg)](https://david-dm.org/prebid/Prebid.js?type=dev)
 
 # Prebid.js
 
@@ -181,6 +182,8 @@ Many SSPs, bidders, and publishers have contributed to this project. [20+ Bidder
 
 To add a bidder adapter, see the instructions in [How to add a bidder adaptor](http://prebid.org/dev-docs/bidder-adaptor.html).
 
+Please **do NOT load Prebid.js inside your adapter**. If you do this, we will reject or remove your adapter as appropriate. 
+
 ### Code Quality
 
 Code quality is defined by `.jscs` and `.jshint` files and errors are reported in the terminal.

adapters.json

@@ -1,38 +1,45 @@
 [
     "aardvark",
     "adblade",
+    "adbund",
     "adbutler",
     "adequant",
     "adform",
     "adkernel",
     "admedia",
+    "bidfluence",
     "vertamedia",
     "aol",
     "appnexus",
     "appnexusAst",
+    "audienceNetwork",
     "conversant",
     "districtmDMX",
     "fidelity",
-    "getintent",
     "gumgum",
     "hiromedia",
     "indexExchange",
     "kruxlink",
+    "getintent",
+    "inneractive",
     "komoona",
     "lifestreet",
     "mantis",
     "openx",
     "piximedia",
     "pubmatic",
     "pulsepoint",
+    "pulsepointLite",
     "rhythmone",
     "rubicon",
     "smartyads",
-	  "smartadserver",
+    "smartadserver",
     "sekindoUM",
+    "serverbid",
     "sonobi",
     "sovrn",
     "springserve",
+    "thoughtleadr",
     "stickyadstv",
     "triplelift",
     "twenga",
@@ -51,6 +58,8 @@
     "vertoz",
     "widespace",
     "admixer",
+    "atomx",
+    "tapsense",
     {
       "appnexus": {
         "alias": "brealtime"
@@ -66,6 +75,11 @@
         "alias": "defymedia"
       }
     },
+    {
+      "appnexus": {
+        "alias": "gourmetads"
+      }
+    },
     {
       "appnexusAst": {
         "supportedMediaTypes": ["video"]
@@ -100,6 +114,20 @@
       "adkernel": {
         "alias": "headbidding"
       }
+    },
+    {
+      "getintent": {
+        "supportedMediaTypes" : ["video"]
+      }
+    },
+    {
+      "stickyadstv": {
+        "alias": "freewheel-ssp"
+      }
+    },
+    {
+      "rhythmone": {
+        "supportedMediaTypes": ["video"]
+      }
     }
-
 ]

analytics.json

@@ -0,0 +1 @@
+["aol"]

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');
@@ -90,6 +91,7 @@ gulp.task('webpack', function () {
       }
     }))
     .pipe(header(banner, { prebid: prebid }))
+    .pipe(optimizejs())
     // Remove window=window that was used to go around Uglify bug
     .pipe(replace(/,?(\/\*!ADAPTER BEGIN \w+\*\/)\s*window\s*=\s*window/g, '$1'))
     .pipe(replace(/,?(\/\*!ADAPTER END \w+\*\/)\s*window\s*=\s*window/g, '$1'))
@@ -239,45 +241,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/audienceNetwork_dfp.html

@@ -0,0 +1,83 @@
+<html>
+  <head>
+    <script src="/build/dev/prebid.js" async></script>
+    <script>
+      var PREBID_TIMEOUT = 2000;
+      var adUnits = [{
+        code: '/5555555/hb_300x250',
+        sizes: [[300, 250]],
+        bids: [{
+          bidder: 'audienceNetwork',
+          params: {
+            placementId: '555555555555555_555555555555555'
+          }
+        }]
+      }];
+
+      (function () {
+        var gads = document.createElement('script');
+        gads.async = true;
+        gads.type = 'text/javascript';
+        var useSSL = 'https:' == document.location.protocol;
+        gads.src = (useSSL ? 'https:' : 'http:') + '//www.googletagservices.com/tag/js/gpt.js';
+        var node = document.getElementsByTagName('script')[0];
+        node.parentNode.insertBefore(gads, node);
+      })();
+
+      var googletag = googletag || {};
+      googletag.cmd = googletag.cmd || [];
+      googletag.cmd.push(function() {
+        googletag.pubads().disableInitialLoad();
+      });
+      googletag.cmd.push(function () {
+        googletag.defineSlot('/5555555/hb_300x250', [[300, 250]], 'div-gpt-ad-5555555555555-0').addService(googletag.pubads());
+        googletag.pubads().enableSingleRequest();
+        googletag.enableServices();
+      });
+
+      var sendAdserverRequest = function () {
+        if (pbjs.adserverRequestSent) return;
+        pbjs.adserverRequestSent = true;
+        googletag.cmd.push(function() {
+          pbjs.que.push(function() {
+            pbjs.setTargetingForGPTAsync();
+            googletag.pubads().refresh();
+          });
+        });
+      };
+
+      setTimeout(function() {
+        sendAdserverRequest();
+      }, PREBID_TIMEOUT);
+
+      var pbjs = pbjs || {};
+      pbjs.que = pbjs.que || [];
+
+      pbjs.que.push(function() {
+        pbjs.addAdUnits(adUnits);
+        pbjs.requestBids({
+            bidsBackHandler: sendAdserverRequest
+        });
+      });
+    </script>
+  </head>
+  <body>
+    <h2>Prebid.js Test</h2>
+    <div id='div-gpt-ad-5555555555555-0'>
+      <script>
+        googletag.cmd.push(function() {
+          googletag.display('div-gpt-ad-5555555555555-0');
+        });
+      </script>
+    </div>
+    <div>
+      <p>Audience Network quick start</p>
+      <ol>
+        <li>Create a new App at <a href="https://developers.facebook.com/apps">https://developers.facebook.com/apps</a></li>
+        <li>Add the Audience Network product to it</li>
+        <li>Create a new Placement to generate your placementId</li>
+        <li>To test, ensure the User-Agent request header represents a mobile device</li>
+      </ol>
+    </div>
+  </body>
+</html>