adhearsion 2.6.4 → 3.0.0.beta1

data/spec/adhearsion/uri_list_spec.rb

@@ -0,0 +1,88 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Adhearsion::URIList do
+  describe '#size' do
+    subject { super().size }
+    it { is_expected.to eq(0) }
+  end
+
+  context "created with a set of entries" do
+    subject { described_class.new 'http://example.com/hello.mp3', 'http://example.com/goodbye.mp3' }
+
+    describe '#size' do
+      subject { super().size }
+      it { is_expected.to eq(2) }
+    end
+
+    describe '#to_ary' do
+      subject { super().to_ary }
+      it { is_expected.to eq(['http://example.com/hello.mp3', 'http://example.com/goodbye.mp3']) }
+    end
+
+    describe '#to_s' do
+      subject { super().to_s }
+      it { is_expected.to eq("http://example.com/hello.mp3\nhttp://example.com/goodbye.mp3") }
+    end
+  end
+
+  context "created with an array of entries" do
+    subject { described_class.new ['http://example.com/hello.mp3', 'http://example.com/goodbye.mp3'] }
+
+    describe '#size' do
+      subject { super().size }
+      it { is_expected.to eq(2) }
+    end
+
+    describe '#to_ary' do
+      subject { super().to_ary }
+      it { is_expected.to eq(['http://example.com/hello.mp3', 'http://example.com/goodbye.mp3']) }
+    end
+
+    describe '#to_s' do
+      subject { super().to_s }
+      it { is_expected.to eq("http://example.com/hello.mp3\nhttp://example.com/goodbye.mp3") }
+    end
+  end
+
+  context "imported from a string" do
+    let(:string) do
+      <<-STRING
+      http://example.com/hello.mp3
+      http://example.com/goodbye.mp3
+      STRING
+    end
+
+    subject { described_class.import string }
+
+    describe '#size' do
+      subject { super().size }
+      it { is_expected.to eq(2) }
+    end
+
+    describe '#to_ary' do
+      subject { super().to_ary }
+      it { is_expected.to eq(['http://example.com/hello.mp3', 'http://example.com/goodbye.mp3']) }
+    end
+
+    describe '#to_s' do
+      subject { super().to_s }
+      it { is_expected.to eq("http://example.com/hello.mp3\nhttp://example.com/goodbye.mp3") }
+    end
+  end
+
+  describe "comparisons" do
+    context "when the elements are the same" do
+      it "resolves equal" do
+        expect(described_class.new('foo', 'bar')).to eq(described_class.new('foo', 'bar'))
+      end
+    end
+
+    context "when the elements are different" do
+      it "does not resolve equal" do
+        expect(described_class.new('foo', 'baz')).not_to eq(described_class.new('bar', 'baz'))
+      end
+    end
+  end
+end

data/spec/adhearsion_spec.rb

@@ -6,12 +6,12 @@ describe Adhearsion do
   describe "#root=" do
     it "should update properly the config root variable" do
       Adhearsion.root = "./"
-      expect(Adhearsion.config[:platform].root).to eq(Dir.getwd)
+      expect(Adhearsion.config[:core].root).to eq(Dir.getwd)
     end
 
     it "should update properly the config root variable when path is nil" do
       Adhearsion.root = nil
-      expect(Adhearsion.config[:platform].root).to be_nil
+      expect(Adhearsion.config[:core].root).to be_nil
     end
   end
 
@@ -22,18 +22,6 @@ describe Adhearsion do
     end
   end
 
-  describe "#ahn_root=" do
-    it "should update properly the config root variable" do
-      Adhearsion.ahn_root = "./"
-      expect(Adhearsion.config[:platform].root).to eq(Dir.getwd)
-    end
-
-    it "should update properly the config root variable when path is nil" do
-      Adhearsion.ahn_root = nil
-      expect(Adhearsion.config[:platform].root).to be_nil
-    end
-  end
-
   describe "#config" do
     it "should return a Configuration instance" do
       expect(subject.config).to be_instance_of Adhearsion::Configuration
@@ -113,6 +101,93 @@ describe Adhearsion do
     end
   end
 
