ruby_speech 2.3.2-java → 2.4.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce3cb16ff3eaf366c78390c3473c6c490c08371a
-  data.tar.gz: 389193549cb748c0da31dadaf564e1b31786c5f2
+  metadata.gz: 72228f3e968bcd511d58f2504272dda59b04bf83
+  data.tar.gz: 8570fee51e92363c6096d4aeb9a58b13d16191aa
 SHA512:
-  metadata.gz: ff3712f5fcb287299ce97b7389c7f2be8e991116f320600014b415f4d90818c3f3e4c1d043303eac2a6e866705770b625f63aaf5c3e2364bb87eaf4cbe9be4bc
-  data.tar.gz: 051bcf95b593cb586bad668a47c60b61ba009f05807204f978d4ae295e038eda05260307932355ff5b5b28034a7d6501153c1e974e2bb1bc3e1bf008be602799
+  metadata.gz: 86362dede47c17045c9f6dd40f701acdf206d2ac67e6f459a4779a3fbd2090c57bdb36eb39e3f9c1aae474ff4a6e46b0bb46f3070ba314e85b942dd4da9dc36d
+  data.tar.gz: 5fd3ced7cc8c94062a79ea106dac623be9e3de14f4526006c4f8cd6ab0c165b02f7c624543bffb1469ec05f7abd5118512ebf717c1767c357e525610150cdefd

data/.travis.yml

@@ -1,17 +1,38 @@
 language: ruby
 
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - jruby
-  - rbx
-  - ruby-head
 matrix:
+  include:
+    - rvm: 1.9.3
+    - rvm: 2.0.0
+    - rvm: 2.1.0
+    - rvm: 2.2.0
+    - rvm: 2.3.0
+    - rvm: rbx-2
+    - rvm: rbx-3
+    - rvm: ruby-head
+    - rvm: jruby-1.7
+      jdk: openjdk7
+    - rvm: jruby-1.7
+      jdk: oraclejdk8
+    - rvm: jruby-head
+      jdk: oraclejdk8
+    - rvm: jruby-9.1.13.0
+      jdk: openjdk7
+    - rvm: jruby-9.1.13.0
+      jdk: oraclejdk8
   allow_failures:
+    - rvm: rbx-2
+    - rvm: rbx-3
     - rvm: ruby-head
+sudo: false
+addons:
+  apt:
+    packages:
+    - libpcre3
+    - libpcre3-dev
 before_install:
-  - sudo apt-get install libpcre3 libpcre3-dev
+  - gem install bundler
+env: JRUBY_OPTS="--server --debug -J-Xss1024k -J-Xmx652m -J-XX:+UseConcMarkSweepGC"
 
 notifications:
   irc: "irc.freenode.org#adhearsion"

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # [develop](https://github.com/benlangfeld/ruby_speech)
 
+# [2.4.0](https://github.com/benlangfeld/ruby_speech/compare/v2.3.2...v2.4.0) - [2018-02-23](https://rubygems.org/gems/ruby_speech/versions/2.4.0)
+  * Feature: Permit percentage rate values for prosody tags
+  * Bugfix: Rulerefs referenced n-levels deep under Rulerefs should be expanded.
+  * Bugfix: Optimize performance of built-in number DTMF grammar
+  * Bugfix: Fix handling of millisecond values
+
 # [2.3.2](https://github.com/benlangfeld/ruby_speech/compare/v2.3.1...v2.3.2) - [2014-04-21](https://rubygems.org/gems/ruby_speech/versions/2.3.2)
   * Bugfix: String nodes should take non-strings and cast to a string (`#to_s`)
   * Bugfix: Cleanly handle NLSML with no input tag

data/README.md

