ruby_speech 2.3.1-java → 2.3.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2392c6cf73b13b54d94cd854f0b58cf4787356f1
-  data.tar.gz: cf5c6d4c8d537416c6389974237b5b965a898d25
+  metadata.gz: ce3cb16ff3eaf366c78390c3473c6c490c08371a
+  data.tar.gz: 389193549cb748c0da31dadaf564e1b31786c5f2
 SHA512:
-  metadata.gz: 7aeeeeb1b5bf64c26f936f29e2df02b4c9198340efa535dd403429aaabbc753a98c03bc27178c4f3e58dab13affd13456d5064b7562549b7e48dba3a185213a2
-  data.tar.gz: ade7291fd515e30ea1ca77d76a6fc59878687a6c985e724a2b00add1b8cfeebf4cf897a6eadb057c05b464138f7d0504060faca40d327b2e4c382540a448eb17
+  metadata.gz: ff3712f5fcb287299ce97b7389c7f2be8e991116f320600014b415f4d90818c3f3e4c1d043303eac2a6e866705770b625f63aaf5c3e2364bb87eaf4cbe9be4bc
+  data.tar.gz: 051bcf95b593cb586bad668a47c60b61ba009f05807204f978d4ae295e038eda05260307932355ff5b5b28034a7d6501153c1e974e2bb1bc3e1bf008be602799

data/.hound.yml

@@ -0,0 +1,2 @@
+LineLength:
+  Enabled: false

data/.travis.yml

@@ -4,8 +4,8 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
-  - jruby-19mode
-  - rbx-19mode
+  - jruby
+  - rbx
   - ruby-head
 matrix:
   allow_failures:

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # [develop](https://github.com/benlangfeld/ruby_speech)
 
+# [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
+  * Bugfix: Drawing an NLSML doc should return something structured/parsed
+  * Bugfix: Cloning SSML documents no longer turns them into GRXML docs
+
 # [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).

data/README.md

@@ -259,7 +259,7 @@ require 'ruby_speech'
 
 nlsml = RubySpeech::NLSML.draw grammar: 'http://flight' do
   interpretation confidence: 0.6 do
-    input "I want to go to Pittsburgh", mode: :speech
+    input "I want to go to Pittsburgh", mode: :voice
 
     instance do
       airline do
@@ -288,7 +288,7 @@ becomes:
 <?xml version="1.0"?>
 <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>
+    <input mode="voice">I want to go to Pittsburgh</input>
     <instance>
       <airline>
         <to_city>Pittsburgh</to_city>
@@ -315,7 +315,7 @@ document.match? # => true
 document.interpretations # => [
       {
         confidence: 0.6,
-        input: { mode: :speech, content: 'I want to go to Pittsburgh' },
+        input: { mode: :voice, content: 'I want to go to Pittsburgh' },
         instance: { airline: { to_city: 'Pittsburgh' } }
       },
       {
@@ -326,7 +326,7 @@ document.interpretations # => [
     ]
 document.best_interpretation # => {
           confidence: 0.6,
-          input: { mode: :speech, content: 'I want to go to Pittsburgh' },
+          input: { mode: :voice, content: 'I want to go to Pittsburgh' },
           instance: { airline: { to_city: 'Pittsburgh' } }
         }
 ```

data/lib/ruby_speech/generic_element.rb

@@ -172,11 +172,11 @@ module RubySpeech
     end
 
     def string(other)
-      self << Nokogiri::XML::Text.new(other, document)
+      self << Nokogiri::XML::Text.new(other.to_s, document)
     end
 
     def clone
-      GRXML.import to_xml
+      self.class.import to_xml
     end
 
     def traverse(&block)

data/lib/ruby_speech/nlsml/builder.rb

@@ -5,11 +5,12 @@ module RubySpeech
 
       def initialize(options = {}, &block)
         options = {'xmlns' => NLSML_NAMESPACE}.merge(options)
-        @document = Nokogiri::XML::Builder.new do |builder|
+        xml_doc = Nokogiri::XML::Builder.new do |builder|
           builder.result options do |r|
             apply_block r, &block
           end
         end.doc
+        @document = RubySpeech::NLSML::Document.new xml_doc
       end
 
       def interpretation(*args, &block)

data/lib/ruby_speech/nlsml/document.rb

@@ -38,6 +38,10 @@ module RubySpeech
         noinput_elements.any?
       end
 
+      def to_xml
+        document.to_xml
+      end
+
       private
 
       def nomatch?
@@ -58,6 +62,7 @@ module RubySpeech
 
       def input_hash_for_interpretation(interpretation)
         input_element = interpretation.at_xpath 'ns:input', 'ns' => NLSML_NAMESPACE
+        return unless input_element
         { content: input_element.content }.tap do |h|
           h[:mode] = input_element['mode'].to_sym if input_element['mode']
         end

data/lib/ruby_speech/version.rb

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

data/spec/ruby_speech/grxml_spec.rb

@@ -242,7 +242,7 @@ module RubySpeech
             string "HELLO?"
             item :weight => 2.5
             one_of do
-              item { "1" }
+              item { string 1 }
               item { "2" }
             end
             ruleref :uri => '#test'

data/spec/ruby_speech/nlsml_spec.rb

@@ -55,6 +55,22 @@ describe RubySpeech::NLSML do
       document.to_xml.should == expected_document
     end
 
+    it "should return a structured/parsed 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 do
+            airline do
+              to_city 'Pittsburgh'
+            end
+          end
+        end
+      end
+
+      document.should be_match
+    end
+
     context "with a string instance" do
       let :example_document do
         '''
@@ -198,6 +214,38 @@ describe RubySpeech::NLSML do
       its(:best_interpretation) { should == expected_best_interpretation }
     end
 
+    context "with an interpretation that has no input" do
+      let :example_document do
+        '''
+<result xmlns="http://www.ietf.org/xml/ns/mrcpv2" grammar="http://flight">
+  <interpretation confidence="0.6">
+    <instance>
+      <airline>
+        <to_city>Pittsburgh</to_city>
+      </airline>
+    </instance>
+  </interpretation>
+</result>
+        '''
+      end
+
+      let(:expected_best_interpretation) do
+        {
+          confidence: 0.6,
+          input: nil,
+          instance: { airline: { to_city: 'Pittsburgh' } },
+          instances: [{ airline: { to_city: 'Pittsburgh' } }]
+        }
+      end
+
+      let(:expected_interpretations) do
+        [expected_best_interpretation]
+      end
+
+      its(:interpretations)     { should == expected_interpretations }
+      its(:best_interpretation) { should == expected_best_interpretation }
+    end
+
     context "with a string instance" do
       let :example_document do
         '''

data/spec/ruby_speech/ssml_spec.rb

@@ -81,6 +81,30 @@ module RubySpeech
         SSML.draw { string foo }.should == expected_doc
       end
 
+      describe 'cloning' do
+        context 'SSML documents' do
+          let :original do
+            RubySpeech::SSML.draw do
+              string "Hi, I'm Fred."
+            end
+          end
+
+          subject { original.clone }
+
+          it 'should match the contents of the original document' do
+            subject.to_s.should == original.to_s
+          end
+
+          it 'should match the class of the original document' do
+            subject.class.should == original.class
+          end
+
+          it 'should be equal to the original document' do
+            subject.should == original
+          end
+        end
+      end
+
       describe "embedding" do
         it "SSML documents" do
           doc1 = RubySpeech::SSML.draw do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_speech
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: java
 authors:
 - Ben Langfeld
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -206,6 +206,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .hound.yml
 - .rspec
 - .travis.yml
 - CHANGELOG.md