+  describe '#execute_component' do
+    let(:message)     { Adhearsion::Rayo::Command::Accept.new }
+    let(:response)    { :foo }
+    let(:mock_client) { double 'Client' }
+
+    let(:execute_expectation) { expect(described_class.client).to receive(:execute_command).once }
+
+    before do
+      Adhearsion::Rayo::Initializer.client = mock_client
+      allow(message).to receive_messages :execute! => true
+      message.response = response
+      execute_expectation
+    end
+
+    it "writes a command to the client" do
+      execute_expectation.with(message, :async => true)
+      described_class.execute_component message
+    end
+
+    it "blocks until a response is received" do
+      slow_command = Adhearsion::Rayo::Command::Dial.new
+      slow_command.request!
+      starting_time = Time.now
+      Thread.new do
+        sleep 0.5
+        slow_command.response = response
+      end
+      described_class.execute_component slow_command
+      expect(Time.now - starting_time).to be >= 0.4
+    end
+
+    describe "with a successful response" do
+      it "returns the executed command" do
+        expect(described_class.execute_component(message)).to be message
+      end
+    end
+
+    describe "with an error response" do
+      let(:response) { Exception.new }
+
+      it "raises the error" do
+        expect { described_class.execute_component message }.to raise_error Exception
+      end
+    end
+  end
+
+  describe '#client_with_connection' do
+    let(:mock_connection) { double('Connection').as_null_object }
+
+    context 'with :xmpp' do
+      it 'sets up an XMPP connection, passing options, and a client with the connection attached' do
+        options = {:username => 'foo', :password => 'bar'}
+        expect(Adhearsion::Rayo::Connection::XMPP).to receive(:new).once.with(options).and_return mock_connection
+        client = Adhearsion.client_with_connection :xmpp, options
+        expect(client).to be_a Adhearsion::Rayo::Client
+        expect(client.connection).to be mock_connection
+      end
+    end
+
+    context 'with :XMPP' do
+      it 'sets up an XMPP connection, passing options, and a client with the connection attached' do
+        options = {:username => 'foo', :password => 'bar'}
+        expect(Adhearsion::Rayo::Connection::XMPP).to receive(:new).once.with(options).and_return mock_connection
+        client = Adhearsion.client_with_connection :XMPP, options
+        expect(client).to be_a Adhearsion::Rayo::Client
+        expect(client.connection).to be mock_connection
+      end
+    end
+
+    context 'with :asterisk' do
+      it 'sets up an Asterisk connection, passing options, and a client with the connection attached' do
+        options = {:username => 'foo', :password => 'bar'}
+        expect(Adhearsion::Rayo::Connection::Asterisk).to receive(:new).once.with(options).and_return mock_connection
+        client = Adhearsion.client_with_connection :asterisk, options
+        expect(client).to be_a Adhearsion::Rayo::Client
+        expect(client.connection).to be mock_connection
+      end
+    end
+
+    context 'with :yate' do
+      it 'raises ArgumentError' do
+        options = {:username => 'foo', :password => 'bar'}
+        expect { Adhearsion.client_with_connection :yate, options }.to raise_error(ArgumentError)
+      end
+    end
+  end
+
   it "should have an encoding on all files" do
     Dir['{bin,features,lib,spec}/**/*.rb'].each do |filename|
       File.open filename do |file|

data/spec/fixtures/locale/en.yml

@@ -0,0 +1,13 @@
+en:
+  have_many_cats:
+    audio: have_many_cats.wav
+    text: "I have quite a few cats"
+
+  my_shirt_is_white:
+    audio: my_shirt_is_white.wav
+
+  many_people_out_today:
+    text: There are many people out today
+
+  # Simulating an external, non adhearsion-i18n translation:
+  seventeen: seventeen

data/spec/fixtures/locale/it.yml

@@ -0,0 +1,13 @@
+it:
+  have_many_cats:
+    audio: ho_parecchi_gatti.wav
+    text: "Ho parecchi gatti"
+
+  my_shirt_is_white:
+    audio: la_mia_camicia_e_bianca.wav
+
+  many_people_out_today:
+    text: Ci sono molti persone fuori oggi
+
+  # Simulating an external, non adhearsion-i18n translation:
+  seventeen: diciassette

data/spec/spec_helper.rb

@@ -21,30 +21,43 @@ Bundler.require(:default, :test) if defined?(Bundler)
 Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
-  config.mock_framework = :rspec
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true
   config.color = true
 
+  config.mock_with :rspec do |mocks|
+    mocks.add_stub_and_should_receive_to Celluloid::AbstractProxy
+  end
+
   config.raise_errors_for_deprecations!
 
   config.before :suite do
-    Adhearsion::Logging.start Adhearsion::Logging.default_appenders, :trace, Adhearsion.config.platform.logging.formatter
-    Adhearsion.config.platform.after_hangup_lifetime = 10
+    Adhearsion::Logging.start :trace, Adhearsion.config.core.logging.formatter
+    Adhearsion.config.core.after_hangup_lifetime = 10
     Adhearsion::Initializer.new.initialize_exception_logger
   end
 
   config.before :each do
+    Adhearsion.config.core.i18n.locale_path = ["#{File.dirname(__FILE__)}/fixtures/locale"]
+    Adhearsion::Initializer.new.setup_i18n_load_path
+
     Adhearsion.router = nil
-    allow(Punchblock).to receive(:new_request_id).and_return 'foo'
+    @uuid = SecureRandom.uuid
+    allow(Adhearsion).to receive(:new_request_id).and_return @uuid
   end
 
   config.after :each do
     Timecop.return
