Compatibility with Adhearsion 3

.travis.yml

@@ -1,14 +1,15 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - jruby
-  - rbx-2.1.1
+  - 2.2.0
+  - jruby-9.0.1.0
+  - jruby-head
   - ruby-head
 matrix:
   allow_failures:
-    - rvm: rbx-2.1.1
+    - rvm: jruby-head
     - rvm: ruby-head
 notifications:
-  irc: "irc.freenode.org#adhearsion"
+  irc: "irc.freenode.org#adhearsion"
+  slack:
+    secure: Y7EqF/9FY7mca63c1DM7kEr34fNtFclWXJj9vLqVQJwR3rCDZUZSD8DlqHJDwE6KRCCDsSkyV4lihCim+GEM28CRcJir0AEUJhXHvIMckjH7n38W9OGN26RuJGZTapjgCSMOBeq0YpSe6dAnZeRpZRJxsTFtP5ptLD5RRjIMzZM=
+sudo: false

CHANGELOG.md

@@ -1,4 +1,5 @@
 # develop
+  * CHANGE: Drop support for Ruby < 2.2, which is required by Adhearsion 3
   * BUG - Listening to new messages needs to set the `new_or_saved` metadata. Otherwise, after visiting saved messages, the status is always `:saved`
   * FEATURE - Refactor voicemail storage (backward incompatible change)
     * Pass storage instance in metadata to all controllers

Gemfile

@@ -1,3 +1,5 @@
 source "http://rubygems.org"
 
 gemspec
+
+gem 'ahnsay', github: 'adhearsion/ahnsay', branch: 'feature/adhearsion-3'

lib/voicemail.rb

@@ -1,5 +1,4 @@
 require 'adhearsion'
-require 'adhearsion-i18n'
 
 module Voicemail; end
 require "voicemail/version"

lib/voicemail/storage_generic.rb

@@ -86,7 +86,7 @@ def change_pin_for_mailbox(mailbox_id, new_pin)
     # @param mailbox_id The mailbox's ID
     # @param type[Symbol] The type of message to be created (e.g. :new or :saved)
     # @param from[String] The phone number of the message's sender
-    # @param recording_object[Punchblock::Component::Record] The recording result from Adhearsion
+    # @param recording_object[Adhearsion::Rayo::Component::Record] The recording result from Adhearsion
     #
     def save_recording(mailbox_id, type, from, recording_object)
     end

spec/voicemail/intro_message_creator_spec.rb

@@ -50,7 +50,7 @@ class MyCallController < Adhearsion::CallController
       end
 
       context 'in :ahn_say mode' do
-        let!(:ahn_config) { flexmock(Adhearsion.config, punchblock: OpenStruct.new, ahnsay: OpenStruct.new(sounds_dir: '/')) }
+        let!(:ahn_config) { flexmock(Adhearsion.config, core: OpenStruct.new, ahnsay: OpenStruct.new(sounds_dir: '/')) }
 
         before do
           config.numeric_method  = :ahn_say

voicemail.gemspec

@@ -18,8 +18,7 @@ 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.4"]
-  s.add_runtime_dependency %q<adhearsion-i18n>, ["~> 0.0"]
+  s.add_runtime_dependency %q<adhearsion>, ["~> 3.0.0.rc1"]
 
   s.add_development_dependency %q<bundler>
   s.add_development_dependency %q<rspec>, ["~> 2.14.0"]