0.5.2.1: Some DTMF-related bugfixes

- Ivr#sayAndHandleDigits: use DMTF.`#` not '#' - Sayables#digitWords: sanitization
nafg · Aug 14, 2018 · 7ac4649 · 7ac4649
1 parent d37a0c7
commit 7ac4649
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/core/src/main/scala/simpleivr/Ivr.scala b/core/src/main/scala/simpleivr/Ivr.scala
@@ -62,7 +62,7 @@ class Ivr(sayables: Sayables) {
       case (acc, x)                                            =>
         def sayDigitOrDigits(n: Int) = numberWords(n) & (if (n == 1) `digit` else `digits`)
 
-        val str = acc + x.filter(_ != '#').mkString
+        val str = acc + x.filter(_ != DTMF.`#`).mkString
         val validated =
           if ((min == max) && (str.length != min)) Left(`You must enter ` & sayDigitOrDigits(min))
           else if (str.length < min) Left(`You must enter at least` & sayDigitOrDigits(min))

diff --git a/core/src/main/scala/simpleivr/Sayables.scala b/core/src/main/scala/simpleivr/Sayables.scala
@@ -101,7 +101,13 @@ abstract class Sayables(val audioFileBackend: AudioFileBackend) extends Speaks {
     }
   }
 
-  def digitWords(s: String): Sayable = Sayable.Many(s.toSeq.map(c => numberWords(c - '0')))
+  def digitWords(digitString: String): Sayable =
+    Sayable.Many(
+      digitString
+        .map(_ - '0')
+        .filter(d => d >= 0 && d <= 9)
+        .map(numberWords)
+    )
 
   def dtmfWord(c: DTMF): Sayable = c match {
     case DTMF.`#` => `pound`

diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-ThisBuild / version := "0.5.2"
+ThisBuild / version := "0.5.2.1"