0.5.1: fix askChoice config & make easier to override

nafg · Aug 3, 2018 · e2eea81 · e2eea81
1 parent 0792559
commit e2eea81
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/core/src/main/scala/simpleivr/IvrChoices.scala b/core/src/main/scala/simpleivr/IvrChoices.scala
@@ -77,22 +77,25 @@ class IvrChoices(sayables: Sayables) extends Ivr(sayables) {
     case object LabelLast extends SayChoice((key, label) => `Press` & dtmfWord(key) & label)
   }
 
+  protected def defaultAskChoicePauseMs: Int = 750
+  protected def defaultAskChoiceSayChoice: SayChoice = SayChoice.LabelLast
+
   def askChoice[A](choiceMenu: ChoiceMenu[A],
-                   pause: Int = 750,
-                   sayChoice: SayChoice = SayChoice.LabelLast): IvrStep[A] = {
+                   pauseMs: Int = defaultAskChoicePauseMs,
+                   sayChoice: SayChoice = defaultAskChoiceSayChoice): IvrStep[A] = {
     val menu = assignNums(choiceMenu.choices.toList)
     val menuMsgs = menu.collect {
-      case Choice(Some(key), label, _) => Pause(pause) & `Press` & dtmfWord(key) & label
+      case Choice(Some(key), label, _) => Pause(pauseMs) & sayChoice.func(key, label)
     }
     if (menuMsgs.length < menu.length)
       Console.err.println(s"ERROR: Not all menu choices have keys in ${choiceMenu.title}: $menu")
 
     def loop: IvrStep[A] = sayAndGetDigit(choiceMenu.title & Sayable.Seq(menuMsgs)) flatMap {
-      case None    => IvrStep.say(`Please make a selection` & Pause(pause)) *> loop
+      case None    => IvrStep.say(`Please make a selection` & Pause(pauseMs)) *> loop
       case Some(c) =>
         menu.find(_.key.contains(c)) match {
           case Some(choice) => IvrStep(choice.value)
-          case None         => IvrStep.say(`That is not one of the choices.` & Pause(pause)) *> loop
+          case None         => IvrStep.say(`That is not one of the choices.` & Pause(pauseMs)) *> loop
         }
     }
 

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