@@ -1,8 +1,8 @@
 [![Gem Version](https://badge.fury.io/rb/ruby_speech.png)](https://rubygems.org/gems/ruby_speech)
-[![Build Status](https://secure.travis-ci.org/benlangfeld/ruby_speech.png?branch=develop)](http://travis-ci.org/benlangfeld/ruby_speech)
-[![Dependency Status](https://gemnasium.com/benlangfeld/ruby_speech.png?travis)](https://gemnasium.com/benlangfeld/ruby_speech)
-[![Code Climate](https://codeclimate.com/github/benlangfeld/ruby_speech.png)](https://codeclimate.com/github/benlangfeld/ruby_speech)
-[![Coverage Status](https://coveralls.io/repos/benlangfeld/ruby_speech/badge.png?branch=develop)](https://coveralls.io/r/benlangfeld/ruby_speech)
+[![Build Status](https://secure.travis-ci.org/adhearsion/ruby_speech.png?branch=develop)](http://travis-ci.org/adhearsion/ruby_speech)
+[![Dependency Status](https://gemnasium.com/adhearsion/ruby_speech.png?travis)](https://gemnasium.com/adhearsion/ruby_speech)
+[![Code Climate](https://codeclimate.com/github/adhearsion/ruby_speech.png)](https://codeclimate.com/github/adhearsion/ruby_speech)
+[![Coverage Status](https://coveralls.io/repos/adhearsion/ruby_speech/badge.png?branch=develop)](https://coveralls.io/r/adhearsion/ruby_speech)
 
 # RubySpeech
 RubySpeech is a library for constructing and parsing Text to Speech (TTS) and Automatic Speech Recognition (ASR) documents such as [SSML](http://www.w3.org/TR/speech-synthesis), [GRXML](http://www.w3.org/TR/speech-grammar/) and [NLSML](http://www.w3.org/TR/nl-spec/). Such documents can be constructed to be processed by TTS and ASR engines, parsed as the result from such, or used in the implementation of such engines.
@@ -331,7 +331,7 @@ document.best_interpretation # => {
         }
 ```
 
-Check out the [YARD documentation](http://rdoc.info/github/benlangfeld/ruby_speech/master/frames) for more
+Check out the [YARD documentation](http://rdoc.info/github/adhearsion/ruby_speech/master/frames) for more
 
 ## Features:
 ### SSML
@@ -374,10 +374,10 @@ Check out the [YARD documentation](http://rdoc.info/github/benlangfeld/ruby_spee
 * `<lexicon/>`
 
 ## Links:
-* [Source](https://github.com/benlangfeld/ruby_speech)
+* [Source](https://github.com/adhearsion/ruby_speech)
 * [Documentation](http://rdoc.info/gems/ruby_speech/frames)
-* [Bug Tracker](https://github.com/benlangfeld/ruby_speech/issues)
-* [CI](https://travis-ci.org/#!/benlangfeld/ruby_speech)
+* [Bug Tracker](https://github.com/adhearsion/ruby_speech/issues)
+* [CI](https://travis-ci.org/#!/adhearsion/ruby_speech)
 
 ## Note on Patches/Pull Requests
 

data/ext/ruby_speech/RubySpeechGRXMLMatcher.java

@@ -1,4 +1,4 @@
-package com.benlangfeld.ruby_speech;
+package com.adhearsion.ruby_speech;
 
 import org.jruby.Ruby;
 import org.jruby.RubyClass;

data/ext/ruby_speech/RubySpeechService.java

@@ -1,4 +1,4 @@
-package com.benlangfeld.ruby_speech;
+package com.adhearsion.ruby_speech;
 
 import org.jruby.Ruby;
 import org.jruby.RubyClass;

data/ext/ruby_speech/extconf.rb

@@ -3,7 +3,7 @@ require 'mkmf'
 $LIBS << " -lpcre"
 
 unless find_header('pcre.h')
-  abort "-----\nPCRE is missing. You must install it as per the README @ https://github.com/benlangfeld/ruby_speech\n-----"
+  abort "-----\nPCRE is missing. You must install it as per the README @ https://github.com/adhearsion/ruby_speech\n-----"
 end
 
 create_makefile 'ruby_speech/ruby_speech'

data/lib/ruby_speech/grxml.rb

@@ -4,6 +4,8 @@ require 'ruby_speech/grxml/element'
 module RubySpeech
   module GRXML
     InvalidChildError = Class.new StandardError
+    MissingReferenceError = Class.new StandardError
+    ReferentialLoopError = Class.new StandardError
 
     GRXML_NAMESPACE = 'http://www.w3.org/2001/06/grammar'
 

data/lib/ruby_speech/grxml/builtins.rb

@@ -57,7 +57,8 @@ module RubySpeech::GRXML::Builtins
   # @option options [#to_i] :maxlength Maximum length for the string of digits.
   # @option options [#to_i] :length Absolute length for the string of digits.
   #
-  # @return [RubySpeech::GRXML::Grammar] a grammar for interpreting a boolean response.
+  # @return [RubySpeech::GRXML::Grammar] a grammar for interpreting an integer
+  #                                      response.
   #
   # @raise [ArgumentError] if any of the length attributes logically conflict
   #
@@ -118,22 +119,28 @@ module RubySpeech::GRXML::Builtins
   def self.number(options = nil)
     RubySpeech::GRXML.draw mode: :dtmf, root: 'number' do
       rule id: 'number', scope: 'public' do
-        item repeat: '0-' do
-          ruleref uri: '#digit'
+        one_of do
+          item { ruleref uri: '#less_than_one' }
+          item { ruleref uri: '#one_or_more' }
         end
+      end
+
+      rule id: 'less_than_one' do
+        item { '*' }
+        item { ruleref uri: '#digit_series' }
+      end
+
+      rule id: 'one_or_more' do
+        item { ruleref uri: '#digit_series' }
         item repeat: '0-1' do
           item { '*' }
-          item repeat: '0-' do
-            ruleref uri: '#digit'
-          end
+          item(repeat: '0-1') { ruleref uri: '#digit_series' }
         end
       end
 
-      rule id: 'digit' do
-        one_of do
-          0.upto(9) { |d| item { d.to_s } }
-        end
-      end
+      rule(id: 'digit_series') { item(repeat: '1-') { ruleref uri: '#digit' } }
+
+      rule(id: 'digit') { one_of { 0.upto(9) { |d| item { d.to_s } } } }
     end
   end
 

data/lib/ruby_speech/grxml/grammar.rb

@@ -113,17 +113,39 @@ module RubySpeech
       # Replaces rulerefs in the document with a copy of the original rule.
       # Removes all top level rules except the root rule
       #
+      # @raises [MissingReferenceError] if a ruleref references a rule that is
+      #                                 not defined.
+      # @raises [ReferentialLoopError] if rulerefs create a referencial cycle.
+      #
       # @return self
       #
       def inline!
-        xpath("//ns:ruleref", :ns => GRXML_NAMESPACE).each do |ref|
-          rule = rule_with_id ref[:uri].sub(/^#/, '')
-          ref.swap rule.dup.children
+        previous_uris = {}
+        loop do
+          rule = nil
+          uris = {}
+          xpath('//ns:ruleref', ns: GRXML_NAMESPACE).each do |ref|
+            uri = ref[:uri].sub(/^#/, '')
+            uris[uri] = 1
+            rule = rule_with_id uri
+            unless rule
+              raise MissingReferenceError,
+                    "Ruleref '##{uri}' is referenced but not defined"
+            end
+            ref.swap rule.dup.children
+          end
+          break unless rule
+          if previous_uris.keys.eql? uris.keys
+            raise ReferentialLoopError,
+                  'GRXML document contains cycles with ruleref(s): ' <<
+                  uris.keys.join(', ')
+          end
+          previous_uris = uris
         end
 
         query = "./ns:rule[@id!='#{root}']"
         query += "|./ns:rule[@ns:id!='#{root}']" if Nokogiri.jruby?
-        non_root_rules = xpath query, :ns => namespace_href
+        non_root_rules = xpath query, ns: namespace_href
         non_root_rules.remove
 
         self

data/lib/ruby_speech/grxml/matcher.rb

@@ -6,7 +6,7 @@ require 'ruby_speech/ruby_speech'
 
 if RUBY_PLATFORM =~ /java/
   require 'jruby'
-  com.benlangfeld.ruby_speech.RubySpeechService.new.basicLoad(JRuby.runtime)
+  com.adhearsion.ruby_speech.RubySpeechService.new.basicLoad(JRuby.runtime)
 end
 
 module RubySpeech

data/lib/ruby_speech/ssml/break.rb

@@ -36,7 +36,7 @@ module RubySpeech
       # @return [Float]
       #
       def time
-        read_attr :time, :to_f
+        get_time_attribute :time
       end
 
       ##
@@ -50,7 +50,6 @@ module RubySpeech
 
       def <<(*args)
         raise InvalidChildError, "A Break cannot contain children"
-        super
       end
 
       def eql?(o)

data/lib/ruby_speech/ssml/element.rb

@@ -23,9 +23,21 @@ module RubySpeech
 
       private
 
+      def get_time_attribute(key)
+        value = read_attr(key)
+
+        if value.nil?
+          nil
+        elsif value.end_with?('ms')
+          value.to_f / 1000
+        else
+          value.to_f
+        end
+      end
+
       def set_time_attribute(key, value)
         raise ArgumentError, "You must specify a valid #{key} (positive float value in seconds)" unless value.is_a?(Numeric) && value >= 0
-        self[key] = "#{value}s"
+        self[key] = value == value.round ? "#{value.to_i}s" : "#{(value * 1000).to_i}ms"
       end
     end # Element
   end # SSML

data/lib/ruby_speech/ssml/mark.rb

@@ -34,7 +34,6 @@ module RubySpeech
 
       def <<(*args)
         raise InvalidChildError, "A Mark cannot contain children"
-        super
       end
 
       def eql?(o)

data/lib/ruby_speech/ssml/prosody.rb

@@ -102,27 +102,29 @@ module RubySpeech
       end
 
       ##
-      # A change in the speaking rate for the contained text. Legal values are: a relative change or "x-slow", "slow", "medium", "fast", "x-fast", or "default". Labels "x-slow" through "x-fast" represent a sequence of monotonically non-decreasing speaking rates. When a number is used to specify a relative change it acts as a multiplier of the default rate. For example, a value of 1 means no change in speaking rate, a value of 2 means a speaking rate twice the default rate, and a value of 0.5 means a speaking rate of half the default rate. The default rate for a voice depends on the language and dialect and on the personality of the voice. The default rate for a voice should be such that it is experienced as a normal speaking rate for the voice when reading aloud text. Since voices are processor-specific, the default rate will be as well.
+      # A change in the speaking rate for the contained text. Legal values are: a relative change or "x-slow", "slow", "medium", "fast", "x-fast", or "default". Labels "x-slow" through "x-fast" represent a sequence of monotonically non-decreasing speaking rates. When a number is used to specify a relative change it acts as a multiplier of the default rate. For example, a value of 1 means no change in speaking rate, a value of 2 means a speaking rate twice the default rate, and a value of 0.5 means a speaking rate of half the default rate. Further, changes can be specified as percentages (e.g. '10%' or '+15%'), but these are the only string entries permitted. The default rate for a voice depends on the language and dialect and on the personality of the voice. The default rate for a voice should be such that it is experienced as a normal speaking rate for the voice when reading aloud text. Since voices are processor-specific, the default rate will be as well.
       #
-      # @return [Symbol, Float]
+      # @return [Symbol, Float, String]
       #
       def rate
         value = read_attr :rate
         return unless value
         if VALID_RATES.include?(value.to_sym)
           value.to_sym
+        elsif value.include? "%"
+          value
         else
           value.to_f
         end
       end
 
       ##
-      # @param [Symbol, Numeric] v
+      # @param [Symbol, Numeric, String] v
       #
       # @raises ArgumentError if v is not either a positive Numeric or one of VALID_RATES
       #
       def rate=(v)
-        raise ArgumentError, "You must specify a valid rate ([positive-number](multiplier), #{VALID_RATES.map(&:inspect).join ', '})" unless (v.is_a?(Numeric) && v >= 0) || VALID_RATES.include?(v)
+        raise ArgumentError, "You must specify a valid rate ([positive-number](multiplier), #{VALID_RATES.map(&:inspect).join ', '})" unless (v.is_a?(Numeric) && v >= 0) || VALID_RATES.include?(v) || (v.is_a?(String) && v.include?("%"))
         self[:rate] = v
       end
 
@@ -132,7 +134,8 @@ module RubySpeech
       # @return [Integer]
       #
       def duration
-        read_attr :duration, :to_i
+        value = get_time_attribute :duration
+        value.round if value
       end
 
       ##

data/lib/ruby_speech/version.rb

@@ -1,3 +1,3 @@
 module RubySpeech
-  VERSION = "2.3.2"
+  VERSION = "2.4.0"
 end

data/ruby_speech.gemspec

@@ -7,10 +7,10 @@ Gem::Specification.new do |s|
   s.version     = RubySpeech::VERSION
   s.authors     = ["Ben Langfeld"]
   s.email       = ["ben@langfeld.me"]
-  s.homepage    = "https://github.com/benlangfeld/ruby_speech"
+  s.homepage    = "https://github.com/adhearsion/ruby_speech"
   s.summary     = %q{A Ruby library for TTS & ASR document preparation}
   s.description = %q{Prepare SSML and GRXML documents with ease}
-  
+
   s.license = 'MIT'
 
   s.rubyforge_project = "ruby_speech"
@@ -27,18 +27,25 @@ Gem::Specification.new do |s|
     s.extensions = ['ext/ruby_speech/extconf.rb']
   end
 
-  s.add_runtime_dependency %q<nokogiri>, ["~> 1.6"]
+  s.add_runtime_dependency %q<nokogiri>, ["~> 1.6.0"]
   s.add_runtime_dependency %q<activesupport>, [">= 3.0.7", "< 5.0.0"]
 
   s.add_development_dependency %q<bundler>, [">= 1.0.0"]
-  s.add_development_dependency %q<rspec>, [">= 2.7"]
-  s.add_development_dependency %q<ci_reporter>, [">= 1.6.3"]
+  s.add_development_dependency %q<rspec>, ["~> 2.99.0"]
+  s.add_development_dependency %q<rspec-its>, [">= 0"]
+  s.add_development_dependency %q<ci_reporter>, ["~> 1.6"]
   s.add_development_dependency %q<yard>, [">= 0.7.0"]
-  s.add_development_dependency %q<rake>, [">= 0"]
+  s.add_development_dependency %q<rake>, ["< 11.0"]
   s.add_development_dependency %q<guard>, [">= 0.9.0"]
   s.add_development_dependency %q<guard-rspec>, [">= 0"]
+  s.add_development_dependency %q<listen>, ["< 3.1.0"]
   s.add_development_dependency %q<ruby_gntp>, [">= 0"]
   s.add_development_dependency %q<guard-rake>, [">= 0"]
   s.add_development_dependency %q<rake-compiler>, [">= 0"]
   s.add_development_dependency %q<coveralls>, [">= 0"]
+
+  if RUBY_VERSION < '2.0'
+    s.add_development_dependency %q<term-ansicolor>, ["< 1.3.1"]
+    s.add_development_dependency %q<tins>, ["~> 1.6.0"]
+  end
 end

data/spec/ruby_speech/grxml/builtins_spec.rb

@@ -119,22 +119,31 @@ describe RubySpeech::GRXML::Builtins do
     it { should not_match('#') }
   end
 
-  describe "number" do
+  describe 'number' do
     subject(:grammar) { described_class.number }
 
-    it { should match('0').and_interpret_as('dtmf-0') }
-    it { should match('123').and_interpret_as('dtmf-1 dtmf-2 dtmf-3') }
-    it { should match('1*01').and_interpret_as('dtmf-1 dtmf-star dtmf-0 dtmf-1') }
-    it { should match('01*00').and_interpret_as('dtmf-0 dtmf-1 dtmf-star dtmf-0 dtmf-0') }
-    it { should match('100000000000*00').and_interpret_as('dtmf-1 dtmf-0 dtmf-0 dtmf-0 dtmf-0 dtmf-0 dtmf-0 dtmf-0 dtmf-0 dtmf-0 dtmf-0 dtmf-0 dtmf-star dtmf-0 dtmf-0') }
-    it { should match('0*08').and_interpret_as('dtmf-0 dtmf-star dtmf-0 dtmf-8') }
-    it { should match('*59').and_interpret_as('dtmf-star dtmf-5 dtmf-9') }
-    it { should match('0*0').and_interpret_as('dtmf-0 dtmf-star dtmf-0') }
-    it { should match('10*5').and_interpret_as('dtmf-1 dtmf-0 dtmf-star dtmf-5') }
-    it { should match('123*').and_interpret_as('dtmf-1 dtmf-2 dtmf-3 dtmf-star') }
-    it { should match('123*2342').and_interpret_as('dtmf-1 dtmf-2 dtmf-3 dtmf-star dtmf-2 dtmf-3 dtmf-4 dtmf-2') }
+    it { should match('0').and_interpret_as 'dtmf-0' }
+    it { should match('123').and_interpret_as 'dtmf-1 dtmf-2 dtmf-3' }
+    it { should match('1*01').and_interpret_as dtmf_seq %w(1 star 0 1) }
+    it { should match('01*00').and_interpret_as dtmf_seq %w(0 1 star 0 0) }
+    it do
+      should match('100000000000*00')
+        .and_interpret_as dtmf_seq %w(1 0 0 0 0 0 0 0 0 0 0 0 star 0 0)
+    end
+    it { should match('0*08').and_interpret_as dtmf_seq %w(0 star 0 8) }
+    it { should match('*59').and_interpret_as 'dtmf-star dtmf-5 dtmf-9' }
+    it { should match('0*0').and_interpret_as 'dtmf-0 dtmf-star dtmf-0' }
+    it { should match('10*5').and_interpret_as dtmf_seq %w(1 0 star 5) }
+    it { should match('123*').and_interpret_as dtmf_seq %w(1 2 3 star) }
+    it do
+      should match('123*2342').and_interpret_as dtmf_seq %w(1 2 3 star 2 3 4 2)
+    end
 
-    it { should not_match('#') }
+    it { should potentially_match '*' }
+
+    it { should not_match '#' }
+    it { should not_match '**' }
+    it { should not_match '0123*456*789' }
   end
 
   describe "phone" do

data/spec/ruby_speech/grxml/grammar_spec.rb

@@ -232,6 +232,140 @@ module RubySpeech
           grammar.inline!.should == inline_grammar
           grammar.should == inline_grammar
         end
+
+        context 'nested' do
+          let :expected_doc do
+            RubySpeech::GRXML.draw mode: :dtmf, root: 'main' do
+              rule id: :main, scope: 'public' do
+                string "How about an oatmeal cookie?  You'll feel better."
+              end
+            end
+          end
+
+          context '1 level deep' do
+            subject do
+              RubySpeech::GRXML.draw mode: :dtmf, root: 'main' do
+                rule id: :main, scope: 'public' do
+                  ruleref uri: '#rabbit_hole2'
+                end
+                rule id: 'rabbit_hole2' do
+                  string "How about an oatmeal cookie?  You'll feel better."
+                end
+              end.inline
+            end
+
+            it { should eq expected_doc }
+          end
+
+          context '2 levels deep' do
+            subject do
+              RubySpeech::GRXML.draw mode: :dtmf, root: 'main' do
+                rule id: :main, scope: 'public' do
+                  ruleref uri: '#rabbit_hole2'
+                end
+                rule id: 'rabbit_hole2' do
+                  ruleref uri: '#rabbit_hole3'
+                end
+                rule id: 'rabbit_hole3' do
+                  string "How about an oatmeal cookie?  You'll feel better."
+                end
+              end.inline
+            end
+
+            it { should eq expected_doc }
+          end
+
+          context '3 levels deep' do
+            subject do
+              RubySpeech::GRXML.draw mode: :dtmf, root: 'main' do
+                rule id: :main, scope: 'public' do
+                  ruleref uri: '#rabbit_hole2'
+                end
+                rule id: 'rabbit_hole2' do
+                  ruleref uri: '#rabbit_hole3'
+                end
+                rule id: 'rabbit_hole3' do
+                  ruleref uri: '#rabbit_hole4'
+                end
+                rule id: 'rabbit_hole4' do
+                  string "How about an oatmeal cookie?  You'll feel better."
+                end
+              end.inline
+            end
+
+            it { should eq expected_doc }
+          end
+
+          context 'in a self-referencial infinite loop' do
+            subject do
+              RubySpeech::GRXML.draw mode: :dtmf, root: 'main' do
+                rule id: :main, scope: 'public' do
+                  ruleref uri: '#paradox'
+                end
+                rule id: 'paradox' do
+                  ruleref uri: '#paradox'
+                end
+              end.inline
+            end
+
+            it 'should raise an Exception' do
+              expect { subject }
+                .to raise_error RubySpeech::GRXML::ReferentialLoopError
+            end
+          end
+
+          context 'in a cross-referencial infinite loop' do
+            subject do
+              RubySpeech::GRXML.draw mode: :dtmf, root: 'main' do
+                rule id: :main, scope: 'public' do
+                  ruleref uri: '#007'
+                end
+                rule id: '007' do
+                  one_of do
+                    item do
+                      ruleref uri: '#bond'
+                    end
+                  end
+                end
+                rule id: 'bond' do
+                  one_of do
+                    item do
+                      ruleref uri: '#james_bond'
+                    end
+                  end
+                end
+                rule id: 'james_bond' do
+                  one_of do
+                    item do
+                      ruleref uri: '#007'
+                    end
+                  end
+                end
+              end.inline
+            end
+
+            it 'should raise an Exception' do
+              expect { subject }
+                .to raise_error RubySpeech::GRXML::ReferentialLoopError
+            end
+          end
+
+          context 'with an invalid-reference' do
+            subject do
+              RubySpeech::GRXML.draw mode: :dtmf, root: 'main' do
+                rule id: :main, scope: 'public' do
+                  ruleref uri: '#lost'
+                end
+              end.inline
+            end
+
+            it 'should raise a descriptive exception' do
+              expect { subject }
+                .to raise_error RubySpeech::GRXML::MissingReferenceError,
+                                "Ruleref '#lost' is referenced but not defined"
+            end
+          end
+        end
       end
 
       describe "#tokenize!" do

data/spec/ruby_speech/grxml/matcher_spec.rb

@@ -516,6 +516,50 @@ module RubySpeech
           end
         end
 
+        context "with a grammar that takes a a specific digit repeated within a range" do
+          let(:grammar) do
+            GRXML.draw :mode => :dtmf, :root => 'digits' do
+              rule :id => 'digits' do
+                item :repeat => 0..3 do
+                  '6'
+                end
+              end
+            end
+          end
+
+          {
+            '' => '',
+            '6' => 'dtmf-6',
+            '66' => 'dtmf-6 dtmf-6',
+          }.each_pair do |input, interpretation|
+            it "should match '#{input}'" do
+              expected_match = GRXML::Match.new :mode           => :dtmf,
+                                                :confidence     => 1,
+                                                :utterance      => input,
+                                                :interpretation => interpretation
+              subject.match(input).should == expected_match
+            end
+          end
+
+          {
+            '666' => 'dtmf-6 dtmf-6 dtmf-6',
+          }.each_pair do |input, interpretation|
+            it "should maximally match '#{input}'" do
+              expected_match = GRXML::MaxMatch.new :mode        => :dtmf,
+                                                :confidence     => 1,
+                                                :utterance      => input,
+                                                :interpretation => interpretation
+              subject.match(input).should == expected_match
+            end
+          end
+
+          %w{6666 7}.each do |input|
+            it "should not match '#{input}'" do
+              subject.match(input).should == GRXML::NoMatch.new
+            end
+          end
+        end
+
         context "with a grammar that takes a a specific digit repeated within a range, followed by specific digit" do
           let(:grammar) do
             GRXML.draw :mode => :dtmf, :root => 'digits' do

data/spec/ruby_speech/ssml/break_spec.rb

@@ -21,14 +21,28 @@ module RubySpeech
       end
 
       describe "from a document" do
-        let(:document) { '<break strength="strong" time="3"/>' }
-
         subject { Element.import document }
 
-        it { should be_instance_of Break }
+        context 'with time of 3' do
+          let(:document) { '<break strength="strong" time="3"/>' }
 
-        its(:strength)  { should == :strong }
-        its(:time)      { should == 3 }
+          it { should be_instance_of Break }
+
+          its(:strength)  { should == :strong }
+          its(:time)      { should eql 3.0 }
+        end
+
+        context 'with time of 4s' do
+          let(:document) { '<break time="4s"/>' }
+
+          its(:time)      { should eql 4.0 }
+        end
+
+        context 'with time of 5555ms' do
+          let(:document) { '<break time="5555ms"/>' }
+
+          its(:time)      { should eql 5.555 }
+        end
       end
 
       describe "#strength" do
@@ -51,10 +65,16 @@ module RubySpeech
       end
 
       describe "#time" do
-        context "with a valid value" do
+        context "with a valid whole seconds value of 3" do
           before { subject.time = 3 }
 
-          its(:time) { should == 3 }
+          its(:time) { should eql 3.0 }
+        end
+
+        context "with a valid fractional seconds value of 3.5" do
+          before { subject.time = 3.5 }
+
+          its(:time) { should eql 3.5 }
         end
 
         context "with a negative value" do

data/spec/ruby_speech/ssml/prosody_spec.rb

@@ -16,7 +16,7 @@ module RubySpeech
         its(:contour)   { should == 'something' }
         its(:range)     { should == '20Hz' }
         its(:rate)      { should == 2 }
-        its(:duration)  { should == 10 }
+        its(:duration)  { should eql 10 }
         its(:volume)    { should == :loud }
       end
 
@@ -35,7 +35,7 @@ module RubySpeech
         its(:contour)   { should == 'something' }
         its(:range)     { should == '20Hz' }
         its(:rate)      { should == 2 }
-        its(:duration)  { should == 10 }
+        its(:duration)  { should eql 10 }
         its(:volume)    { should == :loud }
       end
 
@@ -149,6 +149,24 @@ module RubySpeech
           it "with a negative value" do
             lambda { subject.rate = -100 }.should raise_error(ArgumentError, "You must specify a valid rate ([positive-number](multiplier), :\"x-slow\", :slow, :medium, :fast, :\"x-fast\", :default)")
           end
+
+          describe "with a percentage" do
+            before { subject.rate = "22.5%" }
+
+            its(:rate) { should == "22.5%" }
+          end
+
+          describe "with a percentage and a plus sign" do
+            before { subject.rate = "+22.5%" }
+
+            its(:rate) { should == "+22.5%" }
+          end
+
+          describe "with a percentage and a minus sign" do
+            before { subject.rate = "-22.5%" }
+
+            its(:rate) { should == "-22.5%" }
+          end
         end
       end
 
@@ -156,7 +174,7 @@ module RubySpeech
         context "with a valid value" do
           before { subject.duration = 3 }
 
-          its(:duration) { should == 3 }
+          its(:duration) { should eql 3 }
         end
 
         context "with a negative value" do

data/spec/spec_helper.rb

@@ -1,8 +1,14 @@
-require 'ruby_speech'
+# encoding: utf-8
+# frozen_string_literal: true
 
-require 'coveralls'
+require "coveralls"
 Coveralls.wear!
 
+%w{
+  rspec/its
+  ruby_speech
+}.each { |f| require f }
+
 Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
 
 schema_file_path = File.expand_path File.join(__FILE__, '../../assets/synthesis.xsd')

data/spec/support/dtmf_helper.rb

@@ -0,0 +1,14 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
+#
+# Convert a simple DTMF string from "1 star 2" to "dtmf-1 dtmf-star dtmf-2".
+#
+# @param [Array] sequence A set of DTMF keys, such as `%w(1 star 2)`.
+#
+# @return [String] A string with "dtmf-" prefixed for each DTMF element.
+#                  Example: "dtmf-1 dtmf-star dtmf-2".
+#
+def dtmf_seq(sequence)
+  sequence.map { |d| "dtmf-#{d}" }.join ' '
+end

metadata

@@ -1,203 +1,231 @@
 --- !ruby/object:Gem::Specification
 name: ruby_speech
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.4.0
 platform: java
 authors:
 - Ben Langfeld
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-04-21 00:00:00.000000000 Z
+date: 2018-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
   name: nokogiri
+  prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.6.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 3.0.7
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+  name: activesupport
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: activesupport
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.7
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.7
-    - - <
-      - !ruby/object:Gem::Version
-        version: 5.0.0
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency
+        version: 1.0.0
   name: bundler
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.99.0
+  name: rspec
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 2.99.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '0'
+  name: rspec-its
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: ci_reporter
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.3
+        version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.3
+        version: '1.6'
+  name: ci_reporter
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: yard
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '1.6'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
+  name: yard
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
+  name: rake
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: guard
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '11.0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
+  name: guard
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   name: guard-rspec
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
+  name: listen
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: ruby_gntp
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: ruby_gntp
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: guard-rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: guard-rake
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: rake-compiler
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: coveralls
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: coveralls
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Prepare SSML and GRXML documents with ease
 email:
 - ben@langfeld.me
@@ -205,10 +233,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .hound.yml
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".hound.yml"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -244,6 +272,7 @@ files:
 - lib/ruby_speech/nlsml.rb
 - lib/ruby_speech/nlsml/builder.rb
 - lib/ruby_speech/nlsml/document.rb
+- lib/ruby_speech/ruby_speech.jar
 - lib/ruby_speech/ssml.rb
 - lib/ruby_speech/ssml/audio.rb
 - lib/ruby_speech/ssml/break.rb
@@ -293,11 +322,11 @@ files:
 - spec/ruby_speech/ssml_spec.rb
 - spec/ruby_speech_spec.rb
 - spec/spec_helper.rb
+- spec/support/dtmf_helper.rb
 - spec/support/grammar_matchers.rb
 - spec/support/match_examples.rb
 - spec/support/matchers.rb
-- lib/ruby_speech/ruby_speech.jar
-homepage: https://github.com/benlangfeld/ruby_speech
+homepage: https://github.com/adhearsion/ruby_speech
 licenses:
 - MIT
 metadata: {}
@@ -307,17 +336,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: ruby_speech
-rubygems_version: 2.1.9
+rubygems_version: 2.6.14
 signing_key:
 specification_version: 4
 summary: A Ruby library for TTS & ASR document preparation
@@ -353,7 +382,7 @@ test_files:
 - spec/ruby_speech/ssml_spec.rb
 - spec/ruby_speech_spec.rb
 - spec/spec_helper.rb
+- spec/support/dtmf_helper.rb
 - spec/support/grammar_matchers.rb
 - spec/support/match_examples.rb
 - spec/support/matchers.rb
-has_rdoc: