Merge branch 'release/0.3.3' into develop

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.3.3
+  * Allow `SSML::Element.import` and `GRXML::Element.import` to take a string as well as a Nokogiri::XML::Node
+  * Allow importing GRXML/SSML documents via their respective modules (eg `RubySpeech::GRXML.import '<grammar ... />'`)
+
 # 0.3.2
   * Fix inheriting an `SSML::Speak`'s language. Previously an imported `<speak/>` would end up with a `lang` attribute in addition to `xml:lang`, and `xml:lang` would have the default value (`en-US`). This required a Niceogiri dependency update.
 

lib/ruby_speech/grxml.rb

@@ -21,5 +21,9 @@ def self.draw(attributes = {}, &block)
         grammar << block_return if block_return.is_a?(String)
       end
     end
+
+    def self.import(other)
+      Element.import other
+    end
   end # GRXML
 end # RubySpeech

lib/ruby_speech/ssml.rb

@@ -21,5 +21,9 @@ def self.draw(&block)
         speak << block_return if block_return.is_a?(String)
       end
     end
+
+    def self.import(other)
+      Element.import other
+    end
   end # SSML
 end # RubySpeech

lib/ruby_speech/version.rb

@@ -1,3 +1,3 @@
 module RubySpeech
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

spec/ruby_speech/grxml_spec.rb

@@ -229,7 +229,7 @@ module RubySpeech
           GRXML::Grammar.new.tap { |doc| doc << rule }.to_s
         end
 
-        let(:import) { GRXML::Element.import document }
+        let(:import) { GRXML.import document }
 
         subject { import }
 

spec/ruby_speech/ssml_spec.rb

@@ -238,7 +238,7 @@ module RubySpeech
         SSML::Speak.new.tap { |doc| doc << voice }.to_s
       end
 
-      let(:import) { SSML::Element.import document }
+      let(:import) { SSML.import document }
 
       subject { import }