voicemail 0.2.0 → 1.0.0.beta

data/spec/voicemail/localization_loader_spec.rb

@@ -0,0 +1,21 @@
+require "spec_helper"
+
+describe Voicemail::LocalizationLoader do
+
+  before { @old_config = Voicemail::Plugin.config.default_greeting }
+  after  { Voicemail::Plugin.config.default_greeting = @old_config }
+
+  describe ".replace_config" do
+    let(:mock_hash) { {'en' => {'voicemail' => {'default_greeting' => 'foo'}}} }
+
+    before do
+      flexmock(YAML).should_receive(:load).and_return mock_hash
+      flexmock(I18n).should_receive(:t).and_return "bar"
+    end
+
+    it "changes the values to i18n" do
+      subject.replace_config
+      Voicemail::Plugin.config.default_greeting.should == "bar"
+    end
+  end
+end

data/spec/voicemail/storage_pstore_spec.rb

@@ -14,14 +14,20 @@ module Voicemail
 
     let(:config) { Voicemail::Plugin.config }
 
+    let(:message_1) { {id: :foo} }
+    let(:message_2) { {id: :bar} }
+    let(:message_3) { {id: :biz} }
+
     subject :storage do
       basedir = File.expand_path("../../../tmp/", __FILE__)
       pstore_path = File.join(basedir, 'voicemail.pstore')
       File.unlink(pstore_path) if File.exists?(pstore_path)
       config.storage.pstore_location = pstore_path
       StoragePstore.new.tap do |storage|
-        storage.store.transaction do
-          storage.store[:mailboxes][100] = mailbox
+        storage.store.transaction do |store|
+          store[:recordings][100] = [message_1]
+          store[:archived][100]   = [message_2, message_3]
+          store[:mailboxes][100]  = mailbox
         end
         flexmock storage
       end
@@ -41,5 +47,61 @@ module Voicemail
       end
     end
 
+    describe "#save_recording" do
+      let(:recording_object) { flexmock 'recording_object', uri: "file://somewav.wav" }
+
+      it "saves the recording" do
+        storage.save_recording(100, "foo", recording_object)
+        storage.store.transaction do |store|
+          store[:recordings][100].last[:uri].should  == "file://somewav.wav"
+          store[:recordings][100].last[:from].should == "foo"
+          store[:recordings][100].last[:id].should_not be_nil
+        end
+      end
+    end
+
+    describe "#count_new_messages" do
+      it "returns the new message count" do
+        storage.count_new_messages(100).should == 1
+      end
+    end
+
+    describe "#count_saved_messages" do
+      it "returns the saved message count" do
+        storage.count_saved_messages(100).should == 2
+      end
+    end
+
+    describe "#next_new_message" do
+      it "returns the next new messaged" do
+        storage.next_new_message(100).should == {id: :foo}
+      end
+    end
+
+    describe "#next_saved_message" do
+      it "returns the next saved messaged" do
+        storage.next_saved_message(100).should == {id: :bar}
+      end
+    end
+
+    describe "#archive_message" do
+      it "archives the message" do
+        storage.archive_message 100, :foo
+        storage.store.transaction do |store|
+          store[:recordings][100].should == []
+          store[:archived][100].should   == [message_2, message_3, message_1]
+        end
+      end
+    end
+
+    describe "#unarchive_message" do
+      it "unarchives the message" do
+        storage.unarchive_message 100, :bar
+        storage.store.transaction do |store|
+          store[:recordings][100].should == [message_1, message_2]
+          store[:archived][100].should   == [message_3]
+        end
+      end
+    end
   end
 end

data/templates/en.yml

@@ -0,0 +1,67 @@
+en:
+  time:
+    am: am
+    pm: pm
+    formats:
+      default: '%A, %B %d at %-l:%M %p'
+  numbers:
+    '1': "one "
+    '2': "two "
+    '3': "three "
+    '4': "four "
+    '5': "five "
+    '6': "six "
+    '7': "seven "
+    '8': "eight "
+    '9': "nine "
+    '0': "zero "
+
+  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"
+      number_before: "You have "
+      number_after: " new messages"
+      number_after_saved: " saved messages"
+      x_new_messages:
+        one: "You have one new message. "
+        other: "You have %{count} new messages. "
+      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_failure_message: "Sorry, unable to understand your input."
+
+    after_record: "Press 1 to save your voicemail.  Press 2 to rerecord."
+
+    set_greeting:
+      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"
+      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"
+      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"
+
+    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"
+      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}. "
+

