Release/1.29.0

CHANGELOG

@@ -1,3 +1,9 @@
+AOL Prebid 1.29.0
+----------------
+Updated to Prebid 0.29.0
+Updated AOL adapter to be compatible with Prebid 1.0.
+
+
 AOL Prebid 1.28.0
 ----------------
 Updated to Prebid 0.28.0

gulpHelpers.js

@@ -64,14 +64,14 @@ module.exports = {
     externalModules = externalModules || [];
     var internalModules;
     try {
-      internalModules = fs.readdirSync(MODULE_PATH)
+      var absoluteModulePath = path.join(__dirname, MODULE_PATH);
+      internalModules = fs.readdirSync(absoluteModulePath)
         .filter(file => !(/(^|\/)\.[^\/\.]/g).test(file))
         .reduce((memo, file) => {
           var moduleName = file.split(new RegExp('[.\\' + path.sep + ']'))[0];
-          var filePath = path.join(MODULE_PATH, file);
-          var modulePath = path.join(__dirname, filePath)
-          if (fs.lstatSync(filePath).isDirectory()) {
-            modulePath = path.join(__dirname, filePath, "index.js")
+          var modulePath = path.join(absoluteModulePath, file);
+          if (fs.lstatSync(modulePath).isDirectory()) {
+            modulePath = path.join(modulePath, "index.js")
           }
           memo[modulePath] = moduleName;
           return memo;

gulpfile.js

@@ -16,7 +16,7 @@ var opens = require('open');
 var webpackConfig = require('./webpack.conf');
 var helpers = require('./gulpHelpers');
 var del = require('del');
-var gulpJsdoc2md = require('gulp-jsdoc-to-markdown');
+var gulpDocumentation = require('gulp-documentation');
 var concat = require('gulp-concat');
 var header = require('gulp-header');
 var footer = require('gulp-footer');
@@ -26,6 +26,7 @@ var optimizejs = require('gulp-optimize-js');
 var eslint = require('gulp-eslint');
 var gulpif = require('gulp-if');
 var sourcemaps = require('gulp-sourcemaps');
+var through = require('through2');
 var fs = require('fs');
 
 var prebid = require('./package.json');
@@ -51,8 +52,25 @@ gulp.task('clean', function () {
     .pipe(clean());
 });
 
-function bundle(dev) {
-  var modules = helpers.getArgModules(),
+function gulpBundle(dev) {
+  return bundle(dev).pipe(gulp.dest('build/' + (dev ? 'dev' : 'dist')));
+}
+
+function nodeBundle(modules) {
+  return new Promise((resolve, reject) => {
+    bundle(false, modules)
+      .on('error', (err) => {
+        reject(err);
+      })
+      .pipe(through.obj(function(file, enc, done) {
+        resolve(file.contents.toString(enc));
+        done();
+      }));
+  });
+}
+
+function bundle(dev, moduleArr) {
+  var modules = moduleArr || helpers.getArgModules(),
       allModules = helpers.getModuleNames(modules);
 
   if(modules.length === 0) {
@@ -81,8 +99,7 @@ function bundle(dev) {
         global: prebid.globalVarName
       }
     )))
-    .pipe(gulpif(dev, sourcemaps.write('.')))
-    .pipe(gulp.dest('build/' + (dev ? 'dev' : 'dist')));
+    .pipe(gulpif(dev, sourcemaps.write('.')));
 }
 
 // Workaround for incompatibility between Karma & gulp callbacks.
@@ -97,9 +114,13 @@ function newKarmaCallback(done) {
   }
 }
 
-gulp.task('build-bundle-dev', ['devpack'], bundle.bind(null, true));
-gulp.task('build-bundle-prod', ['webpack'], bundle.bind(null, false));
-gulp.task('bundle', bundle.bind(null, false)); // used for just concatenating pre-built files with no build step
+gulp.task('build-bundle-dev', ['devpack'], gulpBundle.bind(null, true));
+gulp.task('build-bundle-prod', ['webpack'], gulpBundle.bind(null, false));
+gulp.task('bundle', gulpBundle.bind(null, false)); // used for just concatenating pre-built files with no build step
+
+gulp.task('bundle-to-stdout', function() {
+  nodeBundle().then(file => console.log(file));
+});
 
 gulp.task('devpack', ['clean'], function () {
   var cloned = _.cloneDeep(webpackConfig);
@@ -234,10 +255,9 @@ gulp.task('clean-docs', function () {
 
 gulp.task('docs', ['clean-docs'], function () {
   return gulp.src('src/prebid.js')
-    .pipe(concat('readme.md'))
-    .pipe(gulpJsdoc2md())
+    .pipe(gulpDocumentation('md'))
     .on('error', function (err) {
-      gutil.log('jsdoc2md failed:', err.message);
+      gutil.log('`gulp-documentation` failed:', err.message);
     })
     .pipe(gulp.dest('docs'));
 });
@@ -291,3 +311,5 @@ gulp.task('build-postbid', function() {
     .pipe(uglify())
     .pipe(gulp.dest('build/dist'));
 });
+
+module.exports = nodeBundle;

integrationExamples/gpt/amp/README.md

@@ -0,0 +1,12 @@
+This README provides steps to run amp example page.
+
+Add following entries to your hosts file
+
+    127.0.0.1    publisher.com
+    127.0.0.1    amp.publisher.com
+
+Command to run
+
+    gulp serve --https
+
+Additional documentation can be found at [Prebid AMP](http://prebid.org/dev-docs/how-prebid-on-amp-works.html)

integrationExamples/gpt/amp/amp_page.html

@@ -13,7 +13,7 @@
       -->
     <meta charset="utf-8">
     <title>Hello, AMPs</title>
-    <link rel="canonical" href="http://example.ampproject.org/article-metadata.html" />
+    <link rel="canonical" href="https://example.ampproject.org/article-metadata.html" />
     <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
 
       <!-- The following meta tag specifies the path to the publisher-hosted file to use as the
@@ -22,15 +22,15 @@
         domains and ports are:
             https://publisher.com:9999/amp_page.html
                 and
-            https://amp.publisher.com:5000/remote.html
+            https://amp.publisher.com:9999/remote.html
 
             Further reading
             AMP documentation <amp-ad> spec
             https://www.ampproject.org/docs/reference/components/amp-ad
             See sections on "Running ads from a custom domain" and "Enhance incoming ad
             configuration" for more details on techniques used here.
          -->
-    <meta name="amp-3p-iframe-src" content="https://amp.publisher.com:5000/remote.html">
+    <meta name="amp-3p-iframe-src" content="https://amp.publisher.com:9999/integrationExamples/gpt/amp/remote.html">
 
     <script async custom-element="amp-ad" src="https://cdn.ampproject.org/v0/amp-ad-0.1.js"></script>
     <script type="application/ld+json">
@@ -55,7 +55,7 @@ <h1>Welcome to the mobile web</h1>
       height="250"
       layout="fixed"
       type="doubleclick"
-      json='{"prebid":{"requestBidsDuration":1000,"adUnits":[{"code":"/19968336/header-bid-tag-1","sizes":[[300,250],[300,600],[300,250],[100,100]],"bids":[{"bidder":"appnexusAst","params":{"placementId":"10433394","dealId":"some deal!"}},{"bidder":"aol","params":{"network":"10077.1","placement":3671670}},{"bidder":"sovrn","params":{"tagid":"315045"}}]},{"code":"/19968336/header-bid-tag-2","sizes":[[300,250],[300,600],[300,250],[100,100]],"bids":[{"bidder":"appnexusAst","params":{"placementId":"10433394","dealId":"some deal!"}},{"bidder":"aol","params":{"network":"10077.1","placement":3671670}},{"bidder":"sovrn","params":{"tagid":"315045"}}]}]}}'
+      json='{"prebid": {"requestBidsDuration": 1000,"adUnits": [{"code": "/19968336/header-bid-tag-1","sizes": [[300, 250],[300, 600],[300, 250],[100, 100]],"bids": [{"bidder": "appnexus","params": {"placementId": "10433394","dealId": "some deal!"}}]}, {"code": "/19968336/header-bid-tag-2","sizes": [[300, 250],[300, 600],[300, 250],[100, 100]],"bids": [{"bidder": "appnexus","params": {"placementId": "10433394","dealId": "some deal!"}}]}]}}'
       data-slot="/19968336/header-bid-tag-1">
     </amp-ad>
 
@@ -64,7 +64,7 @@ <h1>Welcome to the mobile web</h1>
       height="250"
       layout="fixed"
       type="doubleclick"
-      json='{"prebid":{"requestBidsDuration":1000,"adUnits":[{"code":"/19968336/header-bid-tag-1","sizes":[[300,250],[300,600],[300,250],[100,100]],"bids":[{"bidder":"appnexusAst","params":{"placementId":"10433394","dealId":"some deal!"}},{"bidder":"aol","params":{"network":"10077.1","placement":3671670}},{"bidder":"sovrn","params":{"tagid":"315045"}}]},{"code":"/19968336/header-bid-tag-2","sizes":[[300,250],[300,600],[300,250],[100,100]],"bids":[{"bidder":"appnexusAst","params":{"placementId":"10433394","dealId":"some deal!"}},{"bidder":"aol","params":{"network":"10077.1","placement":3671670}},{"bidder":"sovrn","params":{"tagid":"315045"}}]}]}}'
+      json='{"prebid": {"requestBidsDuration": 1000,"adUnits": [{"code": "/19968336/header-bid-tag-1","sizes": [[300, 250],[300, 600],[300, 250],[100, 100]],"bids": [{"bidder": "appnexus","params": {"placementId": "10433394","dealId": "some deal!"}}]}, {"code": "/19968336/header-bid-tag-2","sizes": [[300, 250],[300, 600],[300, 250],[100, 100]],"bids": [{"bidder": "appnexus","params": {"placementId": "10433394","dealId": "some deal!"}}]}]}}'
       data-slot="/19968336/header-bid-tag-2">
     </amp-ad>
 

integrationExamples/gpt/pbjs_example_gpt.html

@@ -338,6 +338,10 @@
                             floor: 1.50 // Dynamic bid floor - optional
                         }
                     },
+                    {
+                        bidder: 'yieldmo',
+                        params: {}
+                    },
                     {
                         bidder: 'adequant',
                         params: {