ruby_speech 1.1.0 → 2.0.1

data/spec/ruby_speech/grxml/one_of_spec.rb

@@ -44,244 +44,6 @@ module RubySpeech
           end
         end
       end
-
-      describe "#potential_match?" do
-        before do
-          items.each { |item| subject << item }
-        end
-
-        context "with a single item of '6'" do
-          let(:items) { [Item.new << (Token.new << '6')] }
-
-          it "should be true for '6'" do
-            subject.potential_match?('6').should be true
-          end
-
-          %w{5 7}.each do |input|
-            it "should be false for '#{input}'" do
-              subject.potential_match?(input).should be false
-            end
-          end
-        end
-
-        context "with options of '6' or '7'" do
-          let(:items) { [Item.new << (Token.new << '6'), Item.new << (Token.new << '7')] }
-
-          %w{6 7}.each do |input|
-            it "should be true for '#{input}'" do
-              subject.potential_match?(input).should be true
-            end
-          end
-
-          %w{5 8 67 76}.each do |input|
-            it "should be false for '#{input}'" do
-              subject.potential_match?(input).should be false
-            end
-          end
-        end
-
-        context "with options of '67' or '25'" do
-          let(:items) { [Item.new << (Token.new << '6') << (Token.new << '7'), Item.new << (Token.new << '2') << (Token.new << '5')] }
-
-          %w{6 2}.each do |input|
-            it "should be true for '#{input}'" do
-              subject.potential_match?(input).should be true
-            end
-          end
-
-          %w{3 7 5 65 27 76 52}.each do |input|
-            it "should be false for '#{input}'" do
-              subject.potential_match?(input).should be false
-            end
-          end
-        end
-
-        context "with options of '678' or '251'" do
-          let(:items) { [Item.new << (Token.new << '6') << (Token.new << '7') << (Token.new << '8'), Item.new << (Token.new << '2') << (Token.new << '5') << (Token.new << '1')] }
-
-          %w{6 67 2 25}.each do |input|
-            it "should be true for '#{input}'" do
-              subject.potential_match?(input).should be true
-            end
-          end
-
-          %w{3 7 5 65 27 76 52}.each do |input|
-            it "should be false for '#{input}'" do
-              subject.potential_match?(input).should be false
-            end
-          end
-        end
-
-        context "with options of '6' or ('7' repeated twice)" do
-          let(:items) { [Item.new << (Token.new << '6'), Item.new << (Item.new(:repeat => 2) << (Token.new << '7'))] }
-
-          %w{6 7 77}.each do |input|
-            it "should be true for '#{input}'" do
-              pending
-              subject.potential_match?(input).should be true
-            end
-          end
-
-          %w{5 67 76 66}.each do |input|
-            it "should be false for '#{input}'" do
-              subject.potential_match?(input).should be false
-            end
-          end
-        end
-      end
-
-      describe "#longest_potential_match" do
-        before do
-          items.each { |item| subject << item }
-        end
-
-        context "with a single item of '6'" do
-          let(:items) { [Item.new << (Token.new << '6')] }
-
-          %w{6 65 6776}.each do |input|
-            it "should be '6' for '#{input}'" do
-              subject.longest_potential_match(input).should == '6'
-            end
-          end
-
-          %w{5 7 55 56}.each do |input|
-            it "should be '' for '#{input}'" do
-              subject.longest_potential_match(input).should == ''
-            end
-          end
-        end
-
-        context "with options of '6' or '7'" do
-          let(:items) { [Item.new << (Token.new << '6'), Item.new << (Token.new << '7')] }
-
-          %w{6 65 6776}.each do |input|
-            it "should be '6' for '#{input}'" do
-              subject.longest_potential_match(input).should == '6'
-            end
-          end
-
-          %w{7 74 726}.each do |input|
-            it "should be '7' for '#{input}'" do
-              subject.longest_potential_match(input).should == '7'
-            end
-          end
-
-          %w{5 55 56}.each do |input|
-            it "should be '' for '#{input}'" do
-              subject.longest_potential_match(input).should == ''
-            end
-          end
-        end
-
-        context "with options of '67' or '25'" do
-          let(:items) { [Item.new << (Token.new << '6') << (Token.new << '7'), Item.new << (Token.new << '2') << (Token.new << '5')] }
-
-          %w{6}.each do |input|
-            it "should be '6' for '#{input}'" do
-              subject.longest_potential_match(input).should == '6'
-            end
-          end
-
-          %w{67 675 6767 6756}.each do |input|
-            it "should be '67' for '#{input}'" do
-              subject.longest_potential_match(input).should == '67'
-            end
-          end
-
-          %w{2}.each do |input|
-            it "should be '2' for '#{input}'" do
-              subject.longest_potential_match(input).should == '2'
-            end
-          end
-
-          %w{25 259 2525 2567}.each do |input|
-            it "should be '25' for '#{input}'" do
-              subject.longest_potential_match(input).should == '25'
-            end
-          end
-
-          %w{5 7 72 56}.each do |input|
-            it "should be '' for '#{input}'" do
-              subject.longest_potential_match(input).should == ''
-            end
-          end
-        end
-
-        context "with options of '678' or '251'" do
-          let(:items) { [Item.new << (Token.new << '6') << (Token.new << '7') << (Token.new << '8'), Item.new << (Token.new << '2') << (Token.new << '5') << (Token.new << '1')] }
-
-          %w{6}.each do |input|
-            it "should be '6' for '#{input}'" do
-              subject.longest_potential_match(input).should == '6'
-            end
-          end
-
-          %w{67 675 6767 6756}.each do |input|
-            it "should be '67' for '#{input}'" do
-              subject.longest_potential_match(input).should == '67'
-            end
-          end
-
-          %w{678 6785 678678 67856}.each do |input|
-            it "should be '678' for '#{input}'" do
-              subject.longest_potential_match(input).should == '678'
-            end
-          end
-
-          %w{2}.each do |input|
-            it "should be '2' for '#{input}'" do
-              subject.longest_potential_match(input).should == '2'
-            end
-          end
-
-          %w{25 259 2525 2567}.each do |input|
-            it "should be '25' for '#{input}'" do
-              subject.longest_potential_match(input).should == '25'
-            end
-          end
-
-          %w{251 2519 251251 25167}.each do |input|
-            it "should be '251' for '#{input}'" do
-              subject.longest_potential_match(input).should == '251'
-            end
-          end
-
-          %w{5 7 72 56}.each do |input|
-            it "should be '' for '#{input}'" do
-              subject.longest_potential_match(input).should == ''
-            end
-          end
-        end
-
-        context "with options of '6' or '7' repeated twice" do
-          let(:items) { [Item.new << (Token.new << '6'), Item.new << (Item.new(:repeat => 2) << (Token.new << '7'))] }
-
-          %w{6 65 6776}.each do |input|
-            it "should be '6' for '#{input}'" do
-              subject.longest_potential_match(input).should == '6'
-            end
-          end
-
-          %w{7 74 726}.each do |input|
-            it "should be '7' for '#{input}'" do
-              subject.longest_potential_match(input).should == '7'
-            end
-          end
-
-          %w{7 77 774 7726}.each do |input|
-            it "should be '77' for '#{input}'" do
-              pending
-              subject.longest_potential_match(input).should == '77'
-            end
-          end
-
-          %w{5 55 56}.each do |input|
-            it "should be '' for '#{input}'" do
-              subject.longest_potential_match(input).should == ''
-            end
-          end
-        end
-      end
     end # OneOf
   end # GRXML
 end # RubySpeech