data/voicemail.gemspec

@@ -5,8 +5,8 @@ require "voicemail/version"
 Gem::Specification.new do |s|
   s.name        = "voicemail"
   s.version     = Voicemail::VERSION
-  s.authors     = ["Luca Pradovera"]
-  s.email       = ["lpradovera@mojolingo.com"]
+  s.authors     = ["Luca Pradovera", "Justin Aiken"]
+  s.email       = ["lpradovera@mojolingo.com", "jaiken@mojolingo.com"]
   s.license     = 'MIT'
   s.homepage    = "http://github.com/adhearsion/voicemail"
   s.summary     = %q{Voicemail for Adhearsion}

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: voicemail
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0.beta
 platform: ruby
 authors:
 - Luca Pradovera
+- Justin Aiken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-30 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adhearsion
@@ -111,41 +112,52 @@ dependencies:
 description: A simple, extensible voicemail implementation
 email:
 - lpradovera@mojolingo.com
+- jaiken@mojolingo.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE
 - README.md
 - Rakefile
 - lib/voicemail.rb
-- lib/voicemail/application_controller.rb
-- lib/voicemail/mailbox_controller.rb
-- lib/voicemail/mailbox_main_menu_controller.rb
-- lib/voicemail/mailbox_messages_controller.rb
-- lib/voicemail/mailbox_play_message_controller.rb
-- lib/voicemail/mailbox_set_greeting_controller.rb
-- lib/voicemail/mailbox_set_pin_controller.rb
+- lib/voicemail/call_controllers/application_controller.rb
+- lib/voicemail/call_controllers/authentication_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
+- lib/voicemail/call_controllers/mailbox_play_message_controller.rb
+- lib/voicemail/call_controllers/mailbox_play_message_intro_controller.rb
+- 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/localization_loader.rb
+- lib/voicemail/matcher.rb
 - lib/voicemail/plugin.rb
 - lib/voicemail/storage.rb
 - lib/voicemail/storage_pstore.rb
 - lib/voicemail/version.rb
-- lib/voicemail/voicemail_controller.rb
 - spec/spec_helper.rb
 - spec/support/voicemail_controller_spec_helper.rb
-- spec/voicemail/mailbox_controller_spec.rb
-- spec/voicemail/mailbox_main_menu_controller_spec.rb
-- spec/voicemail/mailbox_messages_controller_spec.rb
-- spec/voicemail/mailbox_play_message_controller_spec.rb
-- spec/voicemail/mailbox_set_greeting_controller_spec.rb
-- spec/voicemail/mailbox_set_pin_controller_spec.rb
+- spec/voicemail/call_controllers/application_controller_spec.rb
+- spec/voicemail/call_controllers/authentication_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
+- spec/voicemail/call_controllers/mailbox_play_message_controller_spec.rb
+- spec/voicemail/call_controllers/mailbox_play_message_intro_controller_spec.rb
+- 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/localization_loader_spec.rb
 - spec/voicemail/storage_pstore_spec.rb
 - spec/voicemail/storage_spec.rb
-- spec/voicemail/voicemail_controller_spec.rb
+- templates/en.yml
 - tmp/.gitignore
 - voicemail.gemspec
 homepage: http://github.com/adhearsion/voicemail
@@ -163,9 +175,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: voicemail
 rubygems_version: 2.0.0
@@ -175,13 +187,17 @@ summary: Voicemail for Adhearsion
 test_files:
 - spec/spec_helper.rb
 - spec/support/voicemail_controller_spec_helper.rb