+    if defined?(:Celluloid)
+      Celluloid.shutdown
+      Adhearsion.active_calls = nil
+      Celluloid.boot
+      Adhearsion::Events.refresh!
+    end
   end
 end
 
-Adhearsion::Events.exeption do |e|
+Adhearsion::Events.exception do |e|
   puts e.message
   puts e.backtrace.join("\n")
 end

data/spec/support/call_controller_test_helpers.rb

@@ -46,11 +46,12 @@ module CallControllerTestHelpers
     else
       expectation.and_return component
     end
+    expectation
   end
 
   def expect_input_component_complete_event(utterance)
-    complete_event = Punchblock::Event::Complete.new
+    complete_event = Adhearsion::Event::Complete.new
     allow(complete_event).to receive_messages reason: double(utterance: utterance, name: :input)
-    allow_any_instance_of(Punchblock::Component::Input).to receive_messages(complete?: true, complete_event: complete_event)
+    allow_any_instance_of(Adhearsion::Rayo::Component::Input).to receive_messages(complete?: true, complete_event: complete_event)
   end
 end

data/spec/support/initializer_stubs.rb

@@ -2,11 +2,13 @@
 
 module InitializerStubs
   UNWANTED_BEHAVIOR = {
-    Adhearsion::Initializer => [:debugging_log, :initialize_log_paths, :update_rails_env_var, :require, :load, :init_plugins, :run_plugins]
+    Adhearsion::Initializer => [:debugging_log, :require, :load, :init_plugins, :run_plugins]
   } unless defined? UNWANTED_BEHAVIOR
 
   def stub_behavior_for_initializer_with_no_path_changing_behavior
     stub_unwanted_behavior
+    allow(Adhearsion::Rayo::Initializer).to receive(:init).and_return(true)
+    allow(Adhearsion::Rayo::Initializer).to receive(:run).and_return(true)
     yield if block_given?
   ensure
     unstub_directory_changing_behavior

data/spec/support/punchblock_examples.rb

@@ -0,0 +1,65 @@
+# encoding: utf-8
+
+require 'ruby_ami'
+
+def parse_stanza(xml)
+  Nokogiri::XML.parse xml, nil, nil, Nokogiri::XML::ParseOptions::NOBLANKS
+end
+
+def import_stanza(xml)
+  Blather::Stanza.import parse_stanza(xml).root
+end
+
+def stub_uuids(value)
+  allow(RubyAMI).to receive_messages :new_uuid => value
+  allow(Adhearsion).to receive_messages :new_uuid => value
+end
+
+# FIXME: change this to rayo_event?  It can be ambigous
+shared_examples_for 'event' do
+  describe '#target_call_id' do
+    subject { super().target_call_id }
+    it { is_expected.to eq('9f00061') }
+  end
+
+  describe '#component_id' do
+    subject { super().component_id }
+    it { is_expected.to eq('1') }
+  end
+end
+
+shared_examples_for 'command_headers' do
+end
+
+shared_examples_for 'event_headers' do
+end
+
+shared_examples_for 'key_value_pairs' do
+  it 'will auto-inherit nodes' do
+    n = parse_stanza "<#{element_name} name='boo' value='bah' />"
+    h = described_class.new n.root
+    expect(h.name).to eq('boo')
+    expect(h.value).to eq('bah')
+  end
+
+  it 'has a name attribute' do
+    n = described_class.new :boo, 'bah'
+    expect(n.name).to eq('boo')
+    n.name = :foo
+    expect(n.name).to eq('foo')
+  end
+
+  it 'has a value param' do
+    n = described_class.new :boo, 'en'
+    expect(n.value).to eq('en')
+    n.value = 'de'
+    expect(n.value).to eq('de')
+  end
+
+  it 'can determine equality' do
+    a = described_class.new :boo, 'bah'
+    expect(a).to eq(described_class.new(:boo, 'bah'))
+    expect(a).not_to eq(described_class.new(:bah, 'bah'))
+    expect(a).not_to eq(described_class.new(:boo, 'boo'))
+  end
+end

data/spec/support/punchblock_mocks.rb

@@ -7,3 +7,15 @@ def mock_offer(id = nil, headers = {})
     offer.as_null_object
   end
 end
+
+module HasMockCallbackConnection
+  def self.included(test_case)
+    test_case.let(:connection) do
+      double('Connection').tap do |mc|
+        allow(mc).to receive :handle_event do |event|
+          original_command.add_event event
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adhearsion
 version: !ruby/object:Gem::Version
-  version: 2.6.4
+  version: 3.0.0.beta1
 platform: ruby
 authors:
 - Jay Phillips
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-07 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -47,6 +47,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
+- !ruby/object:Gem::Dependency
+  name: blather
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -67,14 +81,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: countdownlatch
   requirement: !ruby/object:Gem::Requirement
@@ -118,19 +132,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: girl_friday
+  name: future-resource
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: has-guarded-handlers
   requirement: !ruby/object:Gem::Requirement
