adhearsion-asr 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d793ad00c79ebd46c18281cde5693d24d4ffc9e9
-  data.tar.gz: df0fac47487a8518063c7a27e353e04a755b82b4
+  metadata.gz: ca0404794461dacc1ea767edf9c7a73ce39037e7
+  data.tar.gz: f8e0d64f713d2ac76a4aa4a88bb8b1a8f331f119
 SHA512:
-  metadata.gz: 575c331ebf7da9bc3b433ca2520eb503adba3410cb9ccea69274456f1343845de3c60d305a7130decd2adf15c7d14721cea2b131c739127fa91b4794318c36e9
-  data.tar.gz: f649369e4e60fe0ec247ca2eff8fe8c0efedea114b487f064a1921e9d69354ab334ecef329b3d32938d636a964d1dec3ee7d94a2e28f58d893ea7f8d56eb180d
+  metadata.gz: 15ee7ed592699c1b0790cb87b5265477eb0db3f60e82ca7223ba933a747e7cfdb6c8afe1f472873a56222266ad50e74a9f1631a4f2a7be4ea71ed4a3bbc12a4a
+  data.tar.gz: 77799f2386d1743d73837d49ab6f5cd4675018d84621f72b5c21edab5eec599633221b21233ef61b36b826b8e05d3a2c679a36ed7eec04623162bd97cc27fa25

data/.hound.yml

@@ -0,0 +1,2 @@
+LineLength:
+  Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # [develop](https://github.com/adhearsion/adhearsion-asr)
 
+# [v1.3.0](https://github.com/adhearsion/adhearsion-asr/compare/1.2.0...1.3.0) - [2015-04-24](https://rubygems.org/gems/adhearsion-asr/versions/1.3.0)
+  * Bugfix: Correctly handle nil prompts
+  * Feature: Allow disabling timeouts with -1
+
 # [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

data/lib/adhearsion-asr/controller_methods.rb

@@ -34,7 +34,7 @@ module AdhearsionASR
     #
     def ask(*args)
       options = args.last.kind_of?(Hash) ? args.pop : {}
-      prompts = args.flatten
+      prompts = args.flatten.compact
 
       if block_given?
         logger.warn "You passed a block to #ask, but this functionality is not available in adhearsion-asr. If you're looking for the block validator functionality, you should avoid using it in favour of grammars, and it is deprecated in Adhearsion Core."
@@ -106,11 +106,11 @@ module AdhearsionASR
     def menu(*args, &block)
       raise ArgumentError, "You must specify a block to build the menu" unless block
       options = args.last.kind_of?(Hash) ? args.pop : {}
-      prompts = args.flatten
+      prompts = args.flatten.compact
 
       menu_builder = MenuBuilder.new(options, &block)
 
-      output_document = output_formatter.ssml_for_collection(prompts)
+      output_document = prompts.empty? ? nil : output_formatter.ssml_for_collection(prompts)
 
       menu_builder.execute output_document, self
     end

data/lib/adhearsion-asr/prompt_builder.rb

