ruby_speech 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a8d3e73e5f227d7d3da08899c03911a31608f8d
-  data.tar.gz: 56f12469b5e17e34b587a0158b7cbe112db4f5a4
+  metadata.gz: caf6dc66fd5b216e0825c25c2df9c16324e955e1
+  data.tar.gz: ecd61a61b6a362521b6915d7eac46b47556f55c0
 SHA512:
-  metadata.gz: 041a96833583708890574c64eb659a0d1898b4d7b86296a6ca0932ea3696a4918aba4bee41343689e6a30ec67f20b8761d5b44e0e5a7d9e540aa8245524f96a8
-  data.tar.gz: 932a81c99d79b66ea580f1377c0c4ed2b84b40fd67f3b132e650385ffa6fa2e377073c46acac5c72c2251d4b0666820fa4b1dffc93553f0261d116024b55c930
+  metadata.gz: 1a08ac02e15a99aaf0f4ec753cb22fbf63304d4d42df34215dffe15255d344cf2d06bc23ab448f2152069e1c074d3d47b9a4978a4e04a1a746124a5658ce8a1e
+  data.tar.gz: 4a96f1f2fb4a56a08f6328bd6caa89ec4b47ee8638ee1c0d2e7bd3e2a867274b1d19d43039b423144e7e195140380e474c1533109e5ca0d165fc919e3b63fc69

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # [develop](https://github.com/benlangfeld/ruby_speech)
 
+# [2.1.2](https://github.com/benlangfeld/ruby_speech/compare/v2.1.1...v2.1.2) - [2013-06-05](https://rubygems.org/gems/ruby_speech/versions/2.1.2)
+  * Bugfix: Allow wrapping a pre-parsed XML node nested arbitrary deeply as an NLSML document
+
 # [2.1.1](https://github.com/benlangfeld/ruby_speech/compare/v2.1.0...v2.1.1) - [2013-05-09](https://rubygems.org/gems/ruby_speech/versions/2.1.1)
   * Bugfix: Support numeric SISR literal tags
 

data/lib/ruby_speech/nlsml/document.rb

@@ -4,15 +4,16 @@ module RubySpeech
   module NLSML
     class Document < SimpleDelegator
       def initialize(xml)
-        unless xml.root.namespace
-          xml.root.default_namespace = NLSML_NAMESPACE
-          xml = Nokogiri::XML.parse xml.to_xml, nil, nil, Nokogiri::XML::ParseOptions::NOBLANKS
+        result = xml.respond_to?(:root) ? xml.root : xml
+        unless result.namespace
+          result.default_namespace = NLSML_NAMESPACE
+          result = Nokogiri::XML.parse(xml.to_xml, nil, nil, Nokogiri::XML::ParseOptions::NOBLANKS).root
         end
-        super
+        super result
       end
 
       def grammar
-        result['grammar']
+        self['grammar']
       end
 
       def interpretations
@@ -44,15 +45,15 @@ module RubySpeech
       end
 
       def nomatch_elements
-        result.xpath 'ns:interpretation/ns:input/ns:nomatch', 'ns' => NLSML_NAMESPACE
+        xpath 'ns:interpretation/ns:input/ns:nomatch', 'ns' => NLSML_NAMESPACE
       end
 
       def noinput_elements
-        result.xpath 'ns:interpretation/ns:input/ns:noinput', 'ns' => NLSML_NAMESPACE
+        xpath 'ns:interpretation/ns:input/ns:noinput', 'ns' => NLSML_NAMESPACE
       end
 
       def input_elements
-        result.xpath 'ns:interpretation/ns:input', 'ns' => NLSML_NAMESPACE
+        xpath 'ns:interpretation/ns:input', 'ns' => NLSML_NAMESPACE
       end
 
       def input_hash_for_interpretation(interpretation)
@@ -107,12 +108,8 @@ module RubySpeech
         }
       end
 
-      def result
-        root
-      end
-
       def interpretation_nodes
-        nodes = result.xpath 'ns:interpretation', 'ns' => NLSML_NAMESPACE
+        nodes = xpath 'ns:interpretation', 'ns' => NLSML_NAMESPACE
         nodes.sort_by { |int| -int[:confidence].to_f }
       end
     end

data/lib/ruby_speech/version.rb

@@ -1,3 +1,3 @@
 module RubySpeech
-  VERSION = "2.1.1"
+  VERSION = "2.1.2"
 end

data/spec/ruby_speech/nlsml_spec.rb

@@ -124,6 +124,41 @@ describe RubySpeech::NLSML do
       subject.should_not be == RubySpeech.parse(empty_result)
     end
 
+    context "when the XML is already parsed and is not the root of a document" do
+      let :example_document do
+        '''
+<foo>
+  <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>
+        <airline>
+          <to_city>Pittsburgh</to_city>
+        </airline>
+      </instance>
+    </interpretation>
+    <interpretation confidence="0.4">
+      <input>I want to go to Stockholm</input>
+      <instance>
+        <airline>
+          <to_city>Stockholm</to_city>
+        </airline>
+      </instance>
+    </interpretation>
+  </result>
+</foo>
+        '''
+      end
+
+      let(:node) { Nokogiri::XML(example_document).at_xpath('//mrcp:result', mrcp: "http://www.ietf.org/xml/ns/mrcpv2") }
+
+      subject do
+        RubySpeech::NLSML::Document.new node
+      end
+
+      its(:grammar) { should == 'http://flight' }
+    end
+
     context "with an interpretation that has no instance" do
       let :example_document do
         '''

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_speech
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Ben Langfeld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-09 00:00:00.000000000 Z
+date: 2013-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: niceogiri
@@ -319,7 +319,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ruby_speech
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A Ruby library for TTS & ASR document preparation