adhearsion-asr 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec55a154bb3ed952ba8f5d8374744de8893b3a56
-  data.tar.gz: 5e977b9af682478f2ae771813f788fd080c5f4b6
+  metadata.gz: b3c4b6f6a2412a2328172c2abbc9a4b7dab4d679
+  data.tar.gz: f01bf73b73e3ee9e73829babf1195579d226e9ee
 SHA512:
-  metadata.gz: 257a5e8c52bacb02dd86fe2672a2f261b7081c39c2e8bbdd581a93d166adf5fb50dfe3a9840d55fab1721f561faec9399a666e34dd7a9815ab98964e112fcd52
-  data.tar.gz: 070b6078aed2e782717de87226df5d128f9baad52c49c8579d1acb9d3ad30ad827a8f2c0ffadc8bdae30a739ddce84dc60df4ec3784b6272e6dccf30015842cb
+  metadata.gz: af9517ceeae874df35dda3d9cc21efae4b0fc2ae7316c5e9b33279f980b779fc79e32839b16eca035cf028e48a570f6f7c889bf36b747f43f50d100d12e3e5aa
+  data.tar.gz: 5cea700a6a39da4a2cb0d38185943a43aef1484b6291a7bfc2fe142b3fa1908788fc12860f3a3ea04f932013ae08952f3ef3b888e9999fec240fe828c30e1afd

data/.travis.yml

@@ -3,8 +3,9 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - jruby-19mode
-  - rbx-19mode
+  - rbx-2.1.1
   - ruby-head
 matrix:
   allow_failures:

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # [develop](https://github.com/adhearsion/adhearsion-asr)
 
+# [v1.1.0](https://github.com/adhearsion/adhearsion-asr/compare/1.0.1...1.1.0) - [2014-01-02](https://rubygems.org/gems/adhearsion-asr/versions/1.1.0)
+  * Feature: Alias `Result#response` to `#utterance`, with a deprecation warning
+  * Feature: Add `#match?` predicate to `Result` object
+  * Feature: When no prompts are supplied, only execute an input component
+
 # [v1.0.1](https://github.com/adhearsion/adhearsion-asr/compare/1.0.0...1.0.1) - [2013-09-30](https://rubygems.org/gems/adhearsion-asr/versions/1.0.1)
   * Bugfix: A menu definition's block context is now available
 

data/README.md

@@ -77,7 +77,7 @@ class MyController < Adhearsion::CallController
       end
     end
 
-    result = ask grammar: grammar, input_options: { mode: :speech }
+    result = ask grammar: grammar, input_options: { mode: :voice }
     case result.status
     when :match
       speak "You said #{result.utterance}"
@@ -95,7 +95,7 @@ end
 ```ruby
 class MyController < Adhearsion::CallController
   def run
-    result = ask grammar_url: 'http://example.com/mygrammar.grxml', input_options: { mode: :speech }
+    result = ask grammar_url: 'http://example.com/mygrammar.grxml', input_options: { mode: :voice }
     case result.status
     when :match
       speak "You said #{result.utterance}"

data/lib/adhearsion-asr/controller_methods.rb

@@ -42,9 +42,10 @@ module AdhearsionASR
 
       options[:grammar] || options[:grammar_url] || options[:limit] || options[:terminator] || raise(ArgumentError, "You must specify at least one of limit, terminator or grammar")
 
-      output_document = output_formatter.ssml_for_collection(prompts)
       grammars = AskGrammarBuilder.new(options).grammars
 
+      output_document = prompts.empty? ? nil : output_formatter.ssml_for_collection(prompts)
+
       PromptBuilder.new(output_document, grammars, options).execute self
     end
 

data/lib/adhearsion-asr/prompt_builder.rb

@@ -3,12 +3,6 @@ require 'adhearsion-asr/result'
 module AdhearsionASR
   class PromptBuilder
     def initialize(output_document, grammars, options)
-      output_options = {
-        render_document: {value: output_document},
-        renderer: Adhearsion.config.platform.media.default_renderer,
-        voice: Adhearsion.config.platform.media.default_voice
-      }.merge(options[:output_options] || {})
-
       input_options = {
         mode: :dtmf,
         initial_timeout: (options[:timeout] || Plugin.config.timeout) * 1000,
@@ -21,7 +15,17 @@ module AdhearsionASR
         terminator: options[:terminator]
       }.merge(options[:input_options] || {})
 
-      @prompt = Punchblock::Component::Prompt.new output_options, input_options, barge_in: options.has_key?(:interruptible) ? options[:interruptible] : true
+      @prompt = if output_document
+        output_options = {
+          render_document: {value: output_document},
+          renderer: Adhearsion.config.platform.media.default_renderer,
+          voice: Adhearsion.config.platform.media.default_voice
+        }.merge(options[:output_options] || {})
+
+        Punchblock::Component::Prompt.new output_options, input_options, barge_in: options.has_key?(:interruptible) ? options[:interruptible] : true
+      else
+        Punchblock::Component::Input.new input_options
+      end
     end
 
     def execute(controller)

data/lib/adhearsion-asr/result.rb

@@ -12,6 +12,15 @@ module AdhearsionASR
       self[:utterance] = mode == :dtmf ? parse_dtmf(other) : other
     end
 
+    def response
+      Adhearsion.deprecated "#utterance"
+      utterance
+    end
+
+    def match?
+      status == :match
+    end
+
     private
 
     def parse_dtmf(dtmf)

data/lib/adhearsion-asr/version.rb

@@ -1,3 +1,3 @@
 module AdhearsionASR
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/spec/adhearsion-asr/controller_methods_spec.rb

@@ -122,6 +122,14 @@ module AdhearsionASR
             subject.ask prompts, limit: 5
           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.ask 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
@@ -456,6 +464,7 @@ module AdhearsionASR
 
             it "returns :match status and the utterance" do
               result.status.should be :match
+              result.should be_match
               result.mode.should be :dtmf
               result.confidence.should == 1
               result.utterance.should == '123'
@@ -528,6 +537,14 @@ module AdhearsionASR
                   result.utterance.should be == nil
                 end
               end
+
+              context "when requested via #response" do
+                let(:utterance) { 'foo' }
+
+                it "returns the utterance" do
+                  result.response.should be == 'foo'
+                end
+              end
             end
 
             context "with multiple digits separated by spaces" do
@@ -544,6 +561,7 @@ module AdhearsionASR
 
             it "returns :nomatch status and a nil utterance" do
               result.status.should eql(:nomatch)
+              result.should_not be_match
               result.utterance.should be_nil
             end
           end
@@ -553,6 +571,7 @@ module AdhearsionASR
 
             it "returns :noinput status and a nil utterance" do
               result.status.should eql(:noinput)
+              result.should_not be_match
               result.utterance.should be_nil
             end
           end
@@ -562,6 +581,7 @@ module AdhearsionASR
 
             it "returns :hangup status and a nil utterance" do
               result.status.should eql(:hangup)
+              result.should_not be_match
               result.utterance.should be_nil
             end
           end

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: adhearsion-asr
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Ben Langfeld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
+date: 2014-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adhearsion
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
 - !ruby/object:Gem::Dependency
   name: punchblock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: ruby_speech
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
 - !ruby/object:Gem::Dependency
   name: rake
   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: guard-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: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 description: Adds speech recognition support to Adhearsion as a plugin
@@ -129,9 +129,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -159,17 +159,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: adhearsion-asr
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Adds speech recognition support to Adhearsion as a plugin