Merge pull request #15 from mcclatchy/config-cadence

Moving the story cadence into the config layer.

Author: pilgreen

config/story.json

@@ -1,6 +1,11 @@
 {
   "base": ".story-body [id^=zone-el]",
   "ignore": ["zone-el-16"],
+  "cadence": {
+    "subscriber": 4,
+    "dma": 3,
+    "standard": 2
+  },
   "zones": [
     {
       "id": "zone-taboola-recommendations",

demo/locker.js

@@ -42,15 +42,15 @@ const locker = {
   // user info
   user: {
     isSubscriber() {
-      return false;
+      return true;
     },
 
     isLoggedIn() {
       return false;
     },
 
     isInDMA() {
-      return Promise.resolve(true);
+      return Promise.resolve(false);
     }
   },
 

index.js

@@ -10,11 +10,11 @@ function distributeZones(locker) {
   // Setup
   zones.setLocker(locker);
 
-  // Configs 
+  // Config files 
   if(!locker.config) {
     locker.config = {
       homepage: "/static/hi/zones/homepage.json",
-      section: "/static/hi/zones/section.json",
+      sectfront: "/static/hi/zones/section.json",
       story: "/static/hi/zones/story.json"
     }
   }
@@ -25,33 +25,22 @@ function distributeZones(locker) {
   // Give the performance team a promise
   return new Promise((resolve, reject) => {
     locker.executeWhenDOMReady(async () => {
-      switch(locker.pageType) {
-        case "story":
-          await config.load(locker.config.story);
-
-          // Set cadence for subscriber vs. nonsubscriber vs. nonsubscriber out of market in test domains
-          const subscriber = locker.user.isSubscriber();
-          const dma = subscriber ? true : await locker.user.isInDMA();
-          const nonsubscriberOutOfMarket = !subscriber && !dma;
-          const domainName = locker.getConfig('domainName');
-          const allowedDomains = ["www.bnd.com", "www.myrtlebeachonline.com"];
-          const cadence = allowedDomains.includes(domainName) && nonsubscriberOutOfMarket ? 2 : (subscriber ? 4 : 3);
-
-          zones.distribute(cadence);
-
-          // Temporary cleanup
-          story.cleanup();
-          break;
-        case "homepage":
-          await config.load(locker.config.homepage);
-          break;
-        case "sectfront":
-          await config.load(locker.config.section);
-          break;
-        default:
-          reject("not a matching page type");
+      // Config keys match pageType coming from Yozons
+      const file = locker.config[locker.pageType];
+
+      // Load config file
+      if(file) {
+        await config.load(file);
+      } else {
+        reject("not a matching page type");
       }
 
+      // Temporary cleanup
+      if(locker.pageType == "story") {
+        story.cleanup();
+      }
+
+      // Render and resolve
       zones.render();
       resolve("zones-loaded")
     });

lib/config.js

@@ -2,7 +2,7 @@
  * JSON configuration support
  */
 
-import { locker, Zone, ignore } from "./zones.js";
+import { locker, Zone, ignore, distribute } from "./zones.js";
 
 /**
  * Loads a configuration file
@@ -14,6 +14,7 @@ export function load(url) {
   return new Promise(async (resolve, reject) => {
     const res = await fetch(url);
     const data = await res.json();
+    const template = locker.pageType;
     const subscriber = locker.user.isSubscriber();
     const dma = subscriber ? true : await locker.user.isInDMA();
 
@@ -135,6 +136,24 @@ export function load(url) {
       }
     });
 
+    // Story page cadence distribution
+    if(locker.pageType == "story") {
+      let cadence;
+
+      switch(true) {
+        case subscriber:
+          cadence = data.cadence.subscriber;
+          break;
+        case dma:
+          cadence = data.cadence.dma;
+          break
+        default:
+          cadence = data.cadence.standard;
+      }
+
+      distribute(cadence);
+    }
+
     resolve();
   });
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mcclatchy/zones",
-  "version": "1.6.1",
+  "version": "1.7.0",
   "description": "A Yozons extension to dynamically distribute or re-distribute zones on the websites.",
   "main": "index.js",
   "directories": {