ruby_speech 2.3.0-java → 2.3.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49c9d49fb76dbc490de3e8fc4622dcb0836332ff
-  data.tar.gz: dde47c62b7a6ef5911b7395187047e0fb87f326d
+  metadata.gz: 2392c6cf73b13b54d94cd854f0b58cf4787356f1
+  data.tar.gz: cf5c6d4c8d537416c6389974237b5b965a898d25
 SHA512:
-  metadata.gz: 169ac9da33d7d66d972956f71f87abff5957559aa6ceeee8473a6427c89d0465937146b728cfe353789db113de3f1b36d826b2aaf408c0bbb22aaf37c56e15ad
-  data.tar.gz: 4d12ad1b5ebddbc881d951005b9529ac37ab6959544e32ee0f2e6c397cee1e65440ade9c9f4be9f92852351fd48f700ce326e00f34009717cb57c3396f0d85a8
+  metadata.gz: 7aeeeeb1b5bf64c26f936f29e2df02b4c9198340efa535dd403429aaabbc753a98c03bc27178c4f3e58dab13affd13456d5064b7562549b7e48dba3a185213a2
+  data.tar.gz: ade7291fd515e30ea1ca77d76a6fc59878687a6c985e724a2b00add1b8cfeebf4cf897a6eadb057c05b464138f7d0504060faca40d327b2e4c382540a448eb17

data/.travis.yml

@@ -3,6 +3,7 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - jruby-19mode
   - rbx-19mode
   - ruby-head

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # [develop](https://github.com/benlangfeld/ruby_speech)
 
+# [2.3.1](https://github.com/benlangfeld/ruby_speech/compare/v2.3.0...v2.3.1) - [2014-02-24](https://rubygems.org/gems/ruby_speech/versions/2.3.1)
+  * Bugfix: Phone number grammar should only allow a single instance of '*'/'x'
+  * Bugfix: Concatenating documents containing strings across the border inserts appropriate spacing (#21).
+
 # [2.3.0](https://github.com/benlangfeld/ruby_speech/compare/v2.2.2...v2.3.0) - [2013-09-30](https://rubygems.org/gems/ruby_speech/versions/2.3.0)
   * Feature: Allow generation of a boolean, date, digits, currency, number, phone or time grammar including from URIs
   * Bugfix: Ensure that rule refs can be reused when inlining grammars

data/lib/ruby_speech/generic_element.rb

@@ -105,12 +105,16 @@ module RubySpeech
       new_doc = Nokogiri::XML::Document.new
       self.class.new(new_doc).tap do |new_element|
         new_doc.root = new_element.node
+        string_types = [String, Nokogiri::XML::Text]
+        include_spacing = string_types.include?(self.nokogiri_children.last.class) && string_types.include?(other.nokogiri_children.first.class)
         if Nokogiri.jruby?
           new_element.add_child self.clone.nokogiri_children
+          new_element << " " if include_spacing
           new_element.add_child other.clone.nokogiri_children
         else
           # TODO: This is yucky because it requires serialization
           new_element.add_child self.nokogiri_children.to_xml
+          new_element << " " if include_spacing
           new_element.add_child other.nokogiri_children.to_xml
         end
       end

data/lib/ruby_speech/grxml/builtins.rb

@@ -146,12 +146,21 @@ module RubySpeech::GRXML::Builtins
     RubySpeech::GRXML.draw mode: :dtmf, root: 'number' do
       rule id: 'number', scope: 'public' do
         item repeat: '1-' do
-          one_of do
-            0.upto(9) { |d| item { d.to_s } }
-            item { '*' }
+          ruleref uri: '#digit'
+        end
+        item repeat: '0-1' do
+          item { '*' }
+          item repeat: '0-' do
+            ruleref uri: '#digit'
           end
         end
       end
+
+      rule id: 'digit' do
+        one_of do
+          0.upto(9) { |d| item { d.to_s } }
+        end
+      end
     end
   end
 

data/lib/ruby_speech/version.rb

@@ -1,3 +1,3 @@
 module RubySpeech
-  VERSION = "2.3.0"
+  VERSION = "2.3.1"
 end

data/spec/ruby_speech/grxml/builtins_spec.rb

@@ -143,11 +143,11 @@ describe RubySpeech::GRXML::Builtins do
     it { should match('0').and_interpret_as('dtmf-0') }
     it { should match('0123').and_interpret_as('dtmf-0 dtmf-1 dtmf-2 dtmf-3') }
     it { should match('0123*456').and_interpret_as('dtmf-0 dtmf-1 dtmf-2 dtmf-3 dtmf-star dtmf-4 dtmf-5 dtmf-6') }
-    it { should match('0123*456*789').and_interpret_as('dtmf-0 dtmf-1 dtmf-2 dtmf-3 dtmf-star dtmf-4 dtmf-5 dtmf-6 dtmf-star dtmf-7 dtmf-8 dtmf-9') }
 
     it { should potentially_match('') }
 
     it { should not_match('#') }
+    it { should not_match('0123*456*789') }
   end
 
   describe "time" do

data/spec/ruby_speech/ssml/speak_spec.rb

@@ -182,6 +182,27 @@ module RubySpeech
         concat.document.root.should == concat
         concat.to_s.should_not include('default')
       end
+
+      context "when concatenating" do
+        describe "simple strings" do
+          it "inserts a space between them" do
+            speak1 = SSML.draw do
+              string "Hi, my name"
+            end
+
+            speak2 = SSML.draw do
+              string "is Frank"
+            end
+
+            expected_concat = SSML.draw do
+              string "Hi, my name is Frank"
+            end
+
+            concat = (speak1 + speak2)
+            concat.should == expected_concat
+          end
+        end
+      end
     end # Speak
   end # SSML
 end # RubySpeech

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_speech
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: java
 authors:
 - Ben Langfeld
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -316,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ruby_speech
-rubygems_version: 2.0.7
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: A Ruby library for TTS & ASR document preparation