@@ -138,6 +152,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -145,48 +162,71 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.3
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: logging
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.6
 - !ruby/object:Gem::Dependency
-  name: punchblock
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -201,20 +241,90 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: reel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: reel-rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: ruby_ami
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: ruby_jid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: ruby_speech
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: state_machine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -229,6 +339,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.18.0
+- !ruby/object:Gem::Dependency
+  name: virtus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -243,6 +367,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: ci_reporter_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: ci_reporter_cucumber
+  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: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -299,6 +451,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  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: simplecov-rcov
+  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: yard
   requirement: !ruby/object:Gem::Requirement
@@ -379,12 +559,9 @@ files:
 - cucumber.yml
 - features/cli_basic.feature
 - features/cli_create.feature
-- features/cli_daemon.feature
 - features/cli_generate.feature
 - features/cli_plugin.feature
-- features/cli_restart.feature
 - features/cli_start.feature
-- features/cli_stop.feature
 - features/controller_generator.feature
 - features/plugin_generator.feature
 - features/step_definitions/app_generator_steps.rb
@@ -395,23 +572,16 @@ files:
 - lib/adhearsion/call_controller.rb
 - lib/adhearsion/call_controller/dial.rb
 - lib/adhearsion/call_controller/input.rb
-- lib/adhearsion/call_controller/menu_dsl.rb
-- lib/adhearsion/call_controller/menu_dsl/array_match_calculator.rb
-- lib/adhearsion/call_controller/menu_dsl/calculated_match.rb
-- lib/adhearsion/call_controller/menu_dsl/calculated_match_collection.rb
-- lib/adhearsion/call_controller/menu_dsl/fixnum_match_calculator.rb
-- lib/adhearsion/call_controller/menu_dsl/match_calculator.rb
-- lib/adhearsion/call_controller/menu_dsl/menu.rb
-- lib/adhearsion/call_controller/menu_dsl/menu_builder.rb
-- lib/adhearsion/call_controller/menu_dsl/range_match_calculator.rb
-- lib/adhearsion/call_controller/menu_dsl/string_match_calculator.rb
+- lib/adhearsion/call_controller/input/ask_grammar_builder.rb
+- lib/adhearsion/call_controller/input/menu_builder.rb
+- lib/adhearsion/call_controller/input/prompt_builder.rb
+- lib/adhearsion/call_controller/input/result.rb
 - lib/adhearsion/call_controller/output.rb
 - lib/adhearsion/call_controller/output/abstract_player.rb
 - lib/adhearsion/call_controller/output/async_player.rb
 - lib/adhearsion/call_controller/output/formatter.rb
 - lib/adhearsion/call_controller/output/player.rb
 - lib/adhearsion/call_controller/record.rb
-- lib/adhearsion/call_controller/utility.rb
 - lib/adhearsion/calls.rb
 - lib/adhearsion/cli.rb
 - lib/adhearsion/cli_commands.rb
@@ -420,9 +590,26 @@ files:
 - lib/adhearsion/cli_commands/thor_errors.rb
 - lib/adhearsion/configuration.rb
 - lib/adhearsion/console.rb
+- lib/adhearsion/core_ext/blather/stanza.rb
+- lib/adhearsion/core_ext/blather/stanza/presence.rb
+- lib/adhearsion/error.rb
+- lib/adhearsion/event.rb
+- lib/adhearsion/event/active_speaker.rb
+- lib/adhearsion/event/answered.rb
+- lib/adhearsion/event/asterisk.rb
+- lib/adhearsion/event/asterisk/ami.rb
+- lib/adhearsion/event/complete.rb
+- lib/adhearsion/event/dtmf.rb
+- lib/adhearsion/event/end.rb
+- lib/adhearsion/event/input_timers_started.rb
+- lib/adhearsion/event/joined.rb
+- lib/adhearsion/event/offer.rb
+- lib/adhearsion/event/ringing.rb
+- lib/adhearsion/event/started_speaking.rb
+- lib/adhearsion/event/stopped_speaking.rb
+- lib/adhearsion/event/unjoined.rb
 - lib/adhearsion/events.rb
 - lib/adhearsion/foundation.rb
-- lib/adhearsion/foundation/custom_daemonizer.rb
 - lib/adhearsion/foundation/exception_handler.rb
 - lib/adhearsion/foundation/libc.rb
 - lib/adhearsion/foundation/object.rb
@@ -435,9 +622,12 @@ files:
 - lib/adhearsion/generators/app/templates/README.md
 - lib/adhearsion/generators/app/templates/Rakefile
 - lib/adhearsion/generators/app/templates/adhearsion.erb
+- lib/adhearsion/generators/app/templates/config.ru
 - lib/adhearsion/generators/app/templates/config/environment.rb
+- lib/adhearsion/generators/app/templates/en.yml
 - lib/adhearsion/generators/app/templates/events.erb
 - lib/adhearsion/generators/app/templates/gitignore