-- spec/voicemail/mailbox_controller_spec.rb
-- spec/voicemail/mailbox_main_menu_controller_spec.rb
-- spec/voicemail/mailbox_messages_controller_spec.rb
-- spec/voicemail/mailbox_play_message_controller_spec.rb
-- spec/voicemail/mailbox_set_greeting_controller_spec.rb
-- spec/voicemail/mailbox_set_pin_controller_spec.rb
+- spec/voicemail/call_controllers/application_controller_spec.rb
+- spec/voicemail/call_controllers/authentication_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
+- spec/voicemail/call_controllers/mailbox_play_message_controller_spec.rb
+- spec/voicemail/call_controllers/mailbox_play_message_intro_controller_spec.rb
+- 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/localization_loader_spec.rb
 - spec/voicemail/storage_pstore_spec.rb
 - spec/voicemail/storage_spec.rb
-- spec/voicemail/voicemail_controller_spec.rb
 has_rdoc: 

data/lib/voicemail/mailbox_controller.rb

@@ -1,56 +0,0 @@
-module Voicemail
-  class MailboxController < ApplicationController
-    def run
-      if mailbox
-        play_greeting
-        fail_auth unless authenticate
-        play_number_of_messages
-        main_menu
-      else
-        mailbox_not_found
-      end
-    end
-
-    def authenticate
-      current_tries = 0
-      auth_ok = false
-      while current_tries < config.mailbox.pin_tries
-        input = ask config.mailbox.please_enter_pin, terminator: "#", timeout: config.prompt_timeout
-        logger.info input.to_s
-        logger.info mailbox[:pin].to_s
-        auth_ok = true if input.to_s == mailbox[:pin].to_s
-        break if auth_ok
-        play config.mailbox.pin_wrong
-        current_tries += 1
-      end
-      auth_ok
-    end
-
-    def play_number_of_messages
-      number = storage.count_new_messages(mailbox[:id])
-      if number > 0
-        play config.mailbox.number_before
-        play_numeric number
-        play config.mailbox.number_after
-      else
-        play config.messages.no_new_messages
-      end
-    end
-
-    private
-
-    def play_greeting
-      play config.mailbox.greeting_message
-    end
-
-    def mailbox_not_found
-      play config.mailbox_not_found
-      hangup
-    end
-
-    def fail_auth
-      play config.mailbox.could_not_auth
-      hangup
-    end
-  end
-end

data/lib/voicemail/mailbox_messages_controller.rb

@@ -1,55 +0,0 @@
-module Voicemail
-  class MailboxMessagesController < ApplicationController
-    def run
-      message_loop
-    end
-
-    def message_loop
-      number = storage.count_new_messages(mailbox[:id])
-      if number > 0
-        next_message
-      else
-        bail_out
-      end
-    end
-
-    def next_message
-      current_message = storage.next_new_message(mailbox[:id])
-      handle_message current_message
-      message_loop
-    end
-
-    def handle_message(message)
-      invoke MailboxPlayMessageController, message: message, mailbox: mailbox[:id]
-    end
-
-    private
-
-    def bail_out
-      play config.messages.no_new_messages
-      main_menu
-    end
-
-    def section_menu
-      menu config.mailbox.menu_greeting,
-         timeout: config.menu_timeout, tries: config.menu_tries do
-        match(1) { listen_to_messages }
-        match(2) { set_greeting }
-        match(3) { set_pin }
-
-        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
-          hangup
-        end
-      end
-    end
-  end
-end

data/lib/voicemail/voicemail_controller.rb

@@ -1,33 +0,0 @@
-module Voicemail
-  class VoicemailController < ApplicationController
-    def run
-      answer unless config.force_183
-      if mailbox
-        answer if config.force_183
-        play_greeting
-        handle_recording
-      else
-        mailbox_not_found
-      end
-    end
-
-    def play_greeting
-      play mailbox[:greeting_message] || config.default_greeting
-    end
-
-    def handle_recording
-      @from = call.from
-      record_comp = record config.recording.to_hash.merge(interruptible: true, direction: :recv)
-      save_recording record_comp.complete_event.recording.uri
-    end
-
-    def mailbox_not_found
-      play config.mailbox_not_found
-      hangup
-    end
-
-    def save_recording(uri)
-      storage.save_recording mailbox[:id], @from, uri
-    end
-  end
-end