data/spec/ruby_speech/nlsml_spec.rb

@@ -3,32 +3,22 @@ require 'spec_helper'
 describe RubySpeech::NLSML do
   let :example_document do
     '''
-<result xmlns="http://www.w3c.org/2000/11/nlsml" xmlns:xf="http://www.w3.org/2000/xforms" xmlns:myApp="foo" grammar="http://flight">
-  <interpretation confidence="60">
+<result xmlns="http://www.ietf.org/xml/ns/mrcpv2" grammar="http://flight">
+  <interpretation confidence="0.6">
     <input mode="speech">I want to go to Pittsburgh</input>
-    <xf:model>
-      <xf:group name="airline">
-        <xf:string name="to_city"/>
-      </xf:group>
-    </xf:model>
-    <xf:instance>
-      <myApp:airline>
-        <myApp:to_city>Pittsburgh</myApp:to_city>
-      </myApp:airline>
-    </xf:instance>
+    <instance>
+      <airline>
+        <to_city>Pittsburgh</to_city>
+      </airline>
+    </instance>
   </interpretation>
-  <interpretation confidence="40">
+  <interpretation confidence="0.4">
     <input>I want to go to Stockholm</input>
-    <xf:model>
-      <xf:group name="airline">
-        <xf:string name="to_city"/>
-      </xf:group>
-    </xf:model>
-    <xf:instance>
-      <myApp:airline>
-        <myApp:to_city>Stockholm</myApp:to_city>
-      </myApp:airline>
-    </xf:instance>
+    <instance>
+      <airline>
+        <to_city>Stockholm</to_city>
+      </airline>
+    </instance>
   </interpretation>
 </result>
     '''
