voicemail 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebbfc0fc6aa71ce48bbf95b132fd0592471772c5
-  data.tar.gz: 93ffac6ced909671f4eb252ccf17d4c7149e61a0
+  metadata.gz: 04851c91ceb009b391e4d88cd43136f058bfc729
+  data.tar.gz: 5c27720d3277680199ad4a5e73984669c0803e14
 SHA512:
-  metadata.gz: 91b768677cebd27b9cc10ec9cf69943e18d6d66f511f957984f25eb7efe870fa74e41c4568e8ae632135e99795c21e93b2572a4a8b027d9a7bb6b56fbf9d154c
-  data.tar.gz: 1c93c3d54fc3ff26d7e31a0dfbe3973da49bc7885f11885eed20862cdaabad92cde5f133c5dcbede1b491baedbd63393ccc70050420a51e743361810bbd51f04
+  metadata.gz: a00a3e02a77c97182063156e5d507d9208899246fadb180af9123da2e71eceb923f78239ba34387b457a7a240098591e1c90c2ae54f5d5c5ccea4a3b27880716
+  data.tar.gz: 76be7111e297639752090580c56061f465345339e6bd8657c28828021443121f12e1f06b7c770ed26cefdd69010e7891dc3e5b42c60ae9d02759c88a081ca1e4

data/.hound.yml

@@ -0,0 +1,2 @@
+LineLength:
+  Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+#develop
+  * CHANGE - Menu intros are one message, making them skippable.
+  * FEATURE - Personalized voicemail greetings can be deleted
+  * FEATURE - Add message to play after recording a voicemail is complete
+  * FEATURE - Add an option to erase all messages from a mailbox
+  * FEATURE - Put a timeout on waiting for a PIN
+  * FEATURE - Allow messages to be skipped
+  * BUG - Resolve issue where caller presses the pound key twice in succession
+
 #v1.0.0 - 2014-01-02
   * FEATURE - Optional per-mailbox override of default recording hash
   * FEATURE - Optional rerecording of voicemail messages

data/README.md

@@ -45,9 +45,19 @@ Alternatively, you can pass in a storage layer dynamically when invoking the con
   # etc.
 ```
 
-## Method Overrides
+## Customizing Voicemail
 
-If you prefer to use your own main menu instead of the [one provided](https://github.com/adhearsion/voicemail/blob/develop/lib/voicemail/call_controllers/mailbox_main_menu_controller.rb#L10-L13), you can set the class to use like so:
+The easiest way to customize the main menu is by subclassing (MailboxMainMenuController](https://github.com/adhearsion/voicemail/blob/develop/lib/voicemail/call_controllers/mailbox_main_menu_controller.rb) and replacing the `#main_menu` method with one of your own.
+
+Within `#main_menu` you have several options that can be invoked, each by simply calling the method:
+
+* listen_to_new_messages - self-explanatory
+* listen_to_saved_messages - self-explanatory
+* set_greeting - prompt to set the mailbox greeting
+* set_pin - prompt to set the mailbox PIN
+* empty_mailbox(:new or :saved or :all) - removes all (new or saved) messages from a given mailbox. Includes confirmation for safety
+
+Then tell Adhearsion to use your new voicemail menu class:
 ```ruby
 config.voicemail.main_menu_class = MyMenuController
 ```
@@ -95,8 +105,14 @@ Using I18n for the numeric method will nicely handle pluralizing message counts
 
 ## Authors
 
