Skip to content

Commit

Permalink
Merge pull request #18 from prebid/master
Browse files Browse the repository at this point in the history
merge master
  • Loading branch information
pro-nsk authored Nov 16, 2023
2 parents 3b63de9 + 97d3daa commit a586474
Show file tree
Hide file tree
Showing 231 changed files with 16,975 additions and 3,021 deletions.
1 change: 0 additions & 1 deletion PR_REVIEW.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ Follow steps above for general review process. In addition, please verify the fo
- Adapters that accept a floor parameter must also support the [floors module](https://docs.prebid.org/dev-docs/modules/floors.html) -- look for a call to the `getFloor()` function.
- Adapters cannot accept an schain parameter. Rather, they must look for the schain parameter at bidRequest.schain.
- The bidderRequest.refererInfo.referer must be checked in addition to any bidder-specific parameter.
- If they're getting the COPPA flag, it must come from config.getConfig('coppa');
- Page position must come from bidrequest.mediaTypes.banner.pos or bidrequest.mediaTypes.video.pos
- Global OpenRTB fields should come from [getConfig('ortb2');](https://docs.prebid.org/dev-docs/publisher-api-reference/setConfig.html#setConfig-fpd):
- bcat, battr, badv
Expand Down
3 changes: 2 additions & 1 deletion features.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[
"NATIVE",
"VIDEO"
"VIDEO",
"UID2_CSTG"
]
30 changes: 17 additions & 13 deletions integrationExamples/gpt/hello_world.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
-->

<html>

<head>
<script async src="../../build/dev/prebid.js"></script>
<script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
Expand All @@ -19,9 +20,10 @@
code: 'div-gpt-ad-1460505748561-0',
mediaTypes: {
banner: {
sizes: [[300, 250], [300,600]],
sizes: [[300, 250]],
}
},

// Replace this object to test a new Adapter!
bids: [{
bidder: 'appnexus',
Expand All @@ -40,12 +42,13 @@
<script>
var googletag = googletag || {};
googletag.cmd = googletag.cmd || [];
googletag.cmd.push(function() {
googletag.cmd.push(function () {
googletag.pubads().disableInitialLoad();
});

pbjs.que.push(function() {
pbjs.que.push(function () {
pbjs.addAdUnits(adUnits);

pbjs.requestBids({
bidsBackHandler: sendAdserverRequest,
timeout: PREBID_TIMEOUT
Expand All @@ -55,15 +58,15 @@
function sendAdserverRequest() {
if (pbjs.adserverRequestSent) return;
pbjs.adserverRequestSent = true;
googletag.cmd.push(function() {
pbjs.que.push(function() {
googletag.cmd.push(function () {
pbjs.que.push(function () {
pbjs.setTargetingForGPTAsync();
googletag.pubads().refresh();
});
});
}

setTimeout(function() {
setTimeout(function () {
sendAdserverRequest();
}, FAILSAFE_TIMEOUT);

Expand All @@ -80,12 +83,13 @@
</head>

<body>
<h2>Prebid.js Test</h2>
<h5>Div-1</h5>
<div id='div-gpt-ad-1460505748561-0'>
<script type='text/javascript'>
googletag.cmd.push(function() { googletag.display('div-gpt-ad-1460505748561-0'); });
</script>
</div>
<h2>Prebid.js Test</h2>
<h5>Div-1</h5>
<div id='div-gpt-ad-1460505748561-0'>
<script type='text/javascript'>
googletag.cmd.push(function () { googletag.display('div-gpt-ad-1460505748561-0'); });
</script>
</div>
</body>

</html>
40 changes: 25 additions & 15 deletions integrationExamples/gpt/prebidServer_example.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,31 +33,41 @@

pbjs.que.push(function() {
var adUnits = [{
code: 'div-gpt-ad-1460505748561-0',
mediaTypes: {
banner: {
sizes: [[300, 250]]
}
},
bids: [
{
bidder: 'appnexus',
params: {
placementId: 13144370
}
code: 'div-gpt-ad-1460505748561-0',
mediaTypes: {
banner: {
sizes: [600, 500]
}
},
bids: [
{
bidder: 'appnexus',
params: {
placementId: 12883451
}
]
}];
}
]
}];

pbjs.bidderSettings = {
appnexus: {
bidCpmAdjustment: function () {
return 10;
}
}
}
pbjs.setConfig({
bidderTimeout: 3000,
s2sConfig : {
accountId : '1',
enabled : true, //default value set to false
defaultVendor: 'appnexus',
defaultVendor: 'appnexuspsp',
bidders : ['appnexus'],
timeout : 1000, //default value is 1000
adapter : 'prebidServer', //if we have any other s2s adapter, default value is s2s
},
ortb2: {
test: 1
}
});

Expand Down
2 changes: 1 addition & 1 deletion integrationExamples/gpt/prebidServer_fledge_example.html
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
s2sConfig: [{
accountId : '1',
enabled : true,
defaultVendor: 'appnexus',
defaultVendor: 'appnexuspsp',
bidders : ['openx'],
timeout : 1500,
adapter : 'prebidServer'
Expand Down
168 changes: 168 additions & 0 deletions integrationExamples/gpt/tpmn_example.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,168 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Prebid.js Banner Example</title>
<!-- Prebid.js -->
<!-- <script async src="prebid.js"></script> -->
<script async src="../../build/dev/prebid.js"></script>
<!-- Google Publisher Tag -->
<script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
<script>
var pbjs = pbjs || {};
pbjs.que = pbjs.que || [];
const customConfigObject = {
"buckets": [{
"max": 40,
"increment": 0.5
}]
};
// Prebid Banner Ad Unit
var adUnits = [
{
// Banner adUnit
code: 'banner-div-0',
mediaTypes: {
banner: {
sizes: [[300, 250]],
battr: []
}
},
bids: [{
bidder: 'tpmn',
params: {
inventoryId: 2,
bidFloor: 0.1,
}
}]
},
{
// Video adUnit
code: 'video-div-1',
mediaTypes: {
video: {
context: 'outstream',
playerSize: [640, 480],
mimes: ['video/mp4'],
//playbackmethod: [2, 4, 6],
api: [1, 2, 4, 6],
protocols: [3, 4, 7, 8, 10],
placement: 1,
minduration: 0,
maxduration: 60,
startdelay: 0,
skip: 1
},
},
bids: [{
bidder: 'tpmn',
params: {
inventoryId: 2,
bidFloor: 2.0,
}
}],
renderer: {
options: {
adText : "TPMN Ad",
disableCollapse : true
}
}
}
];
</script>
<script>
var googletag = googletag || {};
googletag.cmd = googletag.cmd || [];
googletag.cmd.push(function () {
googletag.pubads().disableInitialLoad();
});

pbjs.que.push(function () {
pbjs.setConfig({
debug: true,
enableSendAllBids: false,
priceGranularity: customConfigObject,
userSync: {
userIds: [{
name: "pubCommonId",
storage: {
name: "pubcid",
type: "cookie",
days: 30
}
},{
name: "unifiedId",
storage: {
type: "cookie",
name: "unifiedid",
expires: 60
}
}],
userIdAsEids: true
}
});
pbjs.addAdUnits(adUnits);
pbjs.requestBids({ bidsBackHandler: sendAdServerRequest });
});

function sendAdServerRequest() {
if (pbjs.adserverRequestSent) return;

//Google Ad Server Use Banner
googletag.cmd.push(() => {
googletag
.defineSlot('/19968336/header-bid-tag-0', [300, 250], 'banner-div-0')
.addService(googletag.pubads());
googletag.pubads().enableSingleRequest();
googletag.enableServices();
});

//Direct Rendering Video
var highestCpmBids = pbjs.getHighestCpmBids('video-div-1');
console.log("highestCpmBids", highestCpmBids);
if (highestCpmBids.length) {
var doc = document.getElementById('video-div-1');
console.log("highestCpmBids[0].adId", highestCpmBids[0].adId);
pbjs.renderAd(doc, highestCpmBids[0].adId);
}

// googletag.cmd.push(() => {
// googletag
// .defineSlot('/19968336/header-bid-tag-0', [640, 480], 'video-div-1')
// .addService(googletag.pubads());
// googletag.pubads().enableSingleRequest();
// googletag.enableServices();
// });

googletag.cmd.push(function () {
pbjs.que.push(function () {
const adUnitCodes = adUnits.map(adUnit => adUnit.code);
pbjs.setTargetingForGPTAsync(adUnitCodes);
googletag.pubads().refresh();
});
});
}
</script>

</head>
<body>
<h2>Prebid.js TPMN Banner Example</h2>
<div id='banner-div-0'>
<script>
googletag.cmd.push(function () {
googletag.display('banner-div-0');
});
</script>
</div>
<br>
<h2>Prebid.js TPMN Video Example</h2>
<div id='video-div-1' style="width: 640px; height: 480px;">
<script>
googletag.cmd.push(function () {
googletag.display('video-div-1');
});
</script>
</div>
<br>
<div id="targeting-keys"></div>
</body>
Loading

0 comments on commit a586474

Please sign in to comment.