@@ -5,9 +5,9 @@ module AdhearsionASR
     def initialize(output_document, grammars, options)
       input_options = {
         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,
+        initial_timeout: timeout(options[:timeout] || Plugin.config.timeout),
+        inter_digit_timeout: timeout(options[:timeout] || Plugin.config.timeout),
+        max_silence: timeout(options[:timeout] || Plugin.config.timeout),
         min_confidence: Plugin.config.min_confidence,
         grammars: grammars,
         recognizer: Plugin.config.recognizer,
@@ -64,5 +64,9 @@ module AdhearsionASR
         logger.debug "Ask completed with result #{result.inspect}"
       end
     end
+
+    def timeout(value)
+      value > 0 ? value * 1000 : value
+    end
   end
 end

data/lib/adhearsion-asr/version.rb

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

data/spec/adhearsion-asr/controller_methods_spec.rb

@@ -17,19 +17,6 @@ module AdhearsionASR
         double call, write_command: true, id: call_id
       end
 
-      def expect_message_waiting_for_utterance(message, fail = false)
-        expectation = controller.should_receive(:write_and_await_utterance).with message
-        if fail
-          expectation.and_raise fail
-        else
-          expectation.and_return message
-        end
-      end
-
-      def expect_message_of_type_waiting_for_utterance(message)
-        controller.should_receive(:write_and_await_utterance).with(message.class).and_return message
-      end
-
       def expect_component_execution(component, fail = false)
         expectation = controller.should_receive(:execute_component_and_await_completion).ordered.with(component)
         if fail
@@ -123,6 +110,15 @@ module AdhearsionASR
             subject.ask prompts, limit: 5
           end
 
+          context "with nil prompts" do
+            let(:prompts) { [nil, 'http://example.com/nice-to-meet-you.mp3', 'http://example.com/press-some-buttons.mp3'] }
+
+            it "executes a Prompt component with the correct prompts and grammar" do
+              expect_component_execution expected_prompt
+              subject.ask prompts, limit: 5
+            end
+          end
+
           context "with no prompts" do
             it "executes an Input component with the correct grammar" do
               Punchblock::Component::Input.any_instance.stub complete_event: double(reason: reason)
@@ -131,6 +127,14 @@ module AdhearsionASR
             end
           end
 
+          context "with only nil prompts" do
+            it "executes an Input component with the correct grammar" do
+              Punchblock::Component::Input.any_instance.stub complete_event: double(reason: reason)
+              expect_component_execution Punchblock::Component::Input.new(expected_input_options)
+              subject.ask nil, limit: 5
+            end
+          end
+
           context "with a block passed" do
             it "executes but logs a warning about the block validator" do
               expect_component_execution expected_prompt
@@ -313,6 +317,22 @@ module AdhearsionASR
           end
         end
 
+        context "with a negative timeout specified" do
+          let(:expected_grxml) { digit_limit_grammar }
+
+          before do
+            expected_input_options.merge! initial_timeout: -1,
+              inter_digit_timeout: -1,
+              max_silence: -1
+          end
+
+          it "executes a Prompt with correct timeout (initial, inter-digit & max-silence)" do
+            expect_component_execution expected_prompt
+
+            subject.ask prompts, limit: 5, timeout: -1
+          end
+        end
+
         context "with a different default timeout" do
           let(:expected_grxml) { digit_limit_grammar }
 
@@ -478,7 +498,7 @@ module AdhearsionASR
               result.confidence.should == 1
               result.utterance.should == '123'
               result.interpretation.should == 'Foo'
-              result.nlsml.should == nlsml.root
+              result.nlsml.should == nlsml
             end
 
             context "with speech input" do
@@ -659,6 +679,37 @@ module AdhearsionASR
             doo.should == :bar
           end
 
+          context "with nil prompts" do
+            let(:prompts) { [nil, 'http://example.com/nice-to-meet-you.mp3', 'http://example.com/press-some-buttons.mp3'] }
+
+            it "executes a Prompt component with the correct prompts and grammar" do
+              expect_component_execution expected_prompt
+              subject.menu prompts do
+                match(1) {}
+              end
+            end
+          end
+
+          context "with no prompts" do
+            it "executes an Input component with the correct grammar" do
+              Punchblock::Component::Input.any_instance.stub complete_event: double(reason: reason)
+              expect_component_execution Punchblock::Component::Input.new(expected_input_options)
+              subject.menu do
+                match(1) {}
+              end
+            end
+          end
+
+          context "with only nil prompts" do
+            it "executes an Input component with the correct grammar" do
+              Punchblock::Component::Input.any_instance.stub complete_event: double(reason: reason)
+              expect_component_execution Punchblock::Component::Input.new(expected_input_options)
+              subject.menu nil do
+                match(1) {}
+              end
+            end
+          end
+
           context "with interruptible: false" do
             let(:expected_barge_in) { false }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adhearsion-asr
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Ben Langfeld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2015-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adhearsion
@@ -130,6 +130,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".hound.yml"
 - ".rspec"
 - ".travis.yml"
 - CHANGELOG.md
@@ -169,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: adhearsion-asr
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Adds speech recognition support to Adhearsion as a plugin