FAT-299 setting expandable manifest working

lib/adType.js

@@ -0,0 +1,7 @@
+const STANDARD = 'standard'
+const EXPANDABLE = 'expandable'
+
+module.exports = {
+	STANDARD,
+	EXPANDABLE
+}

lib/manifest.js

@@ -1,5 +1,6 @@
 const fs = require('fs-extra')
 const RegEx = require('./regex')
+const AdType = require('./adType')
 const debug = require('@ff0000-ad-tech/debug')
 let log = debug('cs-plugin-vendor-ft:manifest')
 
@@ -70,7 +71,6 @@ function parseFtDataImageMap(json, size) {
 
 function transform(dataRaw, buildData) {
 	// remove comments, TF.manifest(
-
 	// UPDATE to use dotAll [\s\S]
 	let toStringJSON = dataRaw.replace(/\/\/.+/g, '').replace(/FT\.manifest\(/g, '')
 
@@ -82,7 +82,6 @@ function transform(dataRaw, buildData) {
 	let manifestJSON = JSON.parse(toStringJSON)
 	log(manifestJSON)
 
-	// ----------------------------------------
 	// update base properties
 	manifestJSON['width'] = buildData['dimensions'][0]
 	manifestJSON['height'] = buildData['dimensions'][1]
@@ -101,13 +100,23 @@ function transform(dataRaw, buildData) {
 	})
 
 	// if expandable, create a manifest node for the expanded params
-	if (buildData['adType'] == 'expandabale') {
+	if (buildData['adType'] == AdType.EXPANDABLE) {
 		manifestJSON['expand'] = {
-			width: buildData['dimensions'][0],
-			height: buildData['dimensions'][1],
+			width: buildData['dimensionsExpand'][0],
+			height: buildData['dimensionsExpand'][1],
 			indentAcross: 0,
 			indentDown: 0
 		}
+
+		// add expandable to richload/instantAds
+		manifestJSON['richLoads'].push({
+			name: 'richloadExpand',
+			src: buildData.directories.name['expanded']
+		})
+		manifestJSON['instantAds'].push({
+			name: 'richloadExpand',
+			type: 'richLoad'
+		})
 	}
 
 	// apply the FtData

lib/packager.js

@@ -5,9 +5,12 @@ const JSZIP = require('jszip')
 const Utils = require('./utils')
 const Manifest = require('./manifest')
 const RegEx = require('./regex')
+const AdType = require('./adType')
 const debug = require('@ff0000-ad-tech/debug')
 let log = debug('cs-plugin-vendor-ft:packager')
 
+let storedCollapsedName = null
+
 function createVendorPackage(profile, context, folders, targets) {
 	log('createVendorPackage()')
 	return new Promise((resolve, reject) => {
@@ -67,12 +70,13 @@ function createVendorPackage(profile, context, folders, targets) {
 				}
 
 				// get the ad type; then is expandable, set flag to skip the partner
-				buildData['buildType'] = buildData['adType'] = 'standard'
+				buildData['buildType'] = buildData['adType'] = AdType.STANDARD
 				const isCollapsed = folderName.match(/collapsed/g)
 				const isExpanded = folderName.match(/expanded/g)
 				if (isCollapsed || isExpanded) {
 					buildData['buildType'] = isCollapsed ? 'collapsed' : 'expanded'
-					buildData['adType'] = 'expandable'
+					buildData['adType'] = AdType.EXPANDABLE
+					buildData['dimensionsExpand'] = folderNameExtracted.split('_')[1].split('x')
 				}
 
 				// REVIEW
@@ -86,10 +90,17 @@ function createVendorPackage(profile, context, folders, targets) {
 				masterPromises.push(copyRichLoad(filePath, buildData))
 
 				if (isCollapsed) {
-					// don't make the first time
+					// store the collapsed name
+					storedCollapsedName = buildData.directories.name.rich
 					log(buildData)
+					// don't make the first time
 					return
 				}
+				if (isExpanded) {
+					buildData.directories.name['expanded'] = buildData.directories.name['rich']
+					buildData.directories.name['rich'] = storedCollapsedName
+					storedCollapsedName = null
+				}
 
 				// BASE
 				buildData.directories.review['base'] = buildData.directories.review['size'] + 'baseLoad/' + buildData.directories.name.base + '/'
@@ -99,7 +110,9 @@ function createVendorPackage(profile, context, folders, targets) {
 				let basePromises = [
 					// index
 					new Promise((resolve, reject) => {
-						fs.readFile(path.join(__dirname, '../src') + '/ft_base_standard.html', 'utf8', (err, data) => {
+						const indexName = buildData['adType'] == AdType.EXPANDABLE ? 'ft_base_expandable' : 'ft_base_standard'
+						const indexPath = path.join(__dirname, '../src') + '/' + indexName + '.html'
+						fs.readFile(indexPath, 'utf8', (err, data) => {
 							// modify the index now:
 							data = data.replace(RegEx.cssRichLoadBase, val => {
 								return val
@@ -155,12 +168,12 @@ function createVendorPackage(profile, context, folders, targets) {
 }
 
 function copyRichLoad(filePath, buildData) {
-	buildData.directories.review.rich[buildData['buildType']] =
-		buildData.directories.review.rich['root'] + buildData.directories.name.rich + '/'
-	fs.emptyDirSync(buildData.directories.review.rich[buildData['buildType']])
+	const type = buildData['buildType']
+	buildData.directories.review.rich[type] = buildData.directories.review.rich['root'] + buildData.directories.name.rich + '/'
+	fs.emptyDirSync(buildData.directories.review.rich[type])
 	let zipRich = new JSZIP()
 	// copy the entire directory
-	return Utils.copyDirectory(filePath, buildData.directories.review.rich[buildData['buildType']], './', zipRich).then(() => {
+	return Utils.copyDirectory(filePath, buildData.directories.review.rich[type], './', zipRich).then(() => {
 		// return the promise of the zip save
 		return Utils.save(zipRich, buildData.directories.upload['rich'], buildData.directories.name['rich'])
 	})

src/ft_base_expandable.html

@@ -12,17 +12,17 @@
         }
 
         #richload-base {
-            width: 970px;
-            height: 33px;
+            width: 0px;
+            height: 0px;
             position: absolute;
             left: 0;
             top: 0;
         }
 
         #richload-expand {
             display: none;
-            height: 250px;
-            width: 970px;
+            height: 0px;
+            width: 0px;
         }
     </style>
 </head>

src/ft_base_standard.html

@@ -12,8 +12,8 @@
         }
 
         #richload-base {
-            width: 300px;
-            height: 600px;
+            width: 0px;
+            height: 0px;
             position: absolute;
             left: 0;
             top: 0;