@@ -40,18 +30,12 @@ describe RubySpeech::NLSML do
     end
 
     it "should allow building a document" do
-      document = RubySpeech::NLSML.draw(grammar: 'http://flight', 'xmlns:myApp' => 'foo') do
+      document = RubySpeech::NLSML.draw(grammar: 'http://flight') do
         interpretation confidence: 0.6 do
           input "I want to go to Pittsburgh", mode: :speech
 
-          model do
-            group name: 'airline' do
-              string name: 'to_city'
-            end
-          end
-
           instance do
-            self['myApp'].airline do
+            airline do
               to_city 'Pittsburgh'
             end
           end
@@ -60,27 +44,40 @@ describe RubySpeech::NLSML do
         interpretation confidence: 0.4 do
           input "I want to go to Stockholm"
 
-          model do
-            group name: 'airline' do
-              string name: 'to_city'
-            end
-          end
-
           instance do
-            self['myApp'].airline do
+            airline do
               to_city "Stockholm"
             end
           end
         end
       end
 
-      if RUBY_ENGINE == 'jruby'
-        expected_document.gsub! 'myApp:to_city', 'to_city'
-        expected_document.gsub! 'xf:group', 'group'
-        expected_document.gsub! 'xf:string', 'string'
+      document.to_xml.should == expected_document
+    end
+
+    context "with a string instance" do
+      let :example_document do
+        '''
+<result xmlns="http://www.ietf.org/xml/ns/mrcpv2" grammar="http://flight">
+  <interpretation confidence="0.6">
+    <input mode="speech">I want to go to Pittsburgh</input>
+    <instance>I want to go to Pittsburgh</instance>
+  </interpretation>
+</result>
+        '''
       end
 
-      document.to_xml.should == expected_document
+      it "should allow building a document" do
+        document = RubySpeech::NLSML.draw(grammar: 'http://flight') do
+          interpretation confidence: 0.6 do
+            input "I want to go to Pittsburgh", mode: :speech
+
+            instance "I want to go to Pittsburgh"
+          end
+        end
+
+        document.to_xml.should == expected_document
+      end
     end
   end
 
@@ -89,7 +86,7 @@ describe RubySpeech::NLSML do
       RubySpeech.parse example_document
     end
 
-    let(:empty_result) { '<result xmlns="http://www.w3c.org/2000/11/nlsml" xmlns:xf="http://www.w3.org/2000/xforms"/>' }
+    let(:empty_result) { '<result xmlns="http://www.ietf.org/xml/ns/mrcpv2"/>' }
 
     its(:grammar) { should == 'http://flight' }
 
@@ -127,14 +124,14 @@ describe RubySpeech::NLSML do
       subject.should_not be == RubySpeech.parse(empty_result)
     end
 
