Merge pull request #1 from prebid/master

merging prebid master into fork

CONTRIBUTING.md

@@ -64,8 +64,8 @@ A test module might have the following general structure:
 import { expect } from 'chai';  // may prefer 'assert' in place of 'expect'
 import adapter from 'src/adapters/<adapter>';
 
-describe('<Adapter>', () => {
-  it('<description of unit or feature being tested>', () => {
+describe('<Adapter>', function () {
+  it('<description of unit or feature being tested>', function () {
     // Arrange - set up preconditions and inputs
     // Act - call or act on the code under test
     // Assert - use chai to check that expected results have occurred

gulpfile.js

@@ -4,7 +4,7 @@ var _ = require('lodash');
 var argv = require('yargs').argv;
 var gulp = require('gulp');
 var gutil = require('gulp-util');
-var connect = require('gulp-connect');
+var webserver = require('gulp-webserver');
 var webpack = require('webpack');
 var webpackStream = require('webpack-stream');
 var uglify = require('gulp-uglify');
@@ -56,11 +56,12 @@ function e2etestReport() {
   var reportPort = 9010;
   var targetDestinationDir = './e2etest-report';
   helpers.createEnd2EndTestReport(targetDestinationDir);
-  connect.server({
-    port: reportPort,
-    root: './',
-    livereload: true
-  });
+  gulp.src('./')
+    .pipe(webserver({
+      port: reportPort,
+      directoryListing: true,
+      livereload: true
+    }));
 
   setTimeout(function() {
     opens('http://localhost:' + reportPort + '/' + targetDestinationDir.slice(2) + '/results.html');
@@ -90,13 +91,14 @@ function lint(done) {
 function viewCoverage(done) {
   var coveragePort = 1999;
 
-  connect.server({
-    port: coveragePort,
-    root: 'build/coverage/karma_html',
-    livereload: false
-  });
-  opens('http://localhost:' + coveragePort);
-  done();
+  var stream = gulp.src('./')
+    .pipe(webserver({
+      port: coveragePort,
+      directoryListing: true,
+      livereload: false,
+      open: 'build/coverage/karma_html/index.html'
+    }));
+  stream.on('finish', done);
 };
 viewCoverage.displayName = 'view-coverage';
 
@@ -113,16 +115,17 @@ function watch(done) {
     'test/spec/loaders/**/*.js'
   ]);
 
-  connect.server({
-    https: argv.https,
-    port: port,
-    root: './',
-    livereload: true
-  });
+  var stream = gulp.src('./')
+    .pipe(webserver({
+      https: argv.https,
+      port: port,
+      directoryListing: true,
+      livereload: true
+    }));
 
   mainWatcher.on('all', gulp.series(clean, gulp.parallel(lint, 'build-bundle-dev', test)));
   loaderWatcher.on('all', gulp.series(lint));
-  done();
+  stream.on('finish', done);
 };
 
 function makeDevpackPkg() {
@@ -137,8 +140,7 @@ function makeDevpackPkg() {
     .pipe(helpers.nameModules(externalModules))
     .pipe(webpackStream(cloned, webpack))
     .pipe(replace('$prebid.version$', prebid.version))
-    .pipe(gulp.dest('build/dev'))
-    .pipe(connect.reload());
+    .pipe(gulp.dest('build/dev'));
 }
 
 function makeWebpackPkg() {
@@ -158,8 +160,7 @@ function makeWebpackPkg() {
     .pipe(uglify())
     .pipe(gulpif(file => file.basename === 'prebid-core.js', header(banner, { prebid: prebid })))
     .pipe(optimizejs())
-    .pipe(gulp.dest('build/dist'))
-    .pipe(connect.reload());
+    .pipe(gulp.dest('build/dist'));
 }
 
 function gulpBundle(dev) {
@@ -227,12 +228,7 @@ function newKarmaCallback(done) {
     if (exitCode) {
       done(new Error('Karma tests failed with exit code ' + exitCode));
     } else {
-      if (argv.browserstack) {
-        // process.exit(0);
-        done(); // test this with travis (or circleci)
-      } else {
-        done();
-      }
+      done();
     }
   }
 }
@@ -273,26 +269,6 @@ function coveralls() { // 2nd arg is a dependency: 'test' must be finished
     .pipe(shell('cat build/coverage/lcov.info | node_modules/coveralls/bin/coveralls.js'));
 }
 
-// Watch Task with Live Reload
-gulp.task('watch', function () {
-  gulp.watch([
-    'src/**/*.js',
-    'modules/**/*.js',
-    'test/spec/**/*.js',
-    '!test/spec/loaders/**/*.js'
-  ], ['build-bundle-dev', 'test']);
-  gulp.watch([
-    'loaders/**/*.js',
-    'test/spec/loaders/**/*.js'
-  ], ['lint']);
-  connect.server({
-    https: argv.https,
-    port: port,
-    root: './',
-    livereload: true
-  });
-});
-
 function e2eTest() {
   var cmdQueue = [];
   if (argv.browserstack) {

modules/33acrossBidAdapter.js

@@ -27,8 +27,8 @@ function _createBidResponse(response) {
   }
 }
 
-function _isViewabilityMeasurable() {
-  return !_isIframe();
+function _isViewabilityMeasurable(element) {
+  return !_isIframe() && element !== null;
 }
 
 function _getViewability(element, topWin, { w, h } = {}) {
@@ -46,12 +46,16 @@ function _createServerRequest(bidRequest, gdprConsent) {
   const sizes = _transformSizes(bidRequest.sizes);
   const minSize = _getMinSize(sizes);
 
-  const viewabilityAmount = _isViewabilityMeasurable()
+  const viewabilityAmount = _isViewabilityMeasurable(element)
     ? _getViewability(element, utils.getWindowTop(), minSize)
     : NON_MEASURABLE;
 
   const contributeViewability = ViewabilityContributor(viewabilityAmount);
 
+  if (element === null) {
+    utils.logWarn(`Unable to locate element with id: '${bidRequest.adUnitCode}'`);
+  }
+
   /*
    * Infer data for the request payload
    */
@@ -90,7 +94,7 @@ function _createServerRequest(bidRequest, gdprConsent) {
         'version': '$prebid.version$'
       }]
     }
-  }
+  };
 
   // Finally, set the openRTB 'test' param if this is to be a test bid
   if (params.test === 1) {

modules/adgenerationBidAdapter.js

@@ -75,11 +75,6 @@ export const spec = {
       return [];
     }
     const bidRequest = bidRequests.bidRequest;
-    if (!bidRequest.mediaTypes || bidRequest.mediaTypes.banner) {
-      if (!body.w || !body.h) {
-        return [];
-      }
-    }
     const bidResponse = {
       requestId: bidRequest.bidId,
       cpm: body.cpm || 0,
@@ -91,7 +86,7 @@ export const spec = {
       netRevenue: true,
       ttl: body.ttl || 10,
     };
-    if (bidRequest.mediaTypes && bidRequest.mediaTypes.native) {
+    if (isNative(body)) {
       bidResponse.native = createNativeAd(body);
       bidResponse.mediaType = NATIVE;
     } else {
@@ -124,6 +119,11 @@ function createAd(body, bidRequest) {
   return ad;
 }
 
+function isNative(body) {
+  if (!body) return false;
+  return body.native_ad && body.native_ad.assets.length > 0;
+}
+
 function createNativeAd(body) {
   let native = {};
   if (body.native_ad && body.native_ad.assets.length > 0) {

modules/adtelligentBidAdapter.js

@@ -17,15 +17,43 @@ export const spec = {
   isBidRequestValid: function (bid) {
     return bid && bid.params && bid.params.aid;
   },
+  getUserSyncs: function (syncOptions, serverResponses) {
+    var syncs = [];
+
+    function addSyncs(_s) {
+      if (_s && _s.length) {
+        _s.forEach(s => {
+          syncs.push({
+            type: 'image',
+            url: s
+          })
+        })
+      }
+    }
 
+    if (syncOptions.pixelEnabled) {
+      serverResponses && serverResponses.length && serverResponses.forEach((response) => {
+        if (response.body) {
+          if (utils.isArray(response.body)) {
+            response.body.forEach(b => {
+              addSyncs(b.cookieURLs);
+            })
+          } else {
+            addSyncs(response.body.cookieURLs)
+          }
+        }
+      })
+    }
+    return syncs;
+  },
   /**
    * Make a server request from the list of BidRequests
    * @param bidRequests
    * @param bidderRequest
    */
   buildRequests: function (bidRequests, bidderRequest) {
     return {
-      data: bidToTag(bidRequests),
+      data: bidToTag(bidRequests, bidderRequest),
       bidderRequest,
       method: 'GET',
       url: URL
@@ -83,11 +111,16 @@ function parseRTBResponse(serverResponse, bidderRequest) {
   return bids;
 }
 
-function bidToTag(bidRequests) {
+function bidToTag(bidRequests, bidderRequest) {
   let tag = {
     domain: utils.getTopWindowLocation().hostname
   };
 
+  if (bidderRequest && bidderRequest.gdprConsent) {
+    tag.gdpr = 1;
+    tag.gdpr_consent = bidderRequest.gdprConsent.consentString;
+  }
+
   for (let i = 0, length = bidRequests.length; i < length; i++) {
     Object.assign(tag, prepareRTBRequestParams(i, bidRequests[i]));
   }

modules/adyoulikeBidAdapter.js

@@ -31,7 +31,6 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (bidRequests, bidderRequest) {
-    let dcHostname = getHostname(bidRequests);
     const payload = {
       Version: VERSION,
       Bids: bidRequests.reduce((accumulator, bid) => {
@@ -60,7 +59,7 @@ export const spec = {
 
     return {
       method: 'POST',
-      url: createEndpoint(dcHostname),
+      url: createEndpoint(bidRequests, bidderRequest),
       data,
       options
     };
@@ -94,14 +93,10 @@ function getHostname(bidderRequest) {
 }
 
 /* Get current page referrer url */
-function getReferrerUrl() {
+function getReferrerUrl(bidderRequest) {
   let referer = '';
-  if (window.self !== window.top) {
-    try {
-      referer = window.top.document.referrer;
-    } catch (e) { }
-  } else {
-    referer = document.referrer;
+  if (bidderRequest && bidderRequest.refererInfo) {
+    referer = encodeURIComponent(bidderRequest.refererInfo.referer);
   }
   return referer;
 }
@@ -134,20 +129,21 @@ function getPageRefreshed() {
 }
 
 /* Create endpoint url */
-function createEndpoint(host) {
+function createEndpoint(bidRequests, bidderRequest) {
+  let host = getHostname(bidRequests);
   return format({
     protocol: (document.location.protocol === 'https:') ? 'https' : 'http',
     host: `${DEFAULT_DC}${host}.omnitagjs.com`,
     pathname: '/hb-api/prebid/v1',
-    search: createEndpointQS()
+    search: createEndpointQS(bidderRequest)
   });
 }
 
 /* Create endpoint query string */
-function createEndpointQS() {
+function createEndpointQS(bidderRequest) {
   const qs = {};
 
-  const ref = getReferrerUrl();
+  const ref = getReferrerUrl(bidderRequest);
   if (ref) {
     qs.RefererUrl = encodeURIComponent(ref);
   }

modules/ajaBidAdapter.js

@@ -93,16 +93,28 @@ export const spec = {
 
   getUserSyncs: function(syncOptions, serverResponses) {
     const syncs = [];
-    if (syncOptions.pixelEnabled && serverResponses.length) {
-      const bidderResponseBody = serverResponses[0].body;
-      if (bidderResponseBody.syncs) {
-        bidderResponseBody.syncs.forEach(sync => {
-          syncs.push({
-            type: 'image',
-            url: sync
-          });
+    if (!serverResponses.length) {
+      return syncs;
+    }
+
+    const bidderResponseBody = serverResponses[0].body;
+
+    if (syncOptions.pixelEnabled && bidderResponseBody.syncs) {
+      bidderResponseBody.syncs.forEach(sync => {
+        syncs.push({
+          type: 'image',
+          url: sync
         });
-      }
+      });
+    }
+
+    if (syncOptions.iframeEnabled && bidderResponseBody.sync_htmls) {
+      bidderResponseBody.sync_htmls.forEach(sync => {
+        syncs.push({
+          type: 'iframe',
+          url: sync
+        });
+      });
     }
 
     return syncs;