Merge pull request prebid#134 in AOLP_ADS_JS/prebid.js from release/1…

….34.0 to aolgithub-master

* commit 'f0ba90afa8b52de7a646d43928b2d51ee42e74a1': (53 commits)
  Added changelog entry.
  Added partners ids.
  Added dynamic ttl property for One Display and One Mobile.
  Prebid.js 0.34.1 release
  Vertamedia adapter outstream support (prebid#1860)
  Expose native image-type asset dimensions on bid response object (prebid#1919)
  Remove for of (prebid#1932)
  Unit-test fix (prebid#1927)
  Remove description_url (prebid#1922)
  Trion Interactive Adapter Bugfix (prebid#1925)
  Remove config setting from Optimatic adapter (prebid#1909)
  IE bug fix (prebid#1930)
  Clarify ad unit media filtering warning (prebid#1903)
  Add ReadPeak Bid Adapter (prebid#1838)
  Change clone function to make deep copies (prebid#1910)
  Serverbid 1.0 (prebid#1802)
  sekindoUM for prebid1.0 (prebid#1777)
  update auctionId to be requestId (prebid#1896)
  bug fixed to populate userSync default values (prebid#1897)
  Increment pre version
  ...

CHANGELOG

@@ -1,3 +1,9 @@
+AOL Prebid 1.34.0
+----------------
+Updated to Prebid 0.34.1.
+Changed ttl for aol adapter endpoints.
+
+
 AOL Prebid 1.33.0
 ----------------
 Updated to Prebid 0.33.0

README.md

@@ -146,6 +146,11 @@ To run the unit tests:
 ```bash
 gulp test
 ```
+To run tests for a single file:
+
+```bash
+gulp test --file "path/to/spec/file.js"
+```
 
 To generate and view the code coverage reports:
 

gulpfile.js

@@ -28,6 +28,7 @@ var gulpif = require('gulp-if');
 var sourcemaps = require('gulp-sourcemaps');
 var through = require('through2');
 var fs = require('fs');
+var jsEscape = require('gulp-js-escape');
 
 var prebid = require('./package.json');
 var banner = '/* <%= prebid.name %> v<%= prebid.version %>*/\n';
@@ -311,10 +312,21 @@ gulp.task('e2etest-report', function() {
   }, 5000);
 });
 
-gulp.task('build-postbid', function() {
+// This task creates postbid.js. Postbid setup is different from prebid.js
+// More info can be found here http://prebid.org/overview/what-is-post-bid.html
+gulp.task('build-postbid', ['escape-postbid-config'], function() {
+  var fileContent = fs.readFileSync('./build/postbid/postbid-config.js', 'utf8');
+
   return gulp.src('./integrationExamples/postbid/oas/postbid.js')
-    .pipe(uglify())
-    .pipe(gulp.dest('build/dist'));
+    .pipe(replace('\[%%postbid%%\]', fileContent))
+    .pipe(gulp.dest('build/postbid/'));
+});
+
+// Dependant task for building postbid. It escapes postbid-config file.
+gulp.task('escape-postbid-config', function() {
+  gulp.src('./integrationExamples/postbid/oas/postbid-config.js')
+    .pipe(jsEscape())
+    .pipe(gulp.dest('build/postbid/'));
 });
 
 module.exports = nodeBundle;

integrationExamples/gpt/pbjs_example_gpt.html

@@ -402,6 +402,12 @@
                             placement_id: 0
                         }
                     },
+                    {
+                        bidder: 'huddledmasses',
+                        params: {
+                            placement_id: 0
+                        }
+                    },
                     {
                         bidder: 'pollux',
                         params: {

integrationExamples/postbid/oas/postbid-config.js

@@ -0,0 +1,54 @@
+<script type="text/javascript">
+var pbjs = pbjs || {};
+pbjs.que = pbjs.que || [];
+
+(function() {
+    var pbjsEl = document.createElement("script"); pbjsEl.type = "text/javascript";
+    pbjsEl.async = true; var isHttps = 'https:' === document.location.protocol;
+    pbjsEl.src = (isHttps ? "https" : "http") + "://acdn.adnxs.com/prebid/not-for-prod/prebid.js";
+    var pbjsTargetEl = document.getElementsByTagName("head")[0];
+    pbjsTargetEl.insertBefore(pbjsEl, pbjsTargetEl.firstChild);
+})();
+
+pbjs.que.push(function() {
+    var adUnits = [{
+        code: '[%%adUnitCode%%]',
+        sizes: [%%sizes%%],
+        bids: [%%adUnitBids%%]
+    }];
+    pbjs.addAdUnits(adUnits);
+
+    pbjs.requestBids({
+        timeout: [%%timeout%%],
+        bidsBackHandler: function() {
+            var iframe = document.getElementById('postbid_if_3');
+            var iframeDoc = iframe.contentWindow.document;
+            var params = pbjs.getAdserverTargetingForAdUnitCode('[%%adUnitCode%%]');
+
+            // If any bidders return any creatives
+            var bid;
+            if(params && params['hb_adid']){
+                var bid;
+                for(i=0; i< pbjs._bidsReceived.length; i++ ) {
+                  if (params['hb_adid'] === pbjs._bidsReceived[i].adId) {
+                    bid = pbjs._bidsReceived[i];
+                    break;
+                  }
+                }
+                pbjs.renderAd(iframeDoc, params['hb_adid']);
+              } else {
+                // If no bidder return any creatives,
+                // Passback 3rd party tag in Javascript
+                iframe.width = [%%size0%%];
+                iframe.height = [%%size1%%];
+                iframeDoc.write('[%%passbackTagHtml%%]');
+            }
+
+            var iframeResize = window.parent.document.getElementById('[%%targetId%%]');
+            iframeResize.height = (bid.height) ? bid.height+'px' : '[%%size1%%]px';
+            iframeResize.width = (bid.width) ? bid.width+'px' : '[%%size0%%]px';
+          }
+    });
+});
+</script>
+<iframe id='postbid_if_3' FRAMEBORDER="0" SCROLLING="no" MARGINHEIGHT="0" MARGINWIDTH="0" TOPMARGIN="0" LEFTMARGIN="0" ALLOWTRANSPARENCY="true" WIDTH="0" HEIGHT="0"></iframe>

integrationExamples/postbid/oas/postbid.js

@@ -1,3 +1,4 @@
+/* eslint-disable */
 (function(window){
   var postbid = {};
   postbid.que = [];
@@ -100,7 +101,22 @@
   }
 
   postbid.que.push(function(conf) {
-    var content = "\n      <script type=\"text/javascript\">\n      if (!Array.prototype.find) {\n        Object.defineProperty(Array.prototype, 'find', {\n          value: function(predicate) {\n            if (this == null) {\n              throw new TypeError('\"this\" is null or not defined');\n            }\n            var o = Object(this);\n            var len = o.length >>> 0;\n            if (typeof predicate !== 'function') {\n              throw new TypeError('predicate must be a function');\n            }\n            var thisArg = arguments[1];\n            var k = 0;\n            while (k < len) {\n              var kValue = o[k];\n              if (predicate.call(thisArg, kValue, k, o)) {\n                return kValue;\n              }\n              k++;\n            }\n            return undefined;\n          }\n        });\n      }\n\n      var pbjs = pbjs || {};\n      pbjs.que = pbjs.que || [];\n\n      (function() {\n          var pbjsEl = document.createElement(\"script\"); pbjsEl.type = \"text/javascript\";\n          pbjsEl.async = true; var isHttps = 'https:' === document.location.protocol;\n          pbjsEl.src = (isHttps ? \"https\" : \"http\") + \"://acdn.adnxs.com/prebid/not-for-prod/prebid.js\";\n          var pbjsTargetEl = document.getElementsByTagName(\"head\")[0];\n          pbjsTargetEl.insertBefore(pbjsEl, pbjsTargetEl.firstChild);\n      })();\n\n      pbjs.que.push(function() {\n          var adUnits = [{\n              code: '" + conf.adUnitCode + "',\n              sizes: " + conf.adUnitSizes + ",\n              bids: " + conf.adUnitBids + "\n          }];\n\n          pbjs.addAdUnits(adUnits);\n\n          pbjs.requestBids({\n              timeout: " + conf.timout + ",\n              bidsBackHandler: function() {\n                  var iframe = document.getElementById('postbid_if_3');\n\n                  var iframeDoc = iframe.contentWindow.document;\n\n                  var params = pbjs.getAdserverTargetingForAdUnitCode('" + conf.adUnitCode + "');\n\n                  // If any bidders return any creatives\n                  var bid;\n                  if(params && params['hb_adid']){\n                      bid = pbjs._bidsReceived.find(function(bid) {\n                        return bid.adId === params['hb_adid'];\n                      });\n                      pbjs.renderAd(iframeDoc, params['hb_adid']);\n                    } else {\n                      // If no bidder return any creatives,\n                      // Passback 3rd party tag in Javascript\n\n                      iframe.width = '" + conf.adUnitSizes[0] + "';\n                      iframe.height = '" + conf.adUnitSizes[1] + "';\n\n                      iframeDoc.write('" + conf.passbackTagHtml + "');\n                  }\n\n                  var iframeResize = window.parent.document.getElementById('" + conf.targetId + "');\n                  iframeResize.height = (bid.height) ? bid.height+'px' : '" + conf.adUnitSizes[1] + "px';\n                  iframeResize.width = (bid.width) ? bid.width+'px' : '" + conf.adUnitSizes[0] + "px';\n                }\n          });\n      });\n      <"+ '' +"/script>\n      <iframe id='postbid_if_3' FRAMEBORDER=\"0\" SCROLLING=\"no\" MARGINHEIGHT=\"0\" MARGINWIDTH=\"0\" TOPMARGIN=\"0\" LEFTMARGIN=\"0\" ALLOWTRANSPARENCY=\"true\" WIDTH=\"0\" HEIGHT=\"0\"></iframe>";
+    var sizes = JSON.parse(conf.adUnitSizes);
+    var timeout = conf.timeout;
+    var adUnitCode = conf.adUnitCode;
+    var adUnitBids = conf.adUnitBids;
+    var targetId = conf.targetId;
+    var passbackTagHtml = conf.passbackTagHtml;
+
+    var content = [%%postbid%%];
+    content = content.replace(/\[%%targetId%%\]/g, targetId);
+    content = content.replace(/\[%%adUnitCode%%\]/g, adUnitCode);
+    content = content.replace(/\[%%timeout%%\]/g, timeout);
+    content = content.replace(/\[%%adUnitBids%%\]/g, adUnitBids);
+    content = content.replace(/\[%%passbackTagHtml%%\]/g, passbackTagHtml);
+    content = content.replace(/\[%%sizes%%\]/g, conf.adUnitSizes);
+    content = content.replace(/\[%%size0%%\]/g, sizes[0]);
+    content = content.replace(/\[%%size1%%\]/g, sizes[1]);
 
     var iframe = createIframe(conf.targetId);
     var div = document.getElementById(conf.divId);
@@ -116,3 +132,4 @@
   window.processQue = processQue;
 
 })(window);
+/* eslint-enable */

modules/adformBidAdapter.js

@@ -37,6 +37,7 @@ function AdformAdapter() {
 
     request.unshift('//' + globalParams[0][1] + '/adx/?rp=4');
 
+    request.push('auctionId=' + params.requestId);
     for (i = 1, l = globalParams.length; i < l; i++) {
       _key = globalParams[i][0];
       _value = globalParams[i][1];