-* Original author: [Luca Pradovera](https://github.com/polysics)
-* Also contributed: [Justin Aiken](https://github.com/JustinAiken)
+Original author: [Luca Pradovera](https://github.com/polysics)
+
+Contributors:
+* [Luca Pradovera](https://github.com/polysics)
+* [Justin Aiken](https://github.com/JustinAiken)
+* [Ben Klang](https://github.com/bklang)
+* [Evan McGee](https://github.com/emcgee)
+* [Will Drexler](https://github.com/wdrexler)
 
 ## Links
 
@@ -114,4 +130,4 @@ Using I18n for the numeric method will nicely handle pluralizing message counts
 
 ## Copyright
 
-Copyright (c) 2012 Adhearsion Foundation Inc. MIT license (see LICENSE for details).
+Copyright (c) 2012-2014 Adhearsion Foundation Inc. MIT license (see LICENSE for details).

data/lib/voicemail.rb

@@ -6,6 +6,7 @@ require "voicemail/storage_pstore"
 require "voicemail/storage"
 require "voicemail/matcher"
 require "voicemail/localization_loader"
+require "voicemail/intro_message_creator"
 require "voicemail/call_controllers/application_controller"
 require "voicemail/call_controllers/voicemail_controller"
 require "voicemail/call_controllers/mailbox_controller"
@@ -16,6 +17,7 @@ require "voicemail/call_controllers/mailbox_play_message_intro_controller"
 require "voicemail/call_controllers/mailbox_play_message_controller"
 require "voicemail/call_controllers/mailbox_set_greeting_controller"
 require "voicemail/call_controllers/mailbox_set_pin_controller"
+require "voicemail/call_controllers/mailbox_cleaner_controller"
 
 
 require "voicemail/plugin"

data/lib/voicemail/call_controllers/mailbox_cleaner_controller.rb

@@ -0,0 +1,40 @@
+# encoding: utf-8
+
+module Voicemail 
+  class MailboxCleanerController < ApplicationController
+    def run
+      menu_prompt = metadata[:new_or_saved].to_s == "new" ? config.mailbox.clear_new_messages : config.mailbox.clear_saved_messages
+      menu menu_prompt, timeout: config.menu_timeout, tries: config.menu_tries do
+        match(1) { erase_all metadata[:new_or_saved] }
+   
+        invalid { confirm_no_action_taken }
+        timeout { confirm_no_action_taken }
+        failure { confirm_no_action_taken }
+      end
+    end
+   
+    def confirm_no_action_taken
+      play config.mailbox.no_messages_deleted
+      main_menu
+    end
+   
+    def erase_all(type)
+      method = "next_#{type}_message"
+
+      messages_count = storage.send "count_#{type}_messages", mailbox[:id]   
+
+      deleting_all_messages = metadata[:new_or_saved].to_s == "new" ? config.mailbox.deleting_all_new_messages : config.mailbox.deleting_all_saved_messages
+      play deleting_all_messages
+
+      messages_count.times do
+        message = storage.send(method, mailbox[:id])
+        storage.delete_message mailbox[:id], message[:id]
+      end
+        
+      all_messages_deleted = metadata[:new_or_saved].to_s == "new" ? config.mailbox.all_new_messages_deleted : config.mailbox.all_saved_messages_deleted
+      play all_messages_deleted
+
+      main_menu
+    end
+  end
+end

data/lib/voicemail/call_controllers/mailbox_main_menu_controller.rb

@@ -11,6 +11,8 @@ module Voicemail
         match(2) { listen_to_saved_messages }
         match(3) { set_greeting }
         match(4) { set_pin }
+        match(7) { clear_new_messages }
+        match(9) { clear_saved_messages }
 
         timeout do
           play config.mailbox.menu_timeout_message
@@ -42,5 +44,13 @@ module Voicemail
     def listen_to_saved_messages
       invoke MailboxMessagesController, mailbox: mailbox[:id], new_or_saved: :saved
     end
+
+    def clear_new_messages
+      invoke MailboxCleanerController, mailbox: mailbox[:id], new_or_saved: :new
+    end
+
+    def clear_saved_messages
+      invoke MailboxCleanerController, mailbox: mailbox[:id], new_or_saved: :saved
+    end
   end
 end

data/lib/voicemail/call_controllers/mailbox_play_message_controller.rb

@@ -5,18 +5,16 @@ module Voicemail
 
     def initialize(call, metadata={})
       @new_or_saved = metadata[:new_or_saved] || :new
-
       super call, metadata
     end
 
     def run
       load_message
-      intro_message
       play_message
     end
 
     def play_message
-      menu message_uri, play_message_menu, timeout: config.menu_timeout, tries: config.menu_tries do
+      menu intro_message, message_uri, play_message_menu, timeout: config.menu_timeout, tries: config.menu_tries do
         match 1 do
           archive_or_unarchive_message
         end
@@ -26,6 +24,7 @@ module Voicemail
         end
 
         match(7) { rewind_message }
+        match(8) { skip_message }
         match(9) { main_menu }
 
         timeout do
@@ -38,13 +37,13 @@ module Voicemail
 
         failure do
           play config.mailbox.menu_failure_message
-          hangup
+          main_menu
         end
       end
     end
 
     def intro_message
-      invoke MailboxPlayMessageIntroController, message: current_message, mailbox: mailbox[:id], storage: storage
+      IntroMessageCreator.new(current_message).intro_message
     end
 
     def play_message_menu
@@ -59,6 +58,10 @@ module Voicemail
       play_message
     end
 
+    def skip_message
+      # This method intentionally left blank
+    end
+
     def archive_or_unarchive_message
       if new_or_saved == :new
         storage.archive_message mailbox[:id], current_message[:id]
@@ -69,6 +72,7 @@ module Voicemail
 
     def delete_message
       storage.delete_message mailbox[:id], current_message[:id]
+      play config.messages.message_deleted
     end
 
     def current_message

data/lib/voicemail/call_controllers/mailbox_set_greeting_controller.rb

@@ -11,6 +11,7 @@ module Voicemail
          timeout: config.menu_timeout, tries: config.menu_tries do
         match(1) { listen_to_current_greeting }
         match(2) { record_greeting }
+        match(3) { delete_greeting_menu }
         match(9) { main_menu }
 
         timeout do
@@ -23,7 +24,7 @@ module Voicemail
 
         failure do
           play config.mailbox.menu_failure_message
-          hangup
+          main_menu
         end
       end
     end
@@ -62,11 +63,37 @@ module Voicemail
 
         failure do
           play config.mailbox.menu_failure_message
-          hangup
+          section_menu
+        end
+      end
+    end
+
+    def delete_greeting_menu
+      menu config.set_greeting.delete_confirmation,
+         timeout: config.menu_timeout, tries: config.menu_tries do
+        match(1) { delete_greeting }
+        match(9) { section_menu }
+        timeout do
+          play config.mailbox.menu_timeout_message
+        end
+
+        invalid do
+          play config.mailbox.menu_invalid_message
+        end
+
+        failure do
+          play config.mailbox.menu_failure_message
+          section_menu
         end
       end
     end
 
+    def delete_greeting
+      storage.delete_greeting_from_mailbox mailbox[:id]
+      play config.set_greeting.greeting_deleted
+      main_menu
+    end
+
     def save_greeting
       storage.save_greeting_for_mailbox mailbox[:id], temp_recording
       main_menu

data/lib/voicemail/call_controllers/mailbox_set_pin_controller.rb

@@ -20,16 +20,16 @@ module Voicemail
 
         failure do
           play config.mailbox.menu_failure_message
-          hangup
+          main_menu
         end
       end
     end
 
     def set_pin
-      pin = ask config.set_pin.prompt, terminator: "#"
-      repeat_pin = ask config.set_pin.repeat_prompt, terminator: "#"
+      pin = ask config.set_pin.prompt, terminator: "#", timeout: 5
+      repeat_pin = ask config.set_pin.repeat_prompt, terminator: "#", timeout: 5
 
-      if pin.to_s.size < config.set_pin.pin_minimum_digits
+      if pin.to_s.nil? || pin.to_s.size < config.set_pin.pin_minimum_digits
         play config.set_pin.pin_error
         set_pin
       elsif pin.to_s != repeat_pin.to_s

data/lib/voicemail/call_controllers/voicemail_controller.rb

@@ -9,6 +9,7 @@ module Voicemail
         play_greeting
         answer if config.when_to_answer == :after_greeting
         record_message
+        play_recording_confirmation
         hangup
       else
         mailbox_not_found
@@ -19,6 +20,10 @@ module Voicemail
       play mailbox[:greeting_message] || config.default_greeting
     end
 
+    def play_recording_confirmation
+      play config.recording_confirmation
+    end
+
     def record_message
       @recording = record record_options
 

data/lib/voicemail/intro_message_creator.rb

@@ -0,0 +1,84 @@
+module Voicemail
+  class IntroMessageCreator
+
+    begin
+      require 'ahnsay'
+    rescue LoadError
+    end
+
+    attr_accessor :current_message
+
+    def initialize(message)
+      raise ArgumentError, "MailboxPlayMessageIntroController needs a valid message passed to it" unless message
+      @current_message = message
+    end
+
+    def intro_message
+      Array(time_message) + Array(from_message)
+    end
+
+    def time_message
+      case config.numeric_method
+      when :i18n_string
+        I18n.t "voicemail.messages.message_received_on_x", received_on: I18n.localize(current_message[:received])
+      when :play_numeric
+        [config.messages.message_received_on, time_ssml]
+      when :ahn_say
+        [
+          config.messages.message_received_on,
+          Ahnsay.sounds_for_time(current_message[:received], format: config.datetime_format)
+        ]
+      end
+    end
+
+    def from_message
+      case config.numeric_method
+      when :i18n_string
+        I18n.t "voicemail.messages.message_received_from_x", from: from_string
+      when :play_numeric
+        [config.messages.from, from_ssml]
+      when :ahn_say
+        [config.messages.from, Ahnsay.sounds_for_digits(from_digits)]
+      end
+    end
+
+private
+
+    def from_digits
+      current_message[:from].scan(/\d/).join
+    end
+
+    def from_string
+      "".tap do |string|
+        from_digits.each_char do |char|
+          digit_word = I18n.t "numbers.#{char}"
+          if digit_word =~ /missing/
+            string << char
+          else
+            string << digit_word
+          end
+        end
+      end
+    end
+
+    def time_ssml
+      output_formatter.ssml_for_time current_message[:received], format: config.datetime_format
+    end
+
+    def from_ssml
+      if from_digits != ""
+        output_formatter.ssml_for_characters from_digits
+      else
+        "unknown caller"
+      end
+    end
+
+    def output_formatter
+      @output_formatter ||= Adhearsion::CallController::Output::Formatter.new
+    end
+
+    def config
+      Voicemail::Plugin.config
+    end
+  end
+end

data/lib/voicemail/matcher.rb

@@ -1,3 +1,6 @@
+# encoding: utf-8
+# This template exists for the purpose of being overridden.  See the README for more information.
+
 module Voicemail
   class Matcher
     def initialize(entered, actual)
@@ -6,8 +9,6 @@ module Voicemail
     end
 
     def matches?
-      logger.info "input : #{@entered}"
-      logger.info "actual: #{@actual}"
       @entered == @actual
     end
   end

data/lib/voicemail/plugin.rb

@@ -28,6 +28,7 @@ module Voicemail
 
       allow_rerecording true, desc: "Allow caller to rerecord their voicemail"
       after_record "Press 1 to save your voicemail.  Press 2 to rerecord.", desc: "Message to play if allow_rerecording is set"
+      recording_confirmation "Your message has been saved. Thank you.", desc: "Message to play after the voicemail has been saved"
 
       desc "Default recording options"
       recording {
@@ -50,18 +51,27 @@ module Voicemail
         number_before "You have ", desc: "What to play before the number of new messages"
         number_after_new " new messages", desc: "What to play after the number of new messages"
         number_after_saved " saved messages", desc: "What to play after the number of saved messages"
-        menu_greeting "Press 1 to listen to new messages, 2 to listen to saved messages, 3 to change your greeting, 4 to change your PIN", desc: "What to say before the main menu"
+        menu_greeting "Press 1 to listen to new messages, 2 to listen to saved messages, 3 to change your greeting, 4 to change your PIN, 7 to delete all new messages, 9 to delete all saved messages", desc: "What to say before the main menu"
         menu_timeout_message "Please enter a digit for the menu", desc: "Message to play on main menu timeout"
         menu_invalid_message "Please enter valid input", desc: "Message to play on main menu invalid"
         menu_failure_message "Sorry, unable to understand your input.", desc: "Message to play on main menu failure"
+        clear_new_messages "Are you sure you want to permanently erase all new messages? Press 1 to delete, or any other key to cancel", desc: "New message clearing confirmation"
+        clear_saved_messages "Are you sure you want to permanently erase all saved messages? Press 1 to delete, or any other key to cancel", desc: "Saved message clearing confirmation"
+        no_messages_deleted "Your messages will not be deleted. Returning to main menu."
+        deleting_all_new_messages "All of your new messages are being deleted. Please wait."
+        deleting_all_saved_messages "All of your saved messages are being deleted. Please wait."
+        all_new_messages_deleted "All new messages have been successfully deleted."
+        all_saved_messages_deleted "All saved messages have been successfully deleted."
       }
 
       desc "Set greeting configuration"
       set_greeting {
-        prompt "Press 1 to listen to your current greeting, 2 to record a new greeting, 9 to return to the main menu", desc: "Main prompt for setting greeting"
+        prompt "Press 1 to listen to your current greeting, 2 to record a new greeting, 3 to delete your personalized greeting, 9 to return to the main menu", desc: "Main prompt for setting greeting"
         before_record "Please speak after the beep. The prompt will be played back after.", desc: "Recording instructions"
         after_record "Press 1 to save your new greeting, 2 to discard it, 9 to go back to the menu", desc: "Menu to use after recording"
         no_personal_greeting "You do not currently have a personalized greeting.", desc: "What to play if there is no specific greeting"
+        delete_confirmation "Your personlized greeting will be deleted. Press 1 to confirm, 9 to return to the main menu.", desc: "Ask the user to confirm removal of personalized greeting"
+        greeting_deleted "Your personalized greeting was deleted.", desc: "What to play after a greeting has been deleted"
       }
 
       desc "Set PIN configuration"
@@ -77,12 +87,13 @@ module Voicemail
 
       desc "Listen to messages menu configuration"
       messages {
-        menu_new "Press 1 to archive the message and go to the next, press 5 to delete the message and go to the next, press 7 to hear the message again, press 9 for the main menu", desc: "Menu to use inside new messages"
-        menu_saved "Press 1 to unarchive the message and go to the next, press 5 to delete the message and go to the next, press 7 to hear the message again, press 9 for the main menu", desc: "Menu to use inside saved messages"
+        menu_new "Press 1 to archive the message and go to the next, press 5 to delete the message and go to the next, press 7 to hear the message again, press 8 to skip the message, press 9 for the main menu", desc: "Menu to use inside new messages"
+        menu_saved "Press 1 to unarchive the message and go to the next, press 5 to delete the message and go to the next, press 7 to hear the message again, press 8 to skip the message, press 9 for the main menu", desc: "Menu to use inside saved messages"
         no_new_messages "There are no new messages", desc: "Message to inform the user he has no new messages"
         no_saved_messages "There are no saved messages", desc: "Message to inform the user he has no saved messages"
         message_received_on "Message received on ", desc: "Prefix to menu intro"
         from " from ", desc: "Used in message intro"
+        message_deleted "Message deleted.", desc: "Confirmation that a message has been deleted"
       }
 
       desc "Storage configuration"

data/lib/voicemail/storage_pstore.rb

@@ -72,6 +72,14 @@ module Voicemail
       end
     end
 
+    def delete_greeting_from_mailbox(mailbox_id)
+      store.transaction do
+        rec = store[:mailboxes][mailbox_id][:greeting_message]
+        File.unlink rec if File.exists? rec
+        store[:mailboxes][mailbox_id][:greeting_message] = nil
+      end
+    end
+
     def change_pin_for_mailbox(mailbox_id, new_pin)
       store.transaction do
         store[:mailboxes][mailbox_id][:pin] = new_pin

data/lib/voicemail/version.rb

@@ -1,3 +1,3 @@
 module Voicemail
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/spec/voicemail/call_controllers/mailbox_cleaner_controller_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe Voicemail::MailboxCleanerController do
+  include VoicemailControllerSpecHelper
+  describe "#run" do
+    context "new messages" do
+      subject { flexmock(Voicemail::MailboxCleanerController.new call, {new_or_saved: :new}) }
+      it 'should call #menu with the proper arguments' do
+        subject.should_receive(:menu).with(config.mailbox.clear_new_messages, 
+          { timeout: config.menu_timeout, tries: config.menu_tries }, Proc)
+        subject.run
+      end
+    end
+
+    context "saved messages" do
+      subject { flexmock(Voicemail::MailboxCleanerController.new call, {new_or_saved: :saved}) }
+      it 'should call #menu with the proper arguments' do
+        subject.should_receive(:menu).with(config.mailbox.clear_saved_messages, 
+          { timeout: config.menu_timeout, tries: config.menu_tries }, Proc)
+        subject.run
+      end
+    end
+  end
+end

data/spec/voicemail/call_controllers/mailbox_play_message_controller_spec.rb

@@ -39,27 +39,21 @@ describe Voicemail::MailboxPlayMessageController do
     it "deletes the message" do
       subject.should_receive(:current_message).once.and_return(message)
       storage_instance.should_receive(:delete_message).once.with(mailbox[:id], message[:id])
+      subject.should_receive(:play).once.with(config.messages.message_deleted)
       controller.delete_message
     end
   end
 
-  describe "#intro_message" do
-    it "plays the message introduction" do
-      subject.should_receive(:current_message).once.and_return message
-      should_invoke Voicemail::MailboxPlayMessageIntroController, message: message, mailbox: 100, storage: storage_instance
-      controller.intro_message
-    end
-  end
-
   describe "#play_message" do
+    include FlexMock::ArgumentTypes
     after { subject.play_message }
 
     context "with a new message" do
       before { subject.new_or_saved = :new }
 
       it "plays the message, followed by the new message menu" do
-        subject.should_receive(:current_message).once.and_return message
-        subject.should_receive(:menu).once.with message[:uri], config.messages.menu_new,
+        subject.should_receive(:current_message).and_return message
+        subject.should_receive(:menu).once.with any, message[:uri], config.messages.menu_new,
           { timeout: config.menu_timeout, tries: config.menu_tries }, Proc
       end
     end
@@ -68,8 +62,8 @@ describe Voicemail::MailboxPlayMessageController do
       before { subject.new_or_saved = :saved }
 
       it "plays the message, followed by the saved message menu" do
-        subject.should_receive(:current_message).once.and_return message
-        subject.should_receive(:menu).once.with message[:uri], config.messages.menu_saved,
+        subject.should_receive(:current_message).and_return message
+        subject.should_receive(:menu).once.with any, message[:uri], config.messages.menu_saved,
           { timeout: config.menu_timeout, tries: config.menu_tries }, Proc
       end
     end

data/spec/voicemail/call_controllers/mailbox_set_greeting_controller_spec.rb

@@ -66,6 +66,24 @@ describe Voicemail::MailboxSetGreetingController do
     end
   end
 
+  describe "#delete_greeting_menu" do
+    it "calls #menu with proper parameters" do
+      subject.should_receive(:menu).once.with(config.set_greeting.delete_confirmation,
+         {timeout: config.menu_timeout,
+          tries: config.menu_tries}, Proc)
+      subject.delete_greeting_menu
+    end
+  end
+
+  describe "#delete_greeting" do
+    it "deletes the greeting and plays a confirmation" do
+      storage_instance.should_receive(:delete_greeting_from_mailbox).with(mailbox[:id])
+      subject.should_receive(:play).with(config.set_greeting.greeting_deleted)
+      subject.should_receive(:main_menu)
+      subject.delete_greeting
+    end
+  end
+
   describe "#save_greeting" do
     let(:file_path) { "/path/to/file" }
 

data/spec/voicemail/call_controllers/mailbox_set_pin_controller_spec.rb

@@ -18,8 +18,8 @@ describe Voicemail::MailboxSetPinController do
     let(:short_pin)         { "9" }
 
     it "makes the user enter a PIN and repeat it" do
-      should_ask(config.set_pin.prompt, terminator: "#").and_return(pin).ordered
-      should_ask(config.set_pin.repeat_prompt, terminator: "#").and_return(pin).ordered
+      should_ask(config.set_pin.prompt, terminator: "#", timeout: 5).and_return(pin).ordered
+      should_ask(config.set_pin.repeat_prompt, terminator: "#", timeout: 5).and_return(pin).ordered
       should_play(config.set_pin.change_ok).ordered
       storage_instance.should_receive(:change_pin_for_mailbox).with(mailbox[:id], pin).once.ordered
       subject.should_receive(:main_menu).once
@@ -27,11 +27,11 @@ describe Voicemail::MailboxSetPinController do
     end
 
     it "makes the user start over if the PIN is too short" do
-      should_ask(config.set_pin.prompt, terminator: "#").and_return(short_pin).ordered
-      should_ask(config.set_pin.repeat_prompt, terminator: "#").and_return(short_pin).ordered
+      should_ask(config.set_pin.prompt, terminator: "#", timeout: 5).and_return(short_pin).ordered
+      should_ask(config.set_pin.repeat_prompt, terminator: "#", timeout: 5).and_return(short_pin).ordered
       should_play(config.set_pin.pin_error).ordered
-      should_ask(config.set_pin.prompt, terminator: "#").and_return(pin).ordered
-      should_ask(config.set_pin.repeat_prompt, terminator: "#").and_return(pin).ordered
+      should_ask(config.set_pin.prompt, terminator: "#", timeout: 5).and_return(pin).ordered
+      should_ask(config.set_pin.repeat_prompt, terminator: "#", timeout: 5).and_return(pin).ordered
       should_play(config.set_pin.change_ok).ordered
       storage_instance.should_receive(:change_pin_for_mailbox).with(mailbox[:id], pin).once.ordered
       subject.should_receive(:main_menu).once
@@ -39,11 +39,11 @@ describe Voicemail::MailboxSetPinController do
     end
 
     it "makes the user start over if the PIN does not match confirmation" do
-      should_ask(config.set_pin.prompt, terminator: "#").and_return(pin).ordered
-      should_ask(config.set_pin.repeat_prompt, terminator: "#").and_return(not_matching_pin).ordered
+      should_ask(config.set_pin.prompt, terminator: "#", timeout: 5).and_return(pin).ordered
+      should_ask(config.set_pin.repeat_prompt, terminator: "#", timeout: 5).and_return(not_matching_pin).ordered
       should_play(config.set_pin.match_error).ordered
-      should_ask(config.set_pin.prompt, terminator: "#").and_return(pin).ordered
-      should_ask(config.set_pin.repeat_prompt, terminator: "#").and_return(pin).ordered
+      should_ask(config.set_pin.prompt, terminator: "#", timeout: 5).and_return(pin).ordered
+      should_ask(config.set_pin.repeat_prompt, terminator: "#", timeout: 5).and_return(pin).ordered
       should_play(config.set_pin.change_ok).ordered
       storage_instance.should_receive(:change_pin_for_mailbox).with(mailbox[:id], pin).once.ordered
       subject.should_receive(:main_menu).once

data/spec/voicemail/call_controllers/voicemail_controller_spec.rb

@@ -46,6 +46,7 @@ describe Voicemail::VoicemailController do
           it "plays the default greeting if one is not specified" do
             should_play config.default_greeting
             subject.should_receive :record_message
+            should_play config.recording_confirmation
             controller.run
           end
         end
@@ -56,6 +57,7 @@ describe Voicemail::VoicemailController do
           it "plays the specific greeting message" do
             should_play greeting_message
             subject.should_receive :record_message
+            should_play config.recording_confirmation
             controller.run
           end
         end

data/spec/voicemail/intro_message_creator_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+
+describe Voicemail::IntroMessageCreator do
+  include FlexMock::ArgumentTypes
+
+  let(:config)  { Voicemail::Plugin.config }
+  let(:message) do
+    {
+      from:     "1234",
+      received: Time.local(2012, 5, 1, 9, 0, 0)
+    }
+  end
+
+  subject { flexmock described_class.new(message) }
+
+  describe "#intro_message" do
+    context "in :i18n_string mode" do
+      before { config.numeric_method = :i18n_string }
+
+      it "returns the translation" do
+        flexmock(I18n).should_receive('localize').with(Time.local(2012, 5, 1, 9, 0, 0)).and_return "9pm"
+        I18n.backend.store_translations :en, voicemail: {
+          messages: {
+            message_received_on_x: "Message received on %{received_on}",
+            message_received_from_x: "Message received from %{from}"
+          }
+        }, numbers: {'1' => "one ", '2' => "two ", '3' => 'three ', '4' => 'four '}
+
+        subject.intro_message.should == ["Message received on 9pm", "Message received from one two three four "]
+      end
+    end
+
+    context "in :ahn_say mode" do
+      let!(:ahn_config) { flexmock(Adhearsion.config, punchblock: OpenStruct.new, ahnsay: OpenStruct.new(sounds_dir: "/")) }
+
+      before do
+        config.numeric_method  = :ahn_say
+        config.datetime_format = "hmp"
+      end
+
+      it "returns a nice array full of ahn_say sound files" do
+        subject.intro_message.should == [
+          "Message received on ",
+          ["/9.ul", "/oclock.ul", "/a-m.ul"],
+          " from ",
+          ["/1.ul", "/2.ul", "/3.ul", "/4.ul"]
+        ]
+      end
+    end
+
+    context "in :play_numeric mode" do
+      let(:formatter)  { flexmock Adhearsion::CallController::Output::Formatter  }
+      before do
+        flexmock Adhearsion::CallController::Output::Formatter, new: formatter
+        config.numeric_method = :play_numeric
+      end
+
+      it "returns speech and ssml in an array" do
+        formatter.should_receive(:ssml_for_time).with(Time.local(2012, 5, 1, 9, 0, 0), any).and_return :time
+        formatter.should_receive(:ssml_for_characters).with('1234').and_return :number
+        subject.intro_message.should == ["Message received on ", :time, " from ", :number]
+      end
+    end
+  end
+end

data/spec/voicemail/storage_pstore_spec.rb

@@ -103,5 +103,20 @@ module Voicemail
         end
       end
     end
+
+    describe "#delete_greeting_from_mailbox" do
+      before do
+        storage.store.transaction do |store|
+          store[:mailboxes][100][:greeting_message] = "/some/path"
+        end
+      end
+
+      it "deletes the greeting message" do
+        storage.delete_greeting_from_mailbox 100
+        storage.store.transaction do |store|
+          store[:mailboxes][100][:greeting_message].should be_nil
+        end
+      end
+    end
   end
 end

data/templates/en.yml

@@ -17,14 +17,14 @@ en:
     '0': "zero "
 
   voicemail:
-    default_greeting: "You have reached voicemail"
+    default_greeting: "You have reached Voicemail"
     mailbox_not_found: "Mailbox not found"
 
     mailbox:
       greeting_message: "Welcome to the mailbox system."
       please_enter_pin: "Please enter your PIN."
       pin_wrong: "The PIN you entered does not match. Please try again."
-      could_not_auth: "We are sorry, the system could not authenticate you"
+      could_not_auth: "We are sorry, the system could not authenticate you."
       number_before: "You have "
       number_after: " new messages"
       number_after_saved: " saved messages"
@@ -34,34 +34,38 @@ en:
       x_saved_messages:
         one: "You have one saved message. "
         other: "You have %{count} saved messages. "
-      menu_greeting: "Press 1 to listen to new messages, 2 to change your greeting, 3 to change your PIN"
-      menu_timeout_message: "Please enter a digit for the menu"
-      menu_invalid_message: "Please enter valid input"
+      menu_greeting: "Press 1 to listen to new messages, 2 to change your greeting, 3 to change your PIN."
+      menu_timeout_message: "Please enter a digit for the menu."
+      menu_invalid_message: "Please enter valid input."
       menu_failure_message: "Sorry, unable to understand your input."
 
     after_record: "Press 1 to save your voicemail.  Press 2 to rerecord."
+    recording_confirmation: "Your message has been saved. Thank you."
 
     set_greeting:
-      prompt: "Press 1 to listen to your current greeting, 2 to record a new greeting, 9 to return to the main menu"
+      prompt: "Press 1 to listen to your current greeting, 2 to record a new greeting, 9 to return to the main menu."
       before_record: "Please speak after the beep. The prompt will be played back after."
-      after_record: "Press 1 to save your new greeting, 2 to discard it, 9 to go back to the menu"
+      after_record: "Press 1 to save your new greeting, 2 to discard it, 9 to go back to the menu."
       no_personal_greeting: "You do not currently have a personalized greeting."
 
     set_pin:
-      menu: "Press 1 to change your current PIN, or 9 to go back to the main menu"
-      prompt: "Enter your new PIN of at least four digits followed by the pound sign"
-      repeat_prompt: "Please enter your new PIN again, followed by the pound sign"
+      menu: "Press 1 to change your current PIN, or 9 to go back to the main menu."
+      prompt: "Enter your new PIN of at least four digits followed by the pound sign."
+      repeat_prompt: "Please enter your new PIN again, followed by the pound sign."
       pin_error: "Please enter at least four digits followed by the pound sign."
       match_error: "The two entered PINs don't match, please try again."
-      change_ok: "Your PIN has been successfully changed"
+      change_ok: "Your PIN has been successfully changed."
 
     messages:
       menu_new: "Press 1 to archive the message and go to the next, press 5 to delete the message and go to the next, press 7 to hear the message again, press 9 for the main menu"
       menu_saved: "Press 1 to unarchive the message and go to the next, press 5 to delete the message and go to the next, press 7 to hear the message again, press 9 for the main menu"
-      no_new_messages: "There are no new messages"
-      no_saved_messages: "There are no saved messages"
+      no_new_messages: "There are no new messages."
+      no_saved_messages: "There are no saved messages."
       message_received_on: "Message received on "
       from: " from "
       message_received_on_x: "Message received on %{received_on}. "
       message_received_from_x: "Message received from %{from}. "
-
+      deleting_all_new_messages: "All of your new messages are being deleted. Please wait."
+      deleting_all_saved_messages: "All of your saved messages are being deleted. Please wait."
+      all_new_messages_deleted: "All new messages have been deleted."
+      all_saved_messages_deleted: "All saved messages have been deleted."

data/voicemail.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency %q<rake>, [">= 0"]
   s.add_development_dependency %q<guard-rspec>
   s.add_development_dependency %q<flexmock>
+  s.add_development_dependency %q<ahnsay>
  end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: voicemail
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Luca Pradovera
@@ -9,104 +9,118 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-02 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adhearsion
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: flexmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ahnsay
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A simple, extensible voicemail implementation
@@ -117,8 +131,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".hound.yml"
+- ".rspec"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -128,6 +143,7 @@ files:
 - lib/voicemail.rb
 - lib/voicemail/call_controllers/application_controller.rb
 - lib/voicemail/call_controllers/authentication_controller.rb
+- lib/voicemail/call_controllers/mailbox_cleaner_controller.rb
 - lib/voicemail/call_controllers/mailbox_controller.rb
 - lib/voicemail/call_controllers/mailbox_main_menu_controller.rb
 - lib/voicemail/call_controllers/mailbox_messages_controller.rb
@@ -136,6 +152,7 @@ files:
 - lib/voicemail/call_controllers/mailbox_set_greeting_controller.rb
 - lib/voicemail/call_controllers/mailbox_set_pin_controller.rb
 - lib/voicemail/call_controllers/voicemail_controller.rb
+- lib/voicemail/intro_message_creator.rb
 - lib/voicemail/localization_loader.rb
 - lib/voicemail/matcher.rb
 - lib/voicemail/plugin.rb
@@ -146,6 +163,7 @@ files:
 - spec/support/voicemail_controller_spec_helper.rb
 - spec/voicemail/call_controllers/application_controller_spec.rb
 - spec/voicemail/call_controllers/authentication_controller_spec.rb
+- spec/voicemail/call_controllers/mailbox_cleaner_controller_spec.rb
 - spec/voicemail/call_controllers/mailbox_controller_spec.rb
 - spec/voicemail/call_controllers/mailbox_main_menu_controller_spec.rb
 - spec/voicemail/call_controllers/mailbox_messages_controller_spec.rb
@@ -154,6 +172,7 @@ files:
 - spec/voicemail/call_controllers/mailbox_set_greeting_controller_spec.rb
 - spec/voicemail/call_controllers/mailbox_set_pin_controller_spec.rb
 - spec/voicemail/call_controllers/voicemail_controller_spec.rb
+- spec/voicemail/intro_message_creator_spec.rb
 - spec/voicemail/localization_loader_spec.rb
 - spec/voicemail/storage_pstore_spec.rb
 - spec/voicemail/storage_spec.rb
@@ -170,17 +189,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: voicemail
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Voicemail for Adhearsion
@@ -189,6 +208,7 @@ test_files:
 - spec/support/voicemail_controller_spec_helper.rb
 - spec/voicemail/call_controllers/application_controller_spec.rb
 - spec/voicemail/call_controllers/authentication_controller_spec.rb
+- spec/voicemail/call_controllers/mailbox_cleaner_controller_spec.rb
 - spec/voicemail/call_controllers/mailbox_controller_spec.rb
 - spec/voicemail/call_controllers/mailbox_main_menu_controller_spec.rb
 - spec/voicemail/call_controllers/mailbox_messages_controller_spec.rb
@@ -197,6 +217,7 @@ test_files:
 - spec/voicemail/call_controllers/mailbox_set_greeting_controller_spec.rb
 - spec/voicemail/call_controllers/mailbox_set_pin_controller_spec.rb
 - spec/voicemail/call_controllers/voicemail_controller_spec.rb
+- spec/voicemail/intro_message_creator_spec.rb
 - spec/voicemail/localization_loader_spec.rb
 - spec/voicemail/storage_pstore_spec.rb
 - spec/voicemail/storage_spec.rb