From 0a618c39ce37b5a470cdd79db487b9a960356745 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Van=20de=20Wyngaert?= Date: Mon, 18 Mar 2019 11:51:51 +0100 Subject: [PATCH] Adikteev becomes Emoteev - https://twitter.com/Adikteev/status/1105073414103072769 - https://www.linkedin.com/feed/update/urn:li:activity:6511615144966135809 --- ...adikteev.html => hello_world_emoteev.html} | 2 +- integrationExamples/gpt/pbjs_example_gpt.html | 8 +- ...eevBidAdapter.md => emokteevBidAdapter.md} | 8 +- ...teevBidAdapter.js => emoteevBidAdapter.js} | 50 +++---- ...pter_spec.js => emoteevBidAdapter_spec.js} | 122 +++++++++--------- 5 files changed, 94 insertions(+), 96 deletions(-) rename integrationExamples/gpt/{hello_world_adikteev.html => hello_world_emoteev.html} (98%) rename modules/{adikteevBidAdapter.md => emokteevBidAdapter.md} (74%) rename modules/{adikteevBidAdapter.js => emoteevBidAdapter.js} (70%) rename test/spec/modules/{adikteevBidAdapter_spec.js => emoteevBidAdapter_spec.js} (71%) diff --git a/integrationExamples/gpt/hello_world_adikteev.html b/integrationExamples/gpt/hello_world_emoteev.html similarity index 98% rename from integrationExamples/gpt/hello_world_adikteev.html rename to integrationExamples/gpt/hello_world_emoteev.html index 0faf518c721..5e4d0716d2b 100644 --- a/integrationExamples/gpt/hello_world_adikteev.html +++ b/integrationExamples/gpt/hello_world_emoteev.html @@ -21,7 +21,7 @@ } }, bids: [{ - bidder: 'adikteev', + bidder: 'emoteev', params: { adSpaceId: 5084, } diff --git a/integrationExamples/gpt/pbjs_example_gpt.html b/integrationExamples/gpt/pbjs_example_gpt.html index 32452d33fd9..3a32eb5dbd6 100644 --- a/integrationExamples/gpt/pbjs_example_gpt.html +++ b/integrationExamples/gpt/pbjs_example_gpt.html @@ -314,12 +314,10 @@ height: '250', } }, - { - bidder: 'adikteev', + { + bidder: 'emoteev', params: { - placementId: 12345, - currency: 'EUR', - bidFloorPrice: 0.1, + adSpaceId: 5084, } }, ] diff --git a/modules/adikteevBidAdapter.md b/modules/emokteevBidAdapter.md similarity index 74% rename from modules/adikteevBidAdapter.md rename to modules/emokteevBidAdapter.md index 01d6ca91fcc..5a79ab9a2be 100644 --- a/modules/adikteevBidAdapter.md +++ b/modules/emokteevBidAdapter.md @@ -1,14 +1,14 @@ # Overview ``` -Module Name: Adikteev Bidder Adapter +Module Name: Emoteev Bidder Adapter Module Type: Bidder Adapter -Maintainer: adnetwork@adikteev.com +Maintainer: engineering@emoteev.com ``` # Description -Module that connects to Adikteev's demand sources +Module that connects to Emoteev's demand sources # Test Parameters @@ -23,7 +23,7 @@ Module that connects to Adikteev's demand sources }, bids: [ { - bidder: 'adikteev', + bidder: 'emoteev', params: { adSpaceId: 5084 } diff --git a/modules/adikteevBidAdapter.js b/modules/emoteevBidAdapter.js similarity index 70% rename from modules/adikteevBidAdapter.js rename to modules/emoteevBidAdapter.js index 60728a1a1e2..9b03b357818 100644 --- a/modules/adikteevBidAdapter.js +++ b/modules/emoteevBidAdapter.js @@ -3,12 +3,12 @@ import {BANNER} from '../src/mediaTypes'; import * as utils from '../src/utils'; import {config} from '../src/config'; -export const BIDDER_CODE = 'adikteev'; +export const BIDDER_CODE = 'emoteev'; export const AK_PBJS_VERSION = '1.35.0'; -export const AK_BASE_URL = 'https://prebid.adikteev.com'; -export const AK_BASE_URL_STAGING = 'https://prebid-staging.adikteev.com'; -export const AK_BASE_URL_DEVELOPMENT = 'http://localhost:3000'; +export const EMOTEEV_BASE_URL = 'https://prebid.emoteev.io'; +export const EMOTEEV_BASE_URL_STAGING = 'https://prebid-staging.emoteev.io'; +export const EMOTEEV_BASE_URL_DEVELOPMENT = 'http://localhost:3000'; export const ENDPOINT_PATH = '/api/prebid/bid'; export const USER_SYNC_IFRAME_URL_PATH = '/api/prebid/sync-iframe'; @@ -29,46 +29,46 @@ export const conformBidRequest = bidRequest => { }; }; -export const akDebug = (parameterDebug, configDebug) => { +export const emoteevDebug = (parameterDebug, configDebug) => { if (parameterDebug && parameterDebug.length && parameterDebug.length > 0) return JSON.parse(parameterDebug); else if (configDebug) return configDebug; else return false; }; -export const akEnv = (parameterAkEnv, configAkEnv) => { - if (utils.contains([PRODUCTION, STAGING, DEVELOPMENT], parameterAkEnv)) return parameterAkEnv; - else if (utils.contains([PRODUCTION, STAGING, DEVELOPMENT], configAkEnv)) return configAkEnv; +export const emoteevEnv = (parameteremoteevEnv, configemoteevEnv) => { + if (utils.contains([PRODUCTION, STAGING, DEVELOPMENT], parameteremoteevEnv)) return parameteremoteevEnv; + else if (utils.contains([PRODUCTION, STAGING, DEVELOPMENT], configemoteevEnv)) return configemoteevEnv; else return DEFAULT_ENV; }; -export const akOverrides = (parameterAkOverrides, configAkOverrides) => { - if (parameterAkOverrides && parameterAkOverrides.length !== 0) { +export const emoteevOverrides = (parameteremoteevOverrides, configemoteevOverrides) => { + if (parameteremoteevOverrides && parameteremoteevOverrides.length !== 0) { let parsedParams = null; try { - parsedParams = JSON.parse(parameterAkOverrides); + parsedParams = JSON.parse(parameteremoteevOverrides); } catch (error) { parsedParams = null; } if (parsedParams) return parsedParams; } - if (configAkOverrides && Object.keys(configAkOverrides).length !== 0) return configAkOverrides; + if (configemoteevOverrides && Object.keys(configemoteevOverrides).length !== 0) return configemoteevOverrides; else return {}; }; export const akUrl = (environment) => { switch (environment) { case DEVELOPMENT: - return AK_BASE_URL_DEVELOPMENT; + return EMOTEEV_BASE_URL_DEVELOPMENT; case STAGING: - return AK_BASE_URL_STAGING; + return EMOTEEV_BASE_URL_STAGING; default: - return AK_BASE_URL; + return EMOTEEV_BASE_URL; } }; -export const endpointUrl = (parameterAkEnv, configAkEnv) => akUrl(akEnv(parameterAkEnv, configAkEnv)).concat(ENDPOINT_PATH); -export const userSyncIframeUrl = (parameterAkEnv, configAkEnv) => akUrl(akEnv(parameterAkEnv, configAkEnv)).concat(USER_SYNC_IFRAME_URL_PATH); -export const userSyncImageUrl = (parameterAkEnv, configAkEnv) => akUrl(akEnv(parameterAkEnv, configAkEnv)).concat(USER_SYNC_IMAGE_URL_PATH); +export const endpointUrl = (parameteremoteevEnv, configemoteevEnv) => akUrl(emoteevEnv(parameteremoteevEnv, configemoteevEnv)).concat(ENDPOINT_PATH); +export const userSyncIframeUrl = (parameteremoteevEnv, configemoteevEnv) => akUrl(emoteevEnv(parameteremoteevEnv, configemoteevEnv)).concat(USER_SYNC_IFRAME_URL_PATH); +export const userSyncImageUrl = (parameteremoteevEnv, configemoteevEnv) => akUrl(emoteevEnv(parameteremoteevEnv, configemoteevEnv)).concat(USER_SYNC_IMAGE_URL_PATH); export const getViewDimensions = () => { let w = window; @@ -175,17 +175,17 @@ export const spec = { akPbjsVersion: AK_PBJS_VERSION, bidRequests: validBidRequests.map(conformBidRequest), currency: config.getConfig('currency'), - debug: akDebug(utils.getParameterByName('akDebug'), config.getConfig('adikteev.debug')), + debug: emoteevDebug(utils.getParameterByName('emoteevDebug'), config.getConfig('emoteev.debug')), language: navigator.language, refererInfo: bidderRequest.refererInfo, deviceInfo: getDeviceInfo(getDeviceDimensions(), getViewDimensions(), getDocumentDimensions(), isWebGLEnabled()), userAgent: navigator.userAgent, }, - akOverrides(utils.getParameterByName('akOverrides'), config.getConfig('adikteev.overrides'))); + emoteevOverrides(utils.getParameterByName('emoteevOverrides'), config.getConfig('emoteev.overrides'))); return { method: 'POST', - url: endpointUrl(utils.getParameterByName('akEnv'), config.getConfig('adikteev.env')), + url: endpointUrl(utils.getParameterByName('emoteevEnv'), config.getConfig('emoteev.env')), data: JSON.stringify(payload), }; }, @@ -193,19 +193,19 @@ export const spec = { interpretResponse: (serverResponse) => serverResponse.body, getUserSyncs: (syncOptions, serverResponses) => { - const parameterAkEnv = utils.getParameterByName('adikteev.env'); - const configAkEnv = config.getConfig('adikteev.env'); + const parameteremoteevEnv = utils.getParameterByName('emoteev.env'); + const configemoteevEnv = config.getConfig('emoteev.env'); const syncs = []; if (syncOptions.iframeEnabled) { syncs.push({ type: 'iframe', - url: userSyncIframeUrl(parameterAkEnv, configAkEnv), + url: userSyncIframeUrl(parameteremoteevEnv, configemoteevEnv), }); } if (syncOptions.pixelEnabled && serverResponses.length > 0) { syncs.push({ type: 'image', - url: userSyncImageUrl(parameterAkEnv, configAkEnv), + url: userSyncImageUrl(parameteremoteevEnv, configemoteevEnv), }); } return syncs; diff --git a/test/spec/modules/adikteevBidAdapter_spec.js b/test/spec/modules/emoteevBidAdapter_spec.js similarity index 71% rename from test/spec/modules/adikteevBidAdapter_spec.js rename to test/spec/modules/emoteevBidAdapter_spec.js index b6ca6d3a39c..a5f5c439e6f 100644 --- a/test/spec/modules/adikteevBidAdapter_spec.js +++ b/test/spec/modules/emoteevBidAdapter_spec.js @@ -1,11 +1,11 @@ import {expect} from 'chai'; import { AK_PBJS_VERSION, - AK_BASE_URL, - AK_BASE_URL_STAGING, - akDebug, - akEnv, - akOverrides, + EMOTEEV_BASE_URL, + EMOTEEV_BASE_URL_STAGING, + emoteevDebug, + emoteevEnv, + emoteevOverrides, akUrl, conformBidRequest, DEFAULT_ENV, @@ -18,7 +18,7 @@ import { USER_SYNC_IMAGE_URL_PATH, userSyncIframeUrl, userSyncImageUrl, -} from 'modules/adikteevBidAdapter'; +} from 'modules/emoteevBidAdapter'; import {newBidder} from 'src/adapters/bidderFactory'; import {config} from 'src/config'; @@ -27,7 +27,7 @@ const cannedValidBidRequests = [{ auctionId: 'fcbf2b27-a951-496f-b5bb-1324ce7c0558', bidId: '2b8de6572e8193', bidRequestsCount: 1, - bidder: 'adikteev', + bidder: 'emoteev', bidderRequestId: '1203b39fecc6a5', crumbs: {pubcid: 'f3371d16-4e8b-42b5-a770-7e5be1fdf03d'}, params: {adSpaceId: 5084}, @@ -37,15 +37,15 @@ const cannedValidBidRequests = [{ const cannedBidderRequest = { auctionId: 'fcbf2b27-a951-496f-b5bb-1324ce7c0558', auctionStart: 1544200122837, - bidderCode: 'adikteev', + bidderCode: 'emoteev', bidderRequestId: '1203b39fecc6a5', doneCbCallCount: 0, refererInfo: { canonicalUrl: undefined, numIframes: 0, reachedTop: true, - referer: 'http://localhost:9999/integrationExamples/gpt/hello_world_adikteev.html', - stack: ['http://localhost:9999/integrationExamples/gpt/hello_world_adikteev.html'] + referer: 'http://localhost:9999/integrationExamples/gpt/hello_world_emoteev.html', + stack: ['http://localhost:9999/integrationExamples/gpt/hello_world_emoteev.html'] }, start: 1544200012839, timeout: 3000 @@ -67,7 +67,7 @@ const serverResponse = ] }; -describe('adikteevBidAdapter', function () { +describe('emoteevBidAdapter', function () { const adapter = newBidder(spec); describe('inherited functions', function () { @@ -88,86 +88,86 @@ describe('adikteevBidAdapter', function () { }) }); - describe('akDebug', function () { - expect(akDebug(null, null)).to.deep.equal(false) + describe('emoteevDebug', function () { + expect(emoteevDebug(null, null)).to.deep.equal(false) }); - describe('akDebug', function () { - expect(akDebug(null, true)).to.deep.equal(true) + describe('emoteevDebug', function () { + expect(emoteevDebug(null, true)).to.deep.equal(true) }); - describe('akDebug', function () { - expect(akDebug(JSON.stringify(true), null)).to.deep.equal(true) + describe('emoteevDebug', function () { + expect(emoteevDebug(JSON.stringify(true), null)).to.deep.equal(true) }); - describe('akEnv', function () { - expect(akEnv(null, null)).to.deep.equal(DEFAULT_ENV) + describe('emoteevEnv', function () { + expect(emoteevEnv(null, null)).to.deep.equal(DEFAULT_ENV) }); - describe('akEnv', function () { - expect(akEnv(null, STAGING)).to.deep.equal(STAGING) + describe('emoteevEnv', function () { + expect(emoteevEnv(null, STAGING)).to.deep.equal(STAGING) }); - describe('akEnv', function () { - expect(akEnv(STAGING, null)).to.deep.equal(STAGING) + describe('emoteevEnv', function () { + expect(emoteevEnv(STAGING, null)).to.deep.equal(STAGING) }); - describe('akOverrides', function () { - expect(akOverrides(null, null)).to.deep.equal({}) + describe('emoteevOverrides', function () { + expect(emoteevOverrides(null, null)).to.deep.equal({}) }); - describe('akOverrides', function () { - expect(akOverrides(JSON.stringify({a: 1}), null)).to.deep.equal({a: 1}) + describe('emoteevOverrides', function () { + expect(emoteevOverrides(JSON.stringify({a: 1}), null)).to.deep.equal({a: 1}) }); - describe('akOverrides', function () { - expect(akOverrides('incorrect', null)).to.deep.equal({}) + describe('emoteevOverrides', function () { + expect(emoteevOverrides('incorrect', null)).to.deep.equal({}) }); // expect no exception - describe('akOverrides', function () { - expect(akOverrides(null, {a: 1})).to.deep.equal({a: 1}) + describe('emoteevOverrides', function () { + expect(emoteevOverrides(null, {a: 1})).to.deep.equal({a: 1}) }); describe('akUrl', function () { - expect(akUrl(null)).to.deep.equal(AK_BASE_URL) + expect(akUrl(null)).to.deep.equal(EMOTEEV_BASE_URL) }); describe('akUrl', function () { - expect(akUrl('anything')).to.deep.equal(AK_BASE_URL) + expect(akUrl('anything')).to.deep.equal(EMOTEEV_BASE_URL) }); describe('akUrl', function () { - expect(akUrl(STAGING)).to.deep.equal(AK_BASE_URL_STAGING) + expect(akUrl(STAGING)).to.deep.equal(EMOTEEV_BASE_URL_STAGING) }); describe('akUrl', function () { - expect(akUrl('production')).to.deep.equal(AK_BASE_URL) + expect(akUrl('production')).to.deep.equal(EMOTEEV_BASE_URL) }); describe('endpointUrl', function () { - expect(endpointUrl(null, null)).to.deep.equal(AK_BASE_URL.concat(ENDPOINT_PATH)) + expect(endpointUrl(null, null)).to.deep.equal(EMOTEEV_BASE_URL.concat(ENDPOINT_PATH)) }); describe('endpointUrl', function () { - expect(endpointUrl(null, STAGING)).to.deep.equal(AK_BASE_URL_STAGING.concat(ENDPOINT_PATH)) + expect(endpointUrl(null, STAGING)).to.deep.equal(EMOTEEV_BASE_URL_STAGING.concat(ENDPOINT_PATH)) }); describe('endpointUrl', function () { - expect(endpointUrl(STAGING, null)).to.deep.equal(AK_BASE_URL_STAGING.concat(ENDPOINT_PATH)) + expect(endpointUrl(STAGING, null)).to.deep.equal(EMOTEEV_BASE_URL_STAGING.concat(ENDPOINT_PATH)) }); describe('userSyncIframeUrl', function () { - expect(userSyncIframeUrl(null, null)).to.deep.equal(AK_BASE_URL.concat(USER_SYNC_IFRAME_URL_PATH)) + expect(userSyncIframeUrl(null, null)).to.deep.equal(EMOTEEV_BASE_URL.concat(USER_SYNC_IFRAME_URL_PATH)) }); describe('userSyncIframeUrl', function () { - expect(userSyncIframeUrl(null, STAGING)).to.deep.equal(AK_BASE_URL_STAGING.concat(USER_SYNC_IFRAME_URL_PATH)) + expect(userSyncIframeUrl(null, STAGING)).to.deep.equal(EMOTEEV_BASE_URL_STAGING.concat(USER_SYNC_IFRAME_URL_PATH)) }); describe('userSyncIframeUrl', function () { - expect(userSyncIframeUrl(STAGING, null)).to.deep.equal(AK_BASE_URL_STAGING.concat(USER_SYNC_IFRAME_URL_PATH)) + expect(userSyncIframeUrl(STAGING, null)).to.deep.equal(EMOTEEV_BASE_URL_STAGING.concat(USER_SYNC_IFRAME_URL_PATH)) }); describe('userSyncImageUrl', function () { - expect(userSyncImageUrl(null, null)).to.deep.equal(AK_BASE_URL.concat(USER_SYNC_IMAGE_URL_PATH)) + expect(userSyncImageUrl(null, null)).to.deep.equal(EMOTEEV_BASE_URL.concat(USER_SYNC_IMAGE_URL_PATH)) }); describe('userSyncImageUrl', function () { - expect(userSyncImageUrl(null, STAGING)).to.deep.equal(AK_BASE_URL_STAGING.concat(USER_SYNC_IMAGE_URL_PATH)) + expect(userSyncImageUrl(null, STAGING)).to.deep.equal(EMOTEEV_BASE_URL_STAGING.concat(USER_SYNC_IMAGE_URL_PATH)) }); describe('userSyncImageUrl', function () { - expect(userSyncImageUrl(STAGING, null)).to.deep.equal(AK_BASE_URL_STAGING.concat(USER_SYNC_IMAGE_URL_PATH)) + expect(userSyncImageUrl(STAGING, null)).to.deep.equal(EMOTEEV_BASE_URL_STAGING.concat(USER_SYNC_IMAGE_URL_PATH)) }); describe('isBidRequestValid', function () { it('should return true when required params found', function () { const validBid = { - bidder: 'adikteev', + bidder: 'emoteev', params: { adSpaceId: 12345, }, @@ -193,7 +193,7 @@ describe('adikteevBidAdapter', function () { }, })).to.equal(false); expect(spec.isBidRequestValid({ - bidder: 'adikteev', + bidder: 'emoteev', params: { adSpaceId: '', // invalid adSpaceId }, @@ -204,7 +204,7 @@ describe('adikteevBidAdapter', function () { }, })).to.equal(false); expect(spec.isBidRequestValid({ - bidder: 'adikteev', + bidder: 'emoteev', params: { adSpaceId: 12345, }, @@ -220,21 +220,21 @@ describe('adikteevBidAdapter', function () { describe('buildRequests', function () { const currency = 'EUR', - akEnv = STAGING, - akDebug = true, - akOverrides = { + emoteevEnv = STAGING, + emoteevDebug = true, + emoteevOverrides = { iAmOverride: 'iAmOverride' }; config.setConfig({ // asynchronous currency, - adikteev: { + emoteev: { env: STAGING, - debug: akDebug, - overrides: akOverrides + debug: emoteevDebug, + overrides: emoteevOverrides } }); - config.getConfig('adikteev', function () { + config.getConfig('emoteev', function () { const request = spec.buildRequests(cannedValidBidRequests, cannedBidderRequest); it('creates a request object with correct method, url and data', function () { @@ -244,7 +244,7 @@ describe('adikteevBidAdapter', function () { 'data', ); expect(request.method).to.equal('POST'); - expect(request.url).to.equal(endpointUrl(akEnv, akEnv)); + expect(request.url).to.equal(endpointUrl(emoteevEnv, emoteevEnv)); let requestData = JSON.parse(request.data); expect(requestData).to.exist.and.have.all.keys( @@ -274,7 +274,7 @@ describe('adikteevBidAdapter', function () { expect(requestData.bidRequests[0].bidId).to.deep.equal(cannedValidBidRequests[0].bidId); expect(requestData.bidRequests[0].bidderRequestId).to.deep.equal(cannedValidBidRequests[0].bidderRequestId); expect(requestData.currency).to.deep.equal(currency); - expect(requestData.debug).to.deep.equal(akDebug); + expect(requestData.debug).to.deep.equal(emoteevDebug); expect(requestData.iAmOverride).to.deep.equal('iAmOverride'); expect(requestData.language).to.deep.equal(navigator.language); expect(requestData.deviceInfo).to.exist.and.have.all.keys( @@ -320,19 +320,19 @@ describe('adikteevBidAdapter', function () { }); describe('getUserSyncs', function () { - config.setConfig({akEnv: PRODUCTION}); + config.setConfig({emoteevEnv: PRODUCTION}); expect(spec.getUserSyncs({ iframeEnabled: true }, [{}])).to.deep.equal([{ type: 'iframe', - url: AK_BASE_URL.concat(USER_SYNC_IFRAME_URL_PATH) + url: EMOTEEV_BASE_URL.concat(USER_SYNC_IFRAME_URL_PATH) }]); expect(spec.getUserSyncs({ pixelEnabled: true }, [{}])).to.deep.equal([{ type: 'image', - url: AK_BASE_URL.concat(USER_SYNC_IMAGE_URL_PATH) + url: EMOTEEV_BASE_URL.concat(USER_SYNC_IMAGE_URL_PATH) }]); expect(spec.getUserSyncs({ @@ -340,10 +340,10 @@ describe('adikteevBidAdapter', function () { pixelEnabled: true }, [{}])).to.deep.equal([{ type: 'iframe', - url: AK_BASE_URL.concat(USER_SYNC_IFRAME_URL_PATH) + url: EMOTEEV_BASE_URL.concat(USER_SYNC_IFRAME_URL_PATH) }, { type: 'image', - url: AK_BASE_URL.concat(USER_SYNC_IMAGE_URL_PATH) + url: EMOTEEV_BASE_URL.concat(USER_SYNC_IMAGE_URL_PATH) }]); }); });