Refactor and extract useful parts for the new handler

handlers/store-favorite-line.js

@@ -0,0 +1,14 @@
+const fetchMTAStatus = require('../services/fetch-mta-status.js');
+const closestLineMatcher = require('../utilities/closest-line-matcher.js');
+
+module.exports = function() {
+  let heardNameGroup = this.event.request.intent.slots.subwayLineOrGroup.value;
+
+  if(!nameGroup) { this.emit(':tell', "Sorry, I didn't hear a subway line or group I recognized") };
+
+  fetchMTAStatus(statuses => {
+    let closestLine = closestLineMatcher(statuses, 'nameGroup', heardNameGroup);
+
+    this.emit('tell', `Your favorite line is ${closestLine.nameGroup}`);
+  });
+}

index.js

@@ -5,27 +5,21 @@ const uuidv4 = require("uuid/v4");
 
 var env = process.env.NODE_ENV || 'development';
 const logRequests = process.env.LOG_REQUESTS === 'true';
+const applicationId = process.env.APPLICATION_ID;
 
 if(env !== 'production') {
   require('dotenv').load({ path: '.env.' + env });
 }
 
-var applicationId = process.env.APPLICATION_ID;
-var mtaStatusURL = process.env.MTA_STATUS_URL;
+const _ = require('lodash');
+const Alexa = require('alexa-sdk');
 
-var _ = require('lodash');
-var levenshtein = require('fast-levenshtein');
-var Alexa = require('alexa-sdk');
-var currentMTAStatus = require('./current-mta-status.js');
-var statusToSpeech = require('./status-to-speech.js');
+const statusToSpeech = require('./services/status-to-speech.js');
+const fetchMTAStatus = require('./services/fetch-mta-status.js');
+const closestLineMatcher = require('./utilities/closest-line-matcher.js');
 
-var fetchStatus = function(callback) {
-  return fetch(mtaStatusURL).then(function(response) {
-    return response.text()
-  }).then(function(body) {
-    currentMTAStatus(body, callback);
-  });
-};
+// Handlers
+const storeFavoriteLineHandler = require('./handlers/store-favorite-line.js');
 
 const affectedServiceStatusesBuilder = (statuses) => {
   let withServiceIssues = status => status.status !== 'GOOD SERVICE';
@@ -40,7 +34,7 @@ const affectedServiceStatusesBuilder = (statuses) => {
 };
 
 var fullStatusUpdateHandler = function() {
-  fetchStatus(statuses => {
+  fetchMTAStatus(statuses => {
     let affectedServiceStatuses = affectedServiceStatusesBuilder(statuses);
 
     if(affectedServiceStatuses.length === 0) {
@@ -56,22 +50,13 @@ var handlers = {
   statusOfLine: function () {
     var self = this;
     var nameGroup = self.event.request.intent.slots.subwayLineOrGroup.value;
-    var closestStatus = null;
     var badQueryResponse = function() {
       self.emit(':tell', "Sorry, I didn't hear a subway line I understand");
     }
 
     if(nameGroup) {
-      fetchStatus(function(statuses) {
-        if(nameGroup.length > 1) {
-          closestStatus = _.minBy(statuses, function(status) {
-            return levenshtein.get(status.nameGroup, nameGroup.toUpperCase());
-          });
-        } else {
-          closestStatus = _.find(statuses, function(status) {
-            return status.nameGroup.search(nameGroup.toUpperCase()) !== -1;
-          });
-        }
+      fetchMTAStatus(function(statuses) {
+        let closestStatus = closestLineMatcher(statuses, 'nameGroup', nameGroup);
 
         if(closestStatus) {
           if(closestStatus.description) {
@@ -90,11 +75,12 @@ var handlers = {
   },
 
   fullStatusUpdate: fullStatusUpdateHandler,
-  Unhandled: fullStatusUpdateHandler
+  storeFavoriteLine: storeFavoriteLineHandler,
+  Unhandled: fullStatusUpdateHandler,
 };
 
 exports.flashBriefingHandler = (event, context, callback) => {
-  fetchStatus(statuses => {
+  fetchMTAStatus(statuses => {
     let affectedServiceStatuses = affectedServiceStatusesBuilder(statuses);
     let message;
 

current-mta-status.js → parsers/current-mta-status.js

@@ -1,5 +1,5 @@
-var parseXML = require('xml2js').parseString;
-var serviceDetailsCleaner = require('./service-details-cleaner');
+const parseXML = require('xml2js').parseString;
+const serviceDetailsCleaner = require('./service-details-cleaner');
 
 module.exports = function(mtaStatusXML, callback) {
   parseXML(mtaStatusXML, { normalize: true, trim: true }, function(error, results) {

parsers/service-details-cleaner.js

@@ -0,0 +1,12 @@
+const sanitize = require('sanitize-html');
+const MATCHERS = {
+  br: /<br\/?>\s*/g
+}
+
+module.exports = function(detailsText) {
+  let text = detailsText.replace(MATCHERS.br, '\n'); // BRs to newline
+
+  return sanitize(text, {
+    allowedTags: []
+  });
+};

services/fetch-mta-status.js

@@ -0,0 +1,8 @@
+const MTA_STATUS_URL = process.env.MTA_STATUS_URL;
+const currentMTAStatus = require('../parsers/current-mta-status.js');
+
+module.exports = function(callback) {
+  return fetch(MTA_STATUS_URL)
+    .then(response => response.text())
+    .then(body => currentMTAStatus(body, callback));
+};

tests/service-details-cleaner-test.js

@@ -2,7 +2,7 @@ import test from 'ava';
 import fs from 'fs';
 import { parseString } from 'xml2js'
 
-import { default as serviceDetailsCleaner } from '../service-details-cleaner.js';
+import { default as serviceDetailsCleaner } from '../parsers/service-details-cleaner.js';
 
 test('removes all linebreaks', t => {
   t.plan(1);

tests/status-to-speech-test.js

@@ -1,6 +1,6 @@
 import test from 'ava';
 
-import statusToSpeech  from '../status-to-speech.js';
+import statusToSpeech  from '../services/status-to-speech.js';
 
 test('Given a service status, it builds the right speech"', t => {
   t.plan(4);

utilities/closest-line-matcher.js

@@ -0,0 +1,17 @@
+const _ = require('lodash');
+const levenshtein = require('fast-levenshtein');
+
+module.exports = function(statuses, key, potentialValue) {
+  let closetStatus;
+
+  if(potentialValue.length > 1) {
+    closestStatus = _.minBy(statuses, function(status) {
+      return levenshtein.get(status[key], potentialValue.toUpperCase());
+    });
+  } else {
+    closestStatus = _.find(statuses, function(status) {
+      return status[key].search(potentialValue.toUpperCase()) !== -1;
+    });
+  }
+  return closestStatus;
+}

utterances.txt

@@ -5,3 +5,9 @@ statusOfLine what is the status of {subwayLineOrGroup}
 fullStatusUpdate for a service update
 fullStatusUpdate for a full service update
 fullStatusUpdate for an update
+storeFavoriteLine to track the {subwayLineOrGroup}
+removeFavoriteLine to forget the {subwayLineOrGroup}
+resetFavoriteLine to forget all my tracked lines
+checkFavoriteLines to check my favorite lines
+checkFavoriteLines what is the status of my favorite lines?
+checkFavoriteLines to check my commute