+- lib/adhearsion/generators/app/templates/hello_world.wav
 - lib/adhearsion/generators/app/templates/routes.erb
 - lib/adhearsion/generators/app/templates/rspec
 - lib/adhearsion/generators/app/templates/script/ahn
@@ -460,6 +650,8 @@ files:
 - lib/adhearsion/generators/plugin/templates/plugin-template.gemspec.tt
 - lib/adhearsion/generators/plugin/templates/spec/plugin-template/controller_methods_spec.rb.tt
 - lib/adhearsion/generators/plugin/templates/spec/spec_helper.rb.tt
+- lib/adhearsion/has_headers.rb
+- lib/adhearsion/http_server.rb
 - lib/adhearsion/initializer.rb
 - lib/adhearsion/linux_proc_name.rb
 - lib/adhearsion/logging.rb
@@ -468,8 +660,45 @@ files:
 - lib/adhearsion/plugin/collection.rb
 - lib/adhearsion/plugin/initializer.rb
 - lib/adhearsion/process.rb
-- lib/adhearsion/punchblock_plugin.rb
-- lib/adhearsion/punchblock_plugin/initializer.rb
+- lib/adhearsion/protocol_error.rb
+- lib/adhearsion/rayo.rb
+- lib/adhearsion/rayo/client.rb
+- lib/adhearsion/rayo/client/component_registry.rb
+- lib/adhearsion/rayo/command.rb
+- lib/adhearsion/rayo/command/accept.rb
+- lib/adhearsion/rayo/command/answer.rb
+- lib/adhearsion/rayo/command/dial.rb
+- lib/adhearsion/rayo/command/hangup.rb
+- lib/adhearsion/rayo/command/join.rb
+- lib/adhearsion/rayo/command/mute.rb
+- lib/adhearsion/rayo/command/redirect.rb
+- lib/adhearsion/rayo/command/reject.rb
+- lib/adhearsion/rayo/command/unjoin.rb
+- lib/adhearsion/rayo/command/unmute.rb
+- lib/adhearsion/rayo/command_node.rb
+- lib/adhearsion/rayo/component.rb
+- lib/adhearsion/rayo/component/asterisk.rb
+- lib/adhearsion/rayo/component/asterisk/agi.rb
+- lib/adhearsion/rayo/component/asterisk/agi/command.rb
+- lib/adhearsion/rayo/component/asterisk/ami.rb
+- lib/adhearsion/rayo/component/asterisk/ami/action.rb
+- lib/adhearsion/rayo/component/component_node.rb
+- lib/adhearsion/rayo/component/input.rb
+- lib/adhearsion/rayo/component/output.rb
+- lib/adhearsion/rayo/component/prompt.rb
+- lib/adhearsion/rayo/component/receive_fax.rb
+- lib/adhearsion/rayo/component/record.rb
+- lib/adhearsion/rayo/component/send_fax.rb
+- lib/adhearsion/rayo/component/stop.rb
+- lib/adhearsion/rayo/connection.rb
+- lib/adhearsion/rayo/connection/asterisk.rb
+- lib/adhearsion/rayo/connection/connected.rb
+- lib/adhearsion/rayo/connection/generic_connection.rb
+- lib/adhearsion/rayo/connection/xmpp.rb
+- lib/adhearsion/rayo/disconnected_error.rb
+- lib/adhearsion/rayo/initializer.rb
+- lib/adhearsion/rayo/rayo_node.rb
+- lib/adhearsion/rayo/ref.rb
 - lib/adhearsion/router.rb
 - lib/adhearsion/router/evented_route.rb
 - lib/adhearsion/router/openended_route.rb
@@ -482,32 +711,59 @@ files:
 - lib/adhearsion/tasks/configuration.rb
 - lib/adhearsion/tasks/debugging.rb
 - lib/adhearsion/tasks/environment.rb
+- lib/adhearsion/tasks/i18n.rb
 - lib/adhearsion/tasks/plugins.rb
+- lib/adhearsion/translator.rb
+- lib/adhearsion/translator/asterisk.rb
+- lib/adhearsion/translator/asterisk/agi_app.rb
+- lib/adhearsion/translator/asterisk/agi_command.rb
+- lib/adhearsion/translator/asterisk/ami_error_converter.rb
+- lib/adhearsion/translator/asterisk/call.rb
+- lib/adhearsion/translator/asterisk/channel.rb
+- lib/adhearsion/translator/asterisk/component.rb
+- lib/adhearsion/translator/asterisk/component/asterisk.rb
+- lib/adhearsion/translator/asterisk/component/asterisk/agi_command.rb
+- lib/adhearsion/translator/asterisk/component/asterisk/ami_action.rb
+- lib/adhearsion/translator/asterisk/component/composed_prompt.rb
+- lib/adhearsion/translator/asterisk/component/dtmf_recognizer.rb
+- lib/adhearsion/translator/asterisk/component/input.rb
+- lib/adhearsion/translator/asterisk/component/input_component.rb
+- lib/adhearsion/translator/asterisk/component/mrcp_native_prompt.rb
+- lib/adhearsion/translator/asterisk/component/mrcp_prompt.rb
+- lib/adhearsion/translator/asterisk/component/mrcp_recog_prompt.rb
+- lib/adhearsion/translator/asterisk/component/output.rb
+- lib/adhearsion/translator/asterisk/component/record.rb
+- lib/adhearsion/translator/asterisk/component/stop_by_redirect.rb
+- lib/adhearsion/translator/asterisk/unimrcp_app.rb
+- lib/adhearsion/uri_list.rb
 - lib/adhearsion/version.rb
 - pre-commit
