adhearsion 3.0.0.beta2 → 3.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3cc409522daab633c1bc664407fdfc6a5108694
-  data.tar.gz: 5c9a537a64f4a571916f1fd90bce584b9ea4ab95
+  metadata.gz: 58bfea2313c16c16cb6cf6ee34738c67e5ade786
+  data.tar.gz: 9f44a7a42185fa285372829b26d157dab2e22c99
 SHA512:
-  metadata.gz: 5a1567863c4da74228af44de62df55dc68cc4d2dca383e9c3719b7d079131035462c42a8687b956459115f514a59edf6a5affd7059c34a3199aaa1a856538a3d
-  data.tar.gz: 2de7f4d8e52804198127af271104a7c52335c67a4bf3a20b613a3bef858afd6b4bb9d6b2135ef267c535d77701ad09e2c0968fe12036c80de24b83f72d4f5275
+  metadata.gz: e9aa1a8e2ed989b75d65196457652da368a0d50cf1368ba6817f5e48a88d47afcc7703b1340c555f0a41c9abca44b584aabf1d376ca01afcbbd5317a55dde0d4
+  data.tar.gz: b05beee7c6cf383718cb4c94323dc652667ca2468ef7345a5f5cb87780a952964b67aeb7f8c50cc0f6a795ebb59089e663559f2440eb625ae5c24edbe0320ce0

data/.travis.yml

@@ -1,9 +1,8 @@
 language: ruby
 rvm:
-  - 2.2.0
-  - 2.2.1
   - 2.2.2
-  - jruby-9.0.0.0
+  - 2.3.0
+  - jruby-9.0.4.0
   - ruby-head
 jdk:
   - openjdk7 # for jruby

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # [develop](https://github.com/adhearsion/adhearsion)
 
