Merge pull request #52 from eliotw/master

Keyword triggers for fl oz instead of oz conversions

Author: cannawen

src/conversion_helper.js

@@ -78,6 +78,7 @@ const metricDistanceUnits = [/km/, /light-?years?/,
 const metricWeightUnits = [/kgs?/, /grams?/, /kilograms?/];
 const metricVolumeUnits = [/(?:milli|centi|deca|kilo)?lit(?:er|re)s?/, /(?:deca|kilo)?m(?:eters?)?(?:\^3| cubed?)/];
 const metricForceUnits = [/newtons?/, /dynes?/];
+const liquidKeywords = ['liquid', 'water', 'tea', 'beer', 'soda', 'cider', 'juice', 'coffee', 'liquor', 'milk', 'bottle', 'spirits', 'rum', 'vodka', 'tequila', 'wine', 'oil'];
 
 const ukSubreddits = ["britain", "british", "england", "english", "scotland", "scottish", "wales", "welsh", "ireland", "irish", "london", "uk"];
 
@@ -322,7 +323,27 @@ const unitLookupList = [
     "isWeaklyInvalidInput" : isHyperbole,
     "conversionFunction" : (i) => volumeMap(i * 0.0295735295625),
     "ignoredUnits" : metricVolumeUnits,
-    "ignoredKeywords" : ukSubreddits
+    "ignoredKeywords" : ukSubreddits,
+    "preprocess" : (comment) => {
+      const input = comment['body'];
+      const ozRegex = new RegExp(( rh.startRegex 
+          + rh.numberRegex
+          + "[- ]?"
+          + rh.regexJoinToString([/oz/, /ounces?/])
+        ),'gi');
+      const ozAndLiquidRegex = new RegExp(( ozRegex.source
+          + ".+?\\b"
+          + rh.regexJoinToString(liquidKeywords)
+        ),'i');
+
+      if (!ozAndLiquidRegex.test(input)) {
+        return input;
+      }
+
+      return input.replace(ozRegex, (oz, offset, string) => {
+        return " " + oz + " fl. oz";
+      });
+    }
   },
   {
     "imperialUnits" : [/oz/, /ounces?/],

test/converter-test.js

@@ -58,11 +58,13 @@ describe('Converter', () => {
         testConvert(
           [
             "10 fl oz",
-            "1001 oz. liquid"
+            "1001 oz. liquid",
+            "20 oz of water"
           ],
           {
             "10 fl. oz." : "300 mL",
-            "1,001 fl. oz." : "30 L"
+            "1,001 fl. oz." : "30 L",
+            "20 fl. oz." : "600 mL",
           }
         );
       });