-- scripts/cloc-1.64.pl
 - spec/adhearsion/call_controller/dial_spec.rb
 - spec/adhearsion/call_controller/input_spec.rb
-- spec/adhearsion/call_controller/menu_dsl/array_match_calculator_spec.rb
-- spec/adhearsion/call_controller/menu_dsl/calculated_match_collection_spec.rb
-- spec/adhearsion/call_controller/menu_dsl/calculated_match_spec.rb
-- spec/adhearsion/call_controller/menu_dsl/fixnum_match_calculator_spec.rb
-- spec/adhearsion/call_controller/menu_dsl/match_calculator_spec.rb
-- spec/adhearsion/call_controller/menu_dsl/menu_builder_spec.rb
-- spec/adhearsion/call_controller/menu_dsl/menu_spec.rb
-- spec/adhearsion/call_controller/menu_dsl/range_match_calculator_spec.rb
-- spec/adhearsion/call_controller/menu_dsl/string_match_calculator_spec.rb
 - spec/adhearsion/call_controller/output/async_player_spec.rb
 - spec/adhearsion/call_controller/output/formatter_spec.rb
 - spec/adhearsion/call_controller/output/player_spec.rb
 - spec/adhearsion/call_controller/output_spec.rb
 - spec/adhearsion/call_controller/record_spec.rb
-- spec/adhearsion/call_controller/utility_spec.rb
 - spec/adhearsion/call_controller_spec.rb
 - spec/adhearsion/call_spec.rb
 - spec/adhearsion/calls_spec.rb
 - spec/adhearsion/configuration_spec.rb
 - spec/adhearsion/console_spec.rb
+- spec/adhearsion/event/answered_spec.rb
+- spec/adhearsion/event/asterisk/Find Results
+- spec/adhearsion/event/asterisk/ami_spec.rb
+- spec/adhearsion/event/complete_spec.rb
+- spec/adhearsion/event/dtmf_spec.rb
+- spec/adhearsion/event/end_spec.rb
+- spec/adhearsion/event/input_timers_started_spec.rb
+- spec/adhearsion/event/joined_spec.rb
+- spec/adhearsion/event/offer_spec.rb
+- spec/adhearsion/event/ringing_spec.rb
+- spec/adhearsion/event/started_speaking_spec.rb
+- spec/adhearsion/event/stopped_speaking_spec.rb
+- spec/adhearsion/event/unjoined_spec.rb
+- spec/adhearsion/event/untitled
 - spec/adhearsion/events_spec.rb
 - spec/adhearsion/generators_spec.rb
 - spec/adhearsion/initializer_spec.rb
@@ -515,8 +771,34 @@ files:
 - spec/adhearsion/outbound_call_spec.rb
 - spec/adhearsion/plugin_spec.rb
 - spec/adhearsion/process_spec.rb
-- spec/adhearsion/punchblock_plugin/initializer_spec.rb
-- spec/adhearsion/punchblock_plugin_spec.rb
+- spec/adhearsion/protocol_error_spec.rb
+- spec/adhearsion/rayo/client/component_registry_spec.rb
+- spec/adhearsion/rayo/client_spec.rb
+- spec/adhearsion/rayo/command/accept_spec.rb
+- spec/adhearsion/rayo/command/answer_spec.rb
+- spec/adhearsion/rayo/command/dial_spec.rb
+- spec/adhearsion/rayo/command/hangup_spec.rb
+- spec/adhearsion/rayo/command/join_spec.rb
+- spec/adhearsion/rayo/command/mute_spec.rb
+- spec/adhearsion/rayo/command/redirect_spec.rb
+- spec/adhearsion/rayo/command/reject_spec.rb
+- spec/adhearsion/rayo/command/unjoin_spec.rb
+- spec/adhearsion/rayo/command/unmute_spec.rb
+- spec/adhearsion/rayo/command_node_spec.rb
+- spec/adhearsion/rayo/component/asterisk/agi/command_spec.rb
+- spec/adhearsion/rayo/component/asterisk/ami/action_spec.rb
+- spec/adhearsion/rayo/component/component_node_spec.rb
+- spec/adhearsion/rayo/component/input_spec.rb
+- spec/adhearsion/rayo/component/output_spec.rb
+- spec/adhearsion/rayo/component/prompt_spec.rb
+- spec/adhearsion/rayo/component/receive_fax_spec.rb
+- spec/adhearsion/rayo/component/record_spec.rb
+- spec/adhearsion/rayo/component/send_fax_spec.rb
+- spec/adhearsion/rayo/connection/asterisk_spec.rb
+- spec/adhearsion/rayo/connection/xmpp_spec.rb
+- spec/adhearsion/rayo/initializer_spec.rb
+- spec/adhearsion/rayo/ref_spec.rb
+- spec/adhearsion/rayo_spec.rb
 - spec/adhearsion/router/evented_route_spec.rb
 - spec/adhearsion/router/openended_route_spec.rb
 - spec/adhearsion/router/route_spec.rb