+# [3.0.0.rc1](https://github.com/adhearsion/adhearsion/compare/v3.0.0.beta2...v3.0.0.rc1) - [2016-01-07](https://rubygems.org/gems/adhearsion/versions/3.0.0.rc1)
+  * Bugfix: Concurrent access to call collection should not be permitted. See [#589](https://github.com/adhearsion/adhearsion/issues/589)
+  * Bugfix: Reduced log spam inspecting large controller metadata. We now only log controller names internally; any logging of metadata must happen in the app.
+
 # [3.0.0.beta2](https://github.com/adhearsion/adhearsion/compare/v3.0.0.beta1...v3.0.0.beta2) - [2015-12-18](https://rubygems.org/gems/adhearsion/versions/3.0.0.beta2)
   * Bugfix: Ensure components are deregistered from asterisk translator once the call is ended ([#582](https://github.com/adhearsion/adhearsion/pull/582))
   * Change: Define configuration per-environment for any environment name and without colliding with plugin names. See [#442](https://github.com/adhearsion/adhearsion/issues/442). Syntax is now `config.env(:development).foo = :bar` instead of `config.development.foo = :bar`.

data/adhearsion.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'activesupport', [">= 3.0.0", "< 5.0.0"]
   s.add_runtime_dependency 'adhearsion-loquacious', ["~> 1.9"]
-  s.add_runtime_dependency 'blather', ["~> 1.0"]
+  s.add_runtime_dependency 'blather', ["~> 1.2"]
   s.add_runtime_dependency 'bundler', ["~> 1.0"]
   s.add_runtime_dependency 'celluloid', ["~> 0.16.0"]
   s.add_runtime_dependency 'countdownlatch'

data/lib/adhearsion/call_controller.rb

@@ -132,7 +132,7 @@ module Adhearsion
       raise
     ensure
       after
-      logger.debug "Finished executing controller #{self.inspect}"
+      logger.debug "Finished executing controller #{self.class}"
     end
 
     #

data/lib/adhearsion/calls.rb

@@ -22,26 +22,30 @@ module Adhearsion
     end
 
     def remove_inactive_call(call)
-      if call_is_dead?(call)
-        call_id = key call
-        delete call_id if call_id
-
-        remove_call_uri call
-      elsif call.respond_to?(:id)
-        delete call.id
-        remove_call_uri call
-      else
-        call_actor = delete call
-        remove_call_uri call_actor
+      @mutex.synchronize do
+        if call_is_dead?(call)
+          call_id = key call
+          delete call_id if call_id
+
+          remove_call_uri call
+        elsif call.respond_to?(:id)
+          delete call.id
+          remove_call_uri call
+        else
+          call_actor = delete call
+          remove_call_uri call_actor
+        end
       end
     end
 
     def with_tag(tag)
-      values.find_all do |call|
-        begin
-          call.tagged_with? tag
-        rescue Call::ExpiredError
-          false
+      @mutex.synchronize do
+        values.find_all do |call|
+          begin
+            call.tagged_with? tag
+          rescue Call::ExpiredError
+            false
+          end
         end
       end
     end

data/lib/adhearsion/translator/asterisk.rb

@@ -124,7 +124,9 @@ module Adhearsion
           begin
             call.execute_command command
           rescue => e
+            Adhearsion::Events.trigger :exception, [e, logger]
             deregister_call call.id, call.channel
+            command.response = Adhearsion::ProtocolError.new.setup :error, "Unknown error executing command on call #{command.target_call_id}", command.target_call_id
           end
         else
           command.response = Adhearsion::ProtocolError.new.setup :item_not_found, "Could not find a call with ID #{command.target_call_id}", command.target_call_id

data/lib/adhearsion/translator/asterisk/component/mrcp_prompt.rb

@@ -19,6 +19,13 @@ module Adhearsion
             raise OptionError, 'Only one document is allowed.' if output_node.render_documents.count > 1
             raise OptionError, 'A grammar is required.' unless input_node.grammars.count > 0
 
+            begin
+              render_doc
+            rescue => e
+              logger.error e
+              raise OptionError, 'The requested render document could not be parsed.'
+            end
+
             super
           end
 
@@ -35,11 +42,13 @@ module Adhearsion
           end
 
           def render_doc
-            d = output_node.render_documents.first
-            if d.content_type
-              d.value.to_doc.to_s
-            else
-              d.url
+            @render_doc ||= begin
+              d = output_node.render_documents.first
+              if d.content_type
+                d.value.to_doc.to_s
+              else
+                d.url
+              end
             end
           end
 

data/lib/adhearsion/translator/asterisk/component/mrcp_recog_prompt.rb

@@ -53,6 +53,13 @@ module Adhearsion
             raise OptionError, "A dtmf-terminate-timeout value must be -1, 0, or a positive integer." if @dtmf_terminate_timeout < -1
             raise OptionError, "An n-best-list-length value must be a positive integer." if @n_best_list_length && @n_best_list_length < 1
             raise OptionError, "A speed-vs-accuracy value must be a positive integer." if @speed_vs_accuracy && @speed_vs_accuracy < 0
+
+            begin
+              grammars
+            rescue => e
+              logger.error e
+              raise OptionError, 'The requested grammars could not be parsed.'
+            end
           end
 
           def execute_app(app, *args)
@@ -111,7 +118,7 @@ module Adhearsion
           end
 
           def grammars
-            input_node.grammars.map do |d|
+            @grammars ||= input_node.grammars.map do |d|
               if d.content_type
                 d.value.to_doc.to_s
               else

data/lib/adhearsion/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Adhearsion
-  VERSION = '3.0.0.beta2'
+  VERSION = '3.0.0.rc1'
 end

data/spec/adhearsion/translator/asterisk/component/mrcp_prompt_spec.rb

@@ -151,6 +151,16 @@ module Adhearsion
               end
             end
 
+            context 'with a document that cannot be parsed' do
+              let(:output_command_options) { { render_documents: [{value: 'http://example.com/doc1.ssml'}] } }
+
+              it "should return an error and not execute any actions" do
+                subject.execute
+                error = Adhearsion::ProtocolError.new.setup 'option error', 'The requested render document could not be parsed.'
+                expect(original_command.response(0.1)).to eq(error)
+              end
+            end
+
             context 'unset' do
               let(:output_command_options) { {} }
 
@@ -485,6 +495,16 @@ module Adhearsion
               end
             end
 
+            context 'with a grammar that cannot be parsed' do
+              let(:input_command_options) { { grammars: [{value: 'http://example.com/grammar1.grxml'}] } }
+
+              it "should return an error and not execute any actions" do
+                subject.execute
+                error = Adhearsion::ProtocolError.new.setup 'option error', 'The requested grammars could not be parsed.'
+                expect(original_command.response(0.1)).to eq(error)
+              end
+            end
+
             context 'unset' do
               let(:input_command_options) { {} }
 

data/spec/adhearsion/translator/asterisk_spec.rb

@@ -168,6 +168,11 @@ module Adhearsion
 
             it 'sends an error in response to the command' do
               subject.execute_call_command command
+              expect(command.response(1)).to eq(Adhearsion::ProtocolError.new.setup(:error, "Unknown error executing command on call #{call_id}", call_id))
+            end
+
+            it 'fails to find the call for later commands' do
+              subject.execute_call_command command
 
               expect(subject.call_with_id(call_id)).to be_nil
 
@@ -175,6 +180,21 @@ module Adhearsion
               subject.execute_call_command other_command
               expect(other_command.response).to eq(Adhearsion::ProtocolError.new.setup(:item_not_found, "Could not find a call with ID #{call_id}", call_id))
             end
+
+            it 'triggers an exception event' do
+              latch = CountDownLatch.new 1
+              ex = lo = nil
+              Events.exception do |e, l|
+                ex, lo = e, l
+                latch.countdown!
+              end
+
+              subject.execute_call_command command
+
+              expect(latch.wait(1)).to be true
+              expect(ex).to be_a StandardError
+              expect(lo).to be subject.logger
+            end
           end
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adhearsion
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta2
+  version: 3.0.0.rc1
 platform: ruby
 authors:
 - Jay Phillips
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -53,14 +53,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -867,7 +867,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Adhearsion, open-source telephony development framework