voicemail 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85483d596c2b6e25016b05a3ea29885e8c243851
-  data.tar.gz: b06686ed9549ffa75661d4f3065ff0c60e21e2fc
+  metadata.gz: 8ece901d2e7597ad7c46d21892c1c18860366229
+  data.tar.gz: 5179e5142890487aafe759b21d459212f90e8170
 SHA512:
-  metadata.gz: 21e6b40a6f88258cc4dc9f4324029d5a654da70d4feb1bc7f5513b942e9e0b72852dfb8aabbaef387b9db741c25807822c8c9760a2d04bc8d2e374fcb53f9a53
-  data.tar.gz: 8b7cc4401c5f949e89a4aec9ce381d2ec304efaf7c5278b6a3a4dfe55bced067fb6824fe2b590edf627d75a41d4d595385056c73d2ad3ee316d6a6430282de99
+  metadata.gz: f741bdf352fb6c34412461e81a1ce85810d01d2ad680248e41d54c3d2dc033dd817edcc0d025a50147b7115c85a9220d77ea46e5171b3e5bf1a6180e84f18d3a
+  data.tar.gz: bbc20bd448644acb1b896835f09f28254f5730d3d1a8579207c981bd83b4cff4ca49120987c079ec7f729e0b415350776ef1f36a6815d0ceda6be4686ebec692

data/lib/voicemail/mailbox_play_message_controller.rb

@@ -8,8 +8,7 @@ module Voicemail
     end
 
     def play_message
-      menu current_message[:uri].gsub(/\.wav/, ''), config.messages.menu,
-         timeout: config.menu_timeout, tries: config.menu_tries do
+      menu message_uri, config.messages.menu, timeout: config.menu_timeout, tries: config.menu_tries do
         match 1 do
           archive_message
         end
@@ -41,8 +40,7 @@ module Voicemail
       play_time current_message[:received], format: config.datetime_format
       play config.messages.from
       from_digits = current_message[:from].scan(/\d/).join
-      execute "SayDigits", from_digits unless from_digits.empty?
-      # say_characters '1234'
+      say_characters from_digits unless from_digits.empty?
     end
 
     def rewind_message
@@ -65,5 +63,9 @@ module Voicemail
       @message = metadata[:message] || nil
       raise ArgumentError, "MailboxPlayMessageController needs a valid message passed to it" unless @message
     end
+
+    def message_uri
+      current_message[:uri].gsub(/\.wav/, '')
+    end
   end
 end

data/lib/voicemail/mailbox_set_greeting_controller.rb

@@ -35,9 +35,9 @@ module Voicemail
 
     def record_greeting
       play config.set_greeting.before_record