@@ -524,12 +806,28 @@ files:
 - spec/adhearsion/router_spec.rb
 - spec/adhearsion/statistics/dump_spec.rb
 - spec/adhearsion/statistics_spec.rb
+- spec/adhearsion/translator/asterisk/call_spec.rb
+- spec/adhearsion/translator/asterisk/component/asterisk/agi_command_spec.rb
+- spec/adhearsion/translator/asterisk/component/asterisk/ami_action_spec.rb
+- spec/adhearsion/translator/asterisk/component/composed_prompt_spec.rb
+- spec/adhearsion/translator/asterisk/component/input_spec.rb
+- spec/adhearsion/translator/asterisk/component/mrcp_native_prompt_spec.rb
+- spec/adhearsion/translator/asterisk/component/mrcp_prompt_spec.rb
+- spec/adhearsion/translator/asterisk/component/output_spec.rb
+- spec/adhearsion/translator/asterisk/component/record_spec.rb
+- spec/adhearsion/translator/asterisk/component/stop_by_redirect_spec.rb
+- spec/adhearsion/translator/asterisk/component_spec.rb
+- spec/adhearsion/translator/asterisk_spec.rb
+- spec/adhearsion/uri_list_spec.rb
 - spec/adhearsion_spec.rb
 - spec/capture_warnings.rb
+- spec/fixtures/locale/en.yml
+- spec/fixtures/locale/it.yml
 - spec/spec_helper.rb
 - spec/support/call_controller_test_helpers.rb
 - spec/support/initializer_stubs.rb
 - spec/support/logging_helpers.rb
+- spec/support/punchblock_examples.rb
 - spec/support/punchblock_mocks.rb
 homepage: http://adhearsion.com
 licenses:
@@ -543,27 +841,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Adhearsion, open-source telephony development framework
 test_files:
 - features/cli_basic.feature
 - features/cli_create.feature
-- features/cli_daemon.feature
 - features/cli_generate.feature
 - features/cli_plugin.feature
-- features/cli_restart.feature
 - features/cli_start.feature
-- features/cli_stop.feature
 - features/controller_generator.feature
 - features/plugin_generator.feature
 - features/step_definitions/app_generator_steps.rb
@@ -571,26 +866,30 @@ test_files:
 - features/support/env.rb
 - spec/adhearsion/call_controller/dial_spec.rb
 - spec/adhearsion/call_controller/input_spec.rb
-- spec/adhearsion/call_controller/menu_dsl/array_match_calculator_spec.rb
-- spec/adhearsion/call_controller/menu_dsl/calculated_match_collection_spec.rb
-- spec/adhearsion/call_controller/menu_dsl/calculated_match_spec.rb
-- spec/adhearsion/call_controller/menu_dsl/fixnum_match_calculator_spec.rb
-- spec/adhearsion/call_controller/menu_dsl/match_calculator_spec.rb
-- spec/adhearsion/call_controller/menu_dsl/menu_builder_spec.rb
-- spec/adhearsion/call_controller/menu_dsl/menu_spec.rb
-- spec/adhearsion/call_controller/menu_dsl/range_match_calculator_spec.rb
-- spec/adhearsion/call_controller/menu_dsl/string_match_calculator_spec.rb
 - spec/adhearsion/call_controller/output/async_player_spec.rb
 - spec/adhearsion/call_controller/output/formatter_spec.rb
 - spec/adhearsion/call_controller/output/player_spec.rb
 - spec/adhearsion/call_controller/output_spec.rb
 - spec/adhearsion/call_controller/record_spec.rb
-- spec/adhearsion/call_controller/utility_spec.rb
 - spec/adhearsion/call_controller_spec.rb
 - spec/adhearsion/call_spec.rb
 - spec/adhearsion/calls_spec.rb
 - spec/adhearsion/configuration_spec.rb
 - spec/adhearsion/console_spec.rb
