Omit empty tracking URLs

src/factory/impression.js

@@ -2,11 +2,7 @@ import {Impression} from 'iab-vast-model'
 
 export default ($impression) => {
   const impression = new Impression()
-  if ($impression._value) {
-    impression.id = $impression.id
-    impression.uri = $impression._value
-  } else {
-    impression.uri = $impression
-  }
+  impression.id = $impression.id
+  impression.uri = $impression._value
   return impression
 }

src/factory/linear.js

@@ -5,6 +5,7 @@ import createClick from './click'
 import createTimeOffset from './time-offset'
 import inheritCreative from '../inherit/creative'
 import mapTrackingEvents from '../util/map-tracking-events'
+import isNonEmptyString from '../util/is-non-empty-string'
 
 const mapVideoClicks = ($videoClicks, videoClicks) => {
   if ($videoClicks.clickThrough) {
@@ -22,7 +23,7 @@ export default ($creative) => {
   const $linear = $creative.linear
   const linear = new Linear()
   inheritCreative($creative, linear)
-  if (typeof $linear.skipoffset === 'string' && $linear.skipoffset.length > 0) {
+  if (isNonEmptyString($linear.skipoffset)) {
     linear.skipoffset = createTimeOffset($linear.skipoffset)
   }
   if ($linear.adParameters) {

src/inherit/ad.js

@@ -2,27 +2,32 @@ import {AdSystem} from 'iab-vast-model'
 import createCreative from '../factory/creative'
 import createExtension from '../factory/extension'
 import createImpression from '../factory/impression'
+import isNonEmptyString from '../util/is-non-empty-string'
+
+const hasValue = ($node) => ($node != null && isNonEmptyString($node._value))
 
 export default ($ad, $impl, ad) => {
   ad.id = $ad.id
   ad.sequence = $ad.sequence
-  if ($impl.adSystem) {
+  if ($impl.adSystem != null) {
     ad.adSystem = new AdSystem()
     ad.adSystem.name = $impl.adSystem._value
     ad.adSystem.version = $impl.adSystem.version
   }
-  if ($impl.impression) {
-    ad.impressions.push(...$impl.impression.map(createImpression))
+  if ($impl.impression != null) {
+    ad.impressions.push(...$impl.impression
+      .filter(hasValue)
+      .map(createImpression))
   }
-  if ($impl.error) {
+  if ($impl.error != null && hasValue($impl.error)) {
     ad.error = $impl.error._value
   }
-  if ($impl.creatives && $impl.creatives.creative) {
+  if ($impl.creatives != null && Array.isArray($impl.creatives.creative)) {
     $impl.creatives.creative.map(createCreative).forEach((creative) => {
       ad.creatives.add(creative)
     })
   }
-  if ($impl.extensions && $impl.extensions.extension) {
+  if ($impl.extensions != null && Array.isArray($impl.extensions.extension)) {
     ad.extensions.push(...$impl.extensions.extension.map(createExtension))
   }
   return ad

src/util/is-non-empty-string.js

@@ -0,0 +1 @@
+ export default (str) => (typeof str === 'string' && str.length > 0)

src/util/map-tracking-events.js

@@ -1,16 +1,20 @@
 import {TrackingEvent} from 'iab-vast-model'
 import createTimeOffset from '../factory/time-offset'
+import isNonEmptyString from './is-non-empty-string'
 
 export default ($trackingEvents, trackingEvents) => {
-  if ($trackingEvents != null && Array.isArray($trackingEvents.tracking)) {
-    for (const $tracking of $trackingEvents.tracking) {
-      const conf = new TrackingEvent()
-      conf.uri = $tracking._value
-      if ($tracking.event === 'progress' &&
-          typeof $tracking.offset === 'string' && $tracking.offset.length > 0) {
-        conf.offset = createTimeOffset($tracking.offset)
-      }
-      trackingEvents.add($tracking.event, conf)
+  if ($trackingEvents == null || !Array.isArray($trackingEvents.tracking)) {
+    return
+  }
+  for (const $tracking of $trackingEvents.tracking) {
+    if (!isNonEmptyString($tracking._value)) {
+      continue
+    }
+    const conf = new TrackingEvent()
+    conf.uri = $tracking._value
+    if ($tracking.event === 'progress' && isNonEmptyString($tracking.offset)) {
+      conf.offset = createTimeOffset($tracking.offset)
     }
+    trackingEvents.add($tracking.event, conf)
   }
 }

test/integration/expected/unruly/inline/test_vast_inline_123.json

@@ -53,11 +53,6 @@
         ],
         "id": "1",
         "impressions": [
-          {
-            "_type": "Impression",
-            "uri": {
-            }
-          }
         ],
         "sequence": 1
       }

test/integration/expected/unruly/inline/test_vast_inline_with-linear-ad.json

@@ -94,11 +94,6 @@
         ],
         "id": "1",
         "impressions": [
-          {
-            "_type": "Impression",
-            "uri": {
-            }
-          }
         ],
         "sequence": 1
       }

test/integration/expected/unruly/inline/test_vast_inline_with-linear-and-non-linear-ads.json

@@ -97,11 +97,6 @@
         ],
         "id": "1",
         "impressions": [
-          {
-            "_type": "Impression",
-            "uri": {
-            }
-          }
         ],
         "sequence": 1
       }

test/integration/expected/unruly/inline/test_vast_inline_with-long-video.json

@@ -83,11 +83,6 @@
         ],
         "id": "1",
         "impressions": [
-          {
-            "_type": "Impression",
-            "uri": {
-            }
-          }
         ],
         "sequence": 1
       }

test/integration/expected/unruly/inline/test_vast_inline_with-multiple-extensions.json

@@ -87,11 +87,6 @@
         ],
         "id": "1",
         "impressions": [
-          {
-            "_type": "Impression",
-            "uri": {
-            }
-          }
         ],
         "sequence": 1
       }