-    context "with an interpretation that has no model/instance" do
+    context "with an interpretation that has no instance" do
       let :example_document do
         '''
-<result xmlns="http://www.w3c.org/2000/11/nlsml" grammar="http://flight">
-  <interpretation confidence="60">
+<result xmlns="http://www.ietf.org/xml/ns/mrcpv2" grammar="http://flight">
+  <interpretation confidence="0.6">
     <input mode="speech">I want to go to Pittsburgh</input>
   </interpretation>
-  <interpretation confidence="40">
+  <interpretation confidence="0.4">
     <input>I want to go to Stockholm</input>
   </interpretation>
 </result>
@@ -166,6 +163,35 @@ describe RubySpeech::NLSML do
       its(:best_interpretation) { should == expected_best_interpretation }
     end
 
+    context "with a string instance" do
+      let :example_document do
+        '''
+<result xmlns="http://www.ietf.org/xml/ns/mrcpv2" grammar="http://flight">
+  <interpretation confidence="0.6">
+    <input mode="speech">I want to go to Pittsburgh</input>
+    <instance>I want to go to Pittsburgh</instance>
+  </interpretation>
+</result>
+        '''
+      end
+
+      let(:expected_best_interpretation) do
+        {
+          confidence: 0.6,
+          input: { mode: :speech, content: 'I want to go to Pittsburgh' },
+          instance: 'I want to go to Pittsburgh',
+          instances: ['I want to go to Pittsburgh']
+        }
+      end
+
+      let(:expected_interpretations) do
+        [expected_best_interpretation]
+      end
+
+      its(:interpretations)     { should == expected_interpretations }
+      its(:best_interpretation) { should == expected_best_interpretation }
+    end
+
     context "without any interpretations" do
       subject do
         RubySpeech.parse empty_result
@@ -177,32 +203,22 @@ describe RubySpeech::NLSML do
     context "with interpretations out of confidence order" do
       let :example_document do
         '''
-<result xmlns="http://www.w3c.org/2000/11/nlsml" xmlns:myApp="foo" xmlns:xf="http://www.w3.org/2000/xforms" grammar="http://flight">
-  <interpretation confidence="40">
+<result xmlns="http://www.ietf.org/xml/ns/mrcpv2" grammar="http://flight">
+  <interpretation confidence="0.4">
     <input>I want to go to Stockholm</input>
-    <xf:model>
-      <xf:group name="airline">
-        <xf:string name="to_city"/>
-      </xf:group>
-    </xf:model>
-    <xf:instance>
-      <myApp:airline>
-        <myApp:to_city>Stockholm</myApp:to_city>
-      </myApp:airline>
-    </xf:instance>
+    <instance>
+      <airline>
+        <to_city>Stockholm</to_city>
+      </airline>
+    </instance>
   </interpretation>
-  <interpretation confidence="60">
+  <interpretation confidence="0.6">
     <input mode="speech">I want to go to Pittsburgh</input>
-    <xf:model>
-      <xf:group name="airline">
-        <xf:string name="to_city"/>
-      </xf:group>
-    </xf:model>
-    <xf:instance>
-      <myApp:airline>
-        <myApp:to_city>Pittsburgh</myApp:to_city>
-      </myApp:airline>
-    </xf:instance>
+    <instance>
+      <airline>
+        <to_city>Pittsburgh</to_city>
+      </airline>
+    </instance>
   </interpretation>
 </result>
         '''
@@ -215,24 +231,19 @@ describe RubySpeech::NLSML do
     context "with multiple instances for a single interpretation" do
       let :example_document do
         '''
-<result xmlns="http://www.w3c.org/2000/11/nlsml" xmlns:myApp="foo" xmlns:xf="http://www.w3.org/2000/xforms" grammar="http://flight">
-  <interpretation confidence="100">
+<result xmlns="http://www.ietf.org/xml/ns/mrcpv2" grammar="http://flight">
+  <interpretation confidence="1">
     <input mode="speech">I want to go to Boston</input>
-    <xf:model>
-      <xf:group name="airline">
-        <xf:string name="to_city"/>
-      </xf:group>
-    </xf:model>
-    <xf:instance>
-      <myApp:airline>
-        <myApp:to_city>Boston, MA</myApp:to_city>
-      </myApp:airline>
-    </xf:instance>
-    <xf:instance>
-      <myApp:airline>
-        <myApp:to_city>Boston, UK</myApp:to_city>
-      </myApp:airline>
-    </xf:instance>
+    <instance>
+      <airline>
+        <to_city>Boston, MA</to_city>
+      </airline>
+    </instance>
+    <instance>
+      <airline>
+        <to_city>Boston, UK</to_city>
+      </airline>
+    </instance>
   </interpretation>
 </result>
         '''
@@ -254,68 +265,20 @@ describe RubySpeech::NLSML do
       its(:best_interpretation) { should == expected_interpretation }
     end
 
-    context "with no namespaces (because some vendors think this is ok)" do
+    context "with no namespace" do
       let :example_document do
         '''
 <result grammar="http://flight">
-  <interpretation confidence="60">
-    <input mode="speech">I want to go to Pittsburgh</input>
-    <model>
-      <group name="airline">
-        <string name="to_city"/>
-      </group>
-    </model>
-    <instance>
-      <airline>
-        <to_city>Pittsburgh</to_city>
-      </airline>
-    </instance>
-  </interpretation>
-  <interpretation confidence="40">
-    <input>I want to go to Stockholm</input>
-    <model>
-      <group name="airline">
-        <string name="to_city"/>
-      </group>
-    </model>
-    <instance>
-      <airline>
-        <to_city>Stockholm</to_city>
-      </airline>
-    </instance>
-  </interpretation>
-</result>
-        '''
-      end
-
-      its(:interpretations)     { should == expected_interpretations }
-      its(:best_interpretation) { should == expected_best_interpretation }
-    end
-
-    context "with just an NLSML namespace (because we need something, damnit!)" do
-      let :example_document do
-        '''
-<result xmlns="http://www.w3c.org/2000/11/nlsml" grammar="http://flight">
-  <interpretation confidence="60">
+  <interpretation confidence="0.6">
     <input mode="speech">I want to go to Pittsburgh</input>
-    <model>
-      <group name="airline">
-        <string name="to_city"/>
-      </group>
-    </model>
     <instance>
       <airline>
         <to_city>Pittsburgh</to_city>
       </airline>
     </instance>
   </interpretation>
-  <interpretation confidence="40">
+  <interpretation confidence="0.4">
     <input>I want to go to Stockholm</input>
-    <model>
-      <group name="airline">
-        <string name="to_city"/>
-      </group>
-    </model>
     <instance>
       <airline>
         <to_city>Stockholm</to_city>
@@ -333,7 +296,7 @@ describe RubySpeech::NLSML do
     context "with a single interpretation with a nomatch input" do
       let :example_document do
         '''
-<result xmlns="http://www.w3c.org/2000/11/nlsml" grammar="http://flight">
+<result xmlns="http://www.ietf.org/xml/ns/mrcpv2" grammar="http://flight">
   <interpretation>
     <input>
        <nomatch/>
@@ -349,14 +312,9 @@ describe RubySpeech::NLSML do
     context "with multiple interpretations where one is a nomatch input" do
       let :example_document do
         '''
-<result xmlns="http://www.w3c.org/2000/11/nlsml" grammar="http://flight">
-  <interpretation confidence="60">
+<result xmlns="http://www.ietf.org/xml/ns/mrcpv2" grammar="http://flight">
+  <interpretation confidence="0.6">
     <input mode="speech">I want to go to Pittsburgh</input>
-    <model>
-      <group name="airline">
-        <string name="to_city"/>
-      </group>
-    </model>
     <instance>
       <airline>
         <to_city>Pittsburgh</to_city>
@@ -378,7 +336,7 @@ describe RubySpeech::NLSML do
     context "with a single interpretation with a noinput" do
       let :example_document do
         '''
-<result xmlns="http://www.w3c.org/2000/11/nlsml" grammar="http://flight">
+<result xmlns="http://www.ietf.org/xml/ns/mrcpv2" grammar="http://flight">
   <interpretation>
     <input>
        <noinput/>