+- spec/adhearsion/event/answered_spec.rb
+- spec/adhearsion/event/asterisk/Find Results
+- spec/adhearsion/event/asterisk/ami_spec.rb
+- spec/adhearsion/event/complete_spec.rb
+- spec/adhearsion/event/dtmf_spec.rb
+- spec/adhearsion/event/end_spec.rb
+- spec/adhearsion/event/input_timers_started_spec.rb
+- spec/adhearsion/event/joined_spec.rb
+- spec/adhearsion/event/offer_spec.rb
+- spec/adhearsion/event/ringing_spec.rb
+- spec/adhearsion/event/started_speaking_spec.rb
+- spec/adhearsion/event/stopped_speaking_spec.rb
+- spec/adhearsion/event/unjoined_spec.rb
+- spec/adhearsion/event/untitled
 - spec/adhearsion/events_spec.rb
 - spec/adhearsion/generators_spec.rb
 - spec/adhearsion/initializer_spec.rb
@@ -598,8 +897,34 @@ test_files:
 - spec/adhearsion/outbound_call_spec.rb
 - spec/adhearsion/plugin_spec.rb
 - spec/adhearsion/process_spec.rb
-- spec/adhearsion/punchblock_plugin/initializer_spec.rb
-- spec/adhearsion/punchblock_plugin_spec.rb
+- spec/adhearsion/protocol_error_spec.rb
+- spec/adhearsion/rayo/client/component_registry_spec.rb
+- spec/adhearsion/rayo/client_spec.rb
+- spec/adhearsion/rayo/command/accept_spec.rb
+- spec/adhearsion/rayo/command/answer_spec.rb
+- spec/adhearsion/rayo/command/dial_spec.rb
+- spec/adhearsion/rayo/command/hangup_spec.rb
+- spec/adhearsion/rayo/command/join_spec.rb
+- spec/adhearsion/rayo/command/mute_spec.rb
+- spec/adhearsion/rayo/command/redirect_spec.rb
+- spec/adhearsion/rayo/command/reject_spec.rb
+- spec/adhearsion/rayo/command/unjoin_spec.rb
+- spec/adhearsion/rayo/command/unmute_spec.rb
+- spec/adhearsion/rayo/command_node_spec.rb
+- spec/adhearsion/rayo/component/asterisk/agi/command_spec.rb
+- spec/adhearsion/rayo/component/asterisk/ami/action_spec.rb
+- spec/adhearsion/rayo/component/component_node_spec.rb
+- spec/adhearsion/rayo/component/input_spec.rb
+- spec/adhearsion/rayo/component/output_spec.rb
+- spec/adhearsion/rayo/component/prompt_spec.rb
+- spec/adhearsion/rayo/component/receive_fax_spec.rb
+- spec/adhearsion/rayo/component/record_spec.rb
+- spec/adhearsion/rayo/component/send_fax_spec.rb
+- spec/adhearsion/rayo/connection/asterisk_spec.rb
+- spec/adhearsion/rayo/connection/xmpp_spec.rb
+- spec/adhearsion/rayo/initializer_spec.rb
+- spec/adhearsion/rayo/ref_spec.rb
+- spec/adhearsion/rayo_spec.rb
 - spec/adhearsion/router/evented_route_spec.rb
 - spec/adhearsion/router/openended_route_spec.rb
 - spec/adhearsion/router/route_spec.rb
@@ -607,10 +932,27 @@ test_files:
 - spec/adhearsion/router_spec.rb
 - spec/adhearsion/statistics/dump_spec.rb
 - spec/adhearsion/statistics_spec.rb
+- spec/adhearsion/translator/asterisk/call_spec.rb
+- spec/adhearsion/translator/asterisk/component/asterisk/agi_command_spec.rb
+- spec/adhearsion/translator/asterisk/component/asterisk/ami_action_spec.rb
+- spec/adhearsion/translator/asterisk/component/composed_prompt_spec.rb
+- spec/adhearsion/translator/asterisk/component/input_spec.rb
+- spec/adhearsion/translator/asterisk/component/mrcp_native_prompt_spec.rb
+- spec/adhearsion/translator/asterisk/component/mrcp_prompt_spec.rb
+- spec/adhearsion/translator/asterisk/component/output_spec.rb
+- spec/adhearsion/translator/asterisk/component/record_spec.rb
+- spec/adhearsion/translator/asterisk/component/stop_by_redirect_spec.rb
+- spec/adhearsion/translator/asterisk/component_spec.rb
+- spec/adhearsion/translator/asterisk_spec.rb
+- spec/adhearsion/uri_list_spec.rb
 - spec/adhearsion_spec.rb
 - spec/capture_warnings.rb
+- spec/fixtures/locale/en.yml
+- spec/fixtures/locale/it.yml
 - spec/spec_helper.rb
 - spec/support/call_controller_test_helpers.rb
 - spec/support/initializer_stubs.rb
 - spec/support/logging_helpers.rb
+- spec/support/punchblock_examples.rb
 - spec/support/punchblock_mocks.rb
+has_rdoc: