adhearsion-asr 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d7e97002dde733bc1e12c3c68a741e4642d38f7
-  data.tar.gz: f77c5dc898935b8b471b8d973289c79aea2b1e32
+  metadata.gz: d793ad00c79ebd46c18281cde5693d24d4ffc9e9
+  data.tar.gz: df0fac47487a8518063c7a27e353e04a755b82b4
 SHA512:
-  metadata.gz: f6ca17cd388bd6c8d997aa7a66485bba6efccb3e6b7f4a45cd5b31d6b08386de3b5f84e45751c70683c61e5d4e6974e998dd095bd09b1af31dd2b836ed5f28ef
-  data.tar.gz: d4ba8f56d484aa5c752616ea978363dea2d35704295584449ae54db10dd94bafa07e81225aef40b3e9edd8b16a532006aad55ad6e558c705832823e4fda30759
+  metadata.gz: 575c331ebf7da9bc3b433ca2520eb503adba3410cb9ccea69274456f1343845de3c60d305a7130decd2adf15c7d14721cea2b131c739127fa91b4794318c36e9
+  data.tar.gz: f649369e4e60fe0ec247ca2eff8fe8c0efedea114b487f064a1921e9d69354ab334ecef329b3d32938d636a964d1dec3ee7d94a2e28f58d893ea7f8d56eb180d

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
   - 2.1.0
@@ -9,6 +8,7 @@ rvm:
   - ruby-head
 matrix:
   allow_failures:
+    - rvm: rbx-2.1.1
     - rvm: ruby-head
 notifications:
   irc: "irc.freenode.org#adhearsion"

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # [develop](https://github.com/adhearsion/adhearsion-asr)
 
+# [v1.2.0](https://github.com/adhearsion/adhearsion-asr/compare/1.1.1...1.2.0) - [2014-03-03](https://rubygems.org/gems/adhearsion-asr/versions/1.2.0)
+  * Feature: Allow setting `:mode` option to `:voice` for ASR menus
+  * Bugfix: Raise `Adhearsion::Hangup` to terminate controller execution when the call actor is dead
+
 # [v1.1.1](https://github.com/adhearsion/adhearsion-asr/compare/1.1.0...1.1.1) - [2014-01-28](https://rubygems.org/gems/adhearsion-asr/versions/1.1.1)
   * Bugfix: Handle stop completion reason smoothly
 

data/Gemfile

@@ -1,5 +1,3 @@
 source "https://rubygems.org"
 
 gemspec
-
-gem 'activesupport', '~> 3.0' if RUBY_VERSION == "1.9.2"

data/lib/adhearsion-asr/controller_methods.rb

@@ -94,6 +94,7 @@ module AdhearsionASR
     # @option options [Integer] :tries Number of tries allowed before failure
     # @option options [Integer] :timeout Timeout in seconds before the first and between each input digit
     # @option options [Boolean] :interruptible If the prompt should be interruptible or not. Defaults to true
+    # @option options [String, Symbol] :mode Input mode to accept. May be :voice or :dtmf.
     # @option options [Hash] :input_options A hash of options passed directly to the Punchblock Input constructor
     # @option options [Hash] :output_options A hash of options passed directly to the Punchblock Output constructor
     #

data/lib/adhearsion-asr/menu_builder.rb

@@ -84,7 +84,7 @@ module AdhearsionASR
       raise ArgumentError, "You must specify one or more matches." if @matchers.count < 1
       matchers = @matchers
 
-      RubySpeech::GRXML.draw mode: :dtmf, root: 'options', tag_format: 'semantics/1.0-literals' do
+      RubySpeech::GRXML.draw mode: (@options[:mode] || :dtmf), root: 'options', tag_format: 'semantics/1.0-literals' do
         rule id: 'options', scope: 'public' do
           item do
             one_of do

data/lib/adhearsion-asr/prompt_builder.rb

@@ -4,7 +4,7 @@ module AdhearsionASR
   class PromptBuilder
     def initialize(output_document, grammars, options)
       input_options = {
-        mode: :dtmf,
+        mode: options[:mode] || :dtmf,
         initial_timeout: (options[:timeout] || Plugin.config.timeout) * 1000,
         inter_digit_timeout: (options[:timeout] || Plugin.config.timeout) * 1000,
         max_silence: (options[:timeout] || Plugin.config.timeout) * 1000,
@@ -32,6 +32,8 @@ module AdhearsionASR
       controller.execute_component_and_await_completion @prompt
 
       result @prompt.complete_event.reason
+    rescue Adhearsion::Call::ExpiredError
+      raise Adhearsion::Call::Hangup
     end
 
     private

data/lib/adhearsion-asr/version.rb

@@ -1,3 +1,3 @@
 module AdhearsionASR
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/spec/adhearsion-asr/controller_methods_spec.rb

@@ -50,6 +50,7 @@ module AdhearsionASR
       end
 
       before do
+        Adhearsion::Plugin.configure_plugins if Adhearsion::Plugin.respond_to?(:configure_plugins)
         Adhearsion::Plugin.init_plugins
       end
 
@@ -438,6 +439,14 @@ module AdhearsionASR
           end
         end
 
+        context "when the call is dead when trying to execute the prompt" do
+          before { call.terminate }
+
+          it "should raise Adhearsion::Call::Hangup" do
+            expect { subject.ask prompts, limit: 5 }.to raise_error Adhearsion::Call::Hangup
+          end
+        end
+
         context "when a utterance is received" do
           let(:expected_grxml) { digit_limit_grammar }
 
@@ -616,7 +625,7 @@ module AdhearsionASR
         context "with no matches" do
           it "should raise ArgumentError" do
             expect do
-              subject.menu do
+              subject.menu "Hello?" do
               end
             end.to raise_error(ArgumentError, /specify one or more matches/)
           end
@@ -804,6 +813,47 @@ module AdhearsionASR
             end
           end
 
+          context "when using ASR mode" do
+            before do
+              expected_input_options.merge! mode: :voice
+            end
+
+            let :expected_grxml do
+              RubySpeech::GRXML.draw mode: 'voice', root: 'options', tag_format: 'semantics/1.0-literals' do
+                rule id: 'options', scope: 'public' do
+                  item do
+                    one_of do
+                      item do
+                        tag { '0' }
+                        'Hello world'
+                      end
+                    end
+                  end
+                end
+              end
+            end
+
+            it "executes a Prompt with correct input mode, and the correct grammar mode" do
+              expect_component_execution expected_prompt
+
+              subject.menu prompts, mode: :voice do
+                match("Hello world") {}
+              end
+            end
+          end
+
+          context "when the call is dead when trying to execute the prompt" do
+            before { call.terminate }
+
+            it "should raise Adhearsion::Call::Hangup" do
+              expect do
+                subject.menu prompts do
+                  match(1) {}
+                end
+              end.to raise_error Adhearsion::Call::Hangup
+            end
+          end
+
           context "when input completes with an error" do
             let(:reason) { Punchblock::Event::Complete::Error.new details: 'foobar' }
 

data/spec/spec_helper.rb

@@ -10,4 +10,11 @@ RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
 
   config.backtrace_clean_patterns = [/rspec/]
+
+  config.before do
+    @current_datetime = DateTime.now
+    DateTime.stub now: @current_datetime
+
+    Punchblock.stub new_request_id: 'foo'
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adhearsion-asr
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Ben Langfeld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adhearsion