-      record_comp = record config.set_greeting.recording.to_hash.merge(interruptible: true, max_duration: 30_000)
+      record_comp = record config.set_greeting.recording.to_hash.merge(interruptible: true)
       @temp_recording = record_comp.complete_event.recording.uri.gsub(/file:\/\//, '').gsub(/\.wav/, '')
-      play @temp_recording
+      play_audio @temp_recording
 
       menu config.set_greeting.after_record,
          timeout: config.menu_timeout, tries: config.menu_tries do

data/lib/voicemail/plugin.rb

@@ -13,10 +13,14 @@ module Voicemail
       menu_tries 3, desc: "Tries to get matching input for all menus"
       datetime_format "Q 'digits/at' IMp", desc: "Fromat to use for message date and time TTS"
 
+      force_183 false, desc: "Only #answer if the mailbox is found"
+
       desc "Voicemail recording options"
       recording {
-        max_duration 5_000, desc: "Maximum duration for recording in milliseconds"
+        final_timeout 2, desc: "Maximum duration to run after recording in seconds"
+        max_duration 30, desc: "Maximum duration for recording in seconds"
         start_beep true, desc: "Play a beep before recording"
+        stop_beep false, desc: "Play a beep after recording"
       }
 
       desc "Configuration for registered users"

data/lib/voicemail/storage_pstore.rb

@@ -63,7 +63,6 @@ module Voicemail
           received: Time.now,
           uri:      recording_uri.gsub(/file:\/\//, '')
         }
-        logger.fatal "store[:recordings][#{mailbox_id}] << recording"
         store[:recordings][mailbox_id] << recording
         logger.info "Saving recording: #{recording.inspect}"
       end
@@ -79,10 +78,6 @@ module Voicemail
         store[:mailboxes]   ||= {}
         store[:recordings]  ||= {}
         store[:archived]    ||= {}
-
-        store[:mailboxes][1]  = {greeting_message: "Hello.", id: 1, pin: '1234'}
-        store[:recordings][1] ||= []
-        store[:archived][1] ||= []
       end
     end
 

data/lib/voicemail/version.rb

@@ -1,3 +1,3 @@
 module Voicemail
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/voicemail/voicemail_controller.rb

@@ -1,8 +1,9 @@
 module Voicemail
   class VoicemailController < ApplicationController
     def run
-      answer
+      answer unless config.force_183
       if mailbox
+        answer if config.force_183
         play_greeting
         handle_recording
       else
@@ -16,7 +17,7 @@ module Voicemail
 
     def handle_recording
       @from = call.from
-      record_comp = record config.recording.to_hash.merge(interruptible: true, max_duration: 30_000, direction: :recv)
+      record_comp = record config.recording.to_hash.merge(interruptible: true, direction: :recv)
       save_recording record_comp.complete_event.recording.uri
     end
 

data/spec/voicemail/mailbox_play_message_controller_spec.rb

@@ -34,7 +34,7 @@ describe Voicemail::MailboxPlayMessageController do
       should_play config.messages.message_received_on
       subject.should_receive(:play_time).once.with(message[:received], format: config.datetime_format)
       should_play config.messages.from
-      subject.should_receive(:execute).once.with("SayDigits", "39335135335")
+      subject.should_receive(:say_characters).once.with "39335135335"
       controller.intro_message
     end
   end

data/spec/voicemail/mailbox_set_greeting_controller_spec.rb

@@ -39,8 +39,8 @@ describe Voicemail::MailboxSetGreetingController do
     it "plays the appropriate sounds, records, plays back recording, and calls the recording menu" do
       should_play config.set_greeting.before_record
       recording_component.should_receive("complete_event.recording.uri").and_return(file_path)
-      subject.should_receive(:record).once.with(config.set_greeting.recording.to_hash.merge(interruptible: true, max_duration: 30_000)).and_return(recording_component)
-      should_play file_path
+      subject.should_receive(:record).once.with(config.set_greeting.recording.to_hash.merge(interruptible: true)).and_return recording_component
+      subject.should_receive(:play_audio).with file_path
       subject.should_receive(:menu).once.with(config.set_greeting.after_record,
           { timeout: config.menu_timeout,
             tries: config.menu_tries }, Proc)

data/spec/voicemail/voicemail_controller_spec.rb

@@ -3,20 +3,32 @@ require 'spec_helper'
 describe Voicemail::VoicemailController do
   include VoicemailControllerSpecHelper
 
-  before do
-    subject.should_receive(:answer).once
-  end
-
   describe "#run" do
     context "with a missing mailbox parameter in metadata" do
       let(:metadata) { Hash.new }
 
       it "should raise an error if there is no mailbox in the metadata" do
+        subject.should_receive(:answer).once
         expect { controller.run }.to raise_error ArgumentError
       end
     end
 
+    context "When force_183 is set and there's no mailbox" do
+      let(:mailbox) { nil }
+
+      before { config.force_183 = true  }
+      after  { config.force_183 = false }
+
+      it "should not answer" do
+        should_play config.mailbox_not_found
+        subject.should_receive(:hangup).once
+        controller.run
+      end
+    end
+
     context "with a present mailbox parameter in metadata" do
+      before { subject.should_receive(:answer).once }
+
       context "with an invalid mailbox" do
         let(:mailbox) { nil }
 
@@ -52,14 +64,13 @@ describe Voicemail::VoicemailController do
 
           it "saves the recording" do
             recording_component.should_receive("complete_event.recording.uri").and_return(file_path)
-            subject.should_receive(:record).with(config.recording.to_hash.merge(interruptible: true, max_duration: 30_000, direction: :recv)).and_return(recording_component)
+            subject.should_receive(:record).with(config.recording.to_hash.merge(interruptible: true, direction: :recv)).and_return(recording_component)
             storage_instance.should_receive(:save_recording).with(mailbox[:id], call.from, file_path)
             should_play
             controller.run
           end
         end
       end
-
     end
   end
 end

data/voicemail.gemspec

@@ -7,6 +7,7 @@ Gem::Specification.new do |s|
   s.version     = Voicemail::VERSION
   s.authors     = ["Luca Pradovera"]
   s.email       = ["lpradovera@mojolingo.com"]
+  s.license     = 'MIT'
   s.homepage    = "http://github.com/adhearsion/voicemail"
   s.summary     = %q{Voicemail for Adhearsion}
   s.description = %q{A simple, extensible voicemail implementation}
@@ -17,11 +18,10 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency %q<adhearsion>, [">= 2.3.0"]
-  s.add_runtime_dependency %q<activesupport>
+  s.add_runtime_dependency %q<adhearsion>, ["~> 2.4"]
 
   s.add_development_dependency %q<bundler>
-  s.add_development_dependency %q<rspec>, [">= 2.5.0"]
+  s.add_development_dependency %q<rspec>, ["~> 2.14.0"]
   s.add_development_dependency %q<yard>, ["~> 0.6.0"]
   s.add_development_dependency %q<rake>, [">= 0"]
   s.add_development_dependency %q<guard-rspec>

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: voicemail
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Luca Pradovera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2013-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adhearsion
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +42,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -163,7 +149,8 @@ files:
 - tmp/.gitignore
 - voicemail.gemspec
 homepage: http://github.com/adhearsion/voicemail
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []