ruby_speech 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de37299d09f7a9dc63c8c5944db79f80594bfffc
-  data.tar.gz: c01558ff39e76c034f1b18df7288c27d04ec84b1
+  metadata.gz: 412147ee2efc1f9e8db108476c6939cc8723a68b
+  data.tar.gz: c73dbaad254dd7e90d1f08520a147bb9ebcbe20a
 SHA512:
-  metadata.gz: a2dc9ae2659cc93d40f7f0d55a2d6b4344accf12f7b1d7cf130aba09c4949a868bc47e2c641183aecad8bd42b0312a50d3a14d27eb9b933664fbaaa15de60cdc
-  data.tar.gz: 3df44bf14ab55473bd2dab097e2e972493744d299390085506e90ff437eb82441f535a3b29b1a45ac73d22c1770d0f4e4de9dbbb954d3d3c7c6983f12a741b75
+  metadata.gz: 4a4be1f240f91097e810e8394619c6efd9a7b4e2bf0ef817d0af65f313fcfe19d992c5e1d1ca29a06b355fd931fc8c70d4febe58221499a531c440c17b24b6eb
+  data.tar.gz: f734ad2b4103ed7c21a9d15e0abe7141a4ed4edcc1ba8b6c830e4fc37254fc466c1c95cd61c15dc6002437ea6a83abb2dbe95fef8ee012cb404154de0437099a

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # [develop](https://github.com/benlangfeld/ruby_speech)
 
+# [2.1.0](https://github.com/benlangfeld/ruby_speech/compare/v2.0.2...v2.1.0) - [2013-05-07](https://rubygems.org/gems/ruby_speech/versions/2.1.0)
+  * Feature: Support for SISR literal syntax
+
 # [2.0.2](https://github.com/benlangfeld/ruby_speech/compare/v2.0.1...v2.0.2) - [2013-05-01](https://rubygems.org/gems/ruby_speech/versions/2.0.2)
   * Bugfix: Differentiate between GRXML match cases with are and are not maximal
     * A Match can accept further input while still matching, while a a MaxMatch cannot.

data/lib/ruby_speech/grxml/element.rb

@@ -22,7 +22,7 @@ module RubySpeech
       include GenericElement
 
       def regexp_content # :nodoc:
-        children.map(&:regexp_content).join
+        "(#{children.map(&:regexp_content).join})"
       end
     end # Element
   end # GRXML

data/lib/ruby_speech/grxml/grammar.rb

@@ -123,7 +123,8 @@ module RubySpeech
         traverse do |element|
           next unless element.is_a? Nokogiri::XML::Text
 
-          next if self.class.import(element.parent).is_a? Token
+          element_type = self.class.import(element.parent).class
+          next if [Token, Tag].include?(element_type)
 
           tokens = split_tokens(element).map do |string|
             Token.new.tap { |token| token << string }

data/lib/ruby_speech/grxml/matcher.rb

@@ -8,6 +8,10 @@ end
 module RubySpeech
   module GRXML
     class Matcher
+      UTTERANCE_CONVERTER = Hash.new { |hash, key| hash[key] = key }
+      UTTERANCE_CONVERTER['*'] = 'star'
+      UTTERANCE_CONVERTER['#'] = 'pound'
+
       attr_reader :grammar
 
       def initialize(grammar)
@@ -106,13 +110,16 @@ module RubySpeech
       end
 
       def interpret_utterance(utterance)
-        conversion = Hash.new { |hash, key| hash[key] = key }
-        conversion['*'] = 'star'
-        conversion['#'] = 'pound'
+        find_tag(utterance) || utterance.chars.inject([]) do |array, digit|
+          array << "dtmf-#{UTTERANCE_CONVERTER[digit]}"
+        end.join(' ')
+      end
 
-        utterance.chars.inject [] do |array, digit|
-          array << "dtmf-#{conversion[digit]}"
-        end.join ' '
+      def find_tag(utterance)
+        match = /#{regexp_content}/.match(utterance)
+        return if match.captures.all?(&:nil?)
+        last_capture_index = match.captures.size - 1 - match.captures.reverse.find_index { |item| !item.nil? }
+        match.names[last_capture_index]
       end
     end
   end

data/lib/ruby_speech/grxml/tag.rb

@@ -20,6 +20,10 @@ module RubySpeech
         raise InvalidChildError, "A Tag can only accept Strings as children" unless VALID_CHILD_TYPES.include? arg.class
         super
       end
+
+      def regexp_content # :nodoc:
+        "?<#{content}>"
+      end
     end # Tag
   end # GRXML
 end # RubySpeech

data/lib/ruby_speech/version.rb

@@ -1,3 +1,3 @@
 module RubySpeech
-  VERSION = "2.0.2"
+  VERSION = "2.1.0"
 end

data/spec/ruby_speech/grxml/matcher_spec.rb

@@ -34,6 +34,41 @@ module RubySpeech
           end
         end
 
+        context "with a grammar with SISR tags" do
+          let :grammar do
+            RubySpeech::GRXML.draw mode: 'dtmf', root: 'options', tag_format: 'semantics/1.0-literals' do
+              rule id: 'options', scope: 'public' do
+                item do
+                  one_of do
+                    item do
+                      tag { 'foo' }
+                      '1'
+                    end
+                    item do
+                      tag { 'bar' }
+                      '2'
+                    end
+                    item do
+                      tag { 'baz' }
+                      '3'
+                    end
+                    item do
+                      tag { 'lala' }
+                      '4'
+                    end
+                  end
+                end
+              end
+            end
+          end
+
+          it "should return the literal tag interpretation" do
+            expected_match = GRXML::MaxMatch.new mode: :dtmf, confidence: 1,
+              utterance: '2', interpretation: 'bar'
+            subject.match('2').should == expected_match
+          end
+        end
+
         context "with a grammar that takes two specific digits" do
           let(:grammar) do
             GRXML.draw :mode => :dtmf, :root => 'digits' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_speech
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Ben Langfeld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2013-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: niceogiri