ruby_speech 0.2.0 → 0.2.1

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.2.1
+  Bugfix: SSML element's children now include any text content, and text content is copied when importing/concatenating documents
+
 # 0.2.0
   Feature: SSML elements can now be imported from a Nokogiri Node or a string
   Feature: SSML elements now respond to #children with an array of SSML elements, rather than a Nokogiri NodeSet

data/lib/ruby_speech/ssml/element.rb

@@ -37,8 +37,9 @@ module RubySpeech
       # @param [XML::Node] node the node to import
       # @return the appropriate object based on the node name and namespace
       def self.import(node)
+        return node.content if node.is_a?(Nokogiri::XML::Text)
         klass = class_from_registration(node.element_name)
-        event = if klass && klass != self
+        if klass && klass != self
           klass.import node
         else
           new.inherit node
@@ -66,7 +67,7 @@ module RubySpeech
       end
 
       def children
-        super.reject { |c| c.is_a?(Nokogiri::XML::Text) }.map { |c| Element.import c }
+        super.map { |c| Element.import c }
       end
 
       def method_missing(method_name, *args, &block)

data/lib/ruby_speech/version.rb

@@ -1,3 +1,3 @@
 module RubySpeech
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/ruby_speech/ssml/speak_spec.rb

@@ -160,10 +160,12 @@ module RubySpeech
         speak1 = Speak.new
         speak1 << Voice.new(:name => 'frank', :content => "Hi, I'm Frank")
         speak2 = Speak.new
+        speak2 << "Hello there"
         speak2 << Voice.new(:name => 'millie', :content => "Hi, I'm Millie")
 
         expected_concat = Speak.new
         expected_concat << Voice.new(:name => 'frank', :content => "Hi, I'm Frank")
+        expected_concat << "Hello there"
         expected_concat << Voice.new(:name => 'millie', :content => "Hi, I'm Millie")
 
         concat = (speak1 + speak2)

data/spec/ruby_speech/ssml_spec.rb

@@ -160,9 +160,11 @@ module RubySpeech
     end
 
     describe "importing nested tags" do
+      let(:say_as) { SSML::SayAs.new :interpret_as => 'date', :format => 'dmy', :content => "01/02/1960" }
+      let(:string) { "Hi, I'm Fred. The time is currently " }
       let :voice do
-        SSML::Voice.new(:gender => :male, :name => 'fred', :content => "Hi, I'm Fred. The time is currently ").tap do |voice|
-          voice << SSML::SayAs.new(:interpret_as => 'date', :format => 'dmy', :content => "01/02/1960")
+        SSML::Voice.new(:gender => :male, :name => 'fred', :content => string).tap do |voice|
+          voice << say_as
         end
       end
 
@@ -170,7 +172,9 @@ module RubySpeech
         SSML::Speak.new.tap { |doc| doc << voice }.to_s
       end
 
-      subject { SSML::Element.import parse_xml(document).root }
+      let(:import) { SSML::Element.import parse_xml(document).root }
+
+      subject { import }
 
       it "should work" do
         lambda { subject }.should_not raise_error
@@ -179,6 +183,12 @@ module RubySpeech
       it { should be_a SSML::Speak }
 
       its(:children) { should == [voice] }
+
+      describe "voice" do
+        subject { import.children.first }
+
+        its(:children) { should == [string, say_as] }
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_speech
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-26 00:00:00.000000000 +01:00
+date: 2011-08-30 00:00:00.000000000 +01:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: niceogiri
-  requirement: &2152713180 !ruby/object:Gem::Requirement
+  requirement: &2160574820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 0.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *2152713180
+  version_requirements: *2160574820
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2152712660 !ruby/object:Gem::Requirement
+  requirement: &2160574300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 3.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *2152712660
+  version_requirements: *2160574300
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152712180 !ruby/object:Gem::Requirement
+  requirement: &2160573820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152712180
+  version_requirements: *2160573820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152711700 !ruby/object:Gem::Requirement
+  requirement: &2160573340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *2152711700
+  version_requirements: *2160573340
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2152711220 !ruby/object:Gem::Requirement
+  requirement: &2160572860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *2152711220
+  version_requirements: *2160572860
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2152710740 !ruby/object:Gem::Requirement
+  requirement: &2160572380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *2152710740
+  version_requirements: *2160572380
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152710260 !ruby/object:Gem::Requirement
+  requirement: &2160571900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152710260
+  version_requirements: *2160571900
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2152709780 !ruby/object:Gem::Requirement
+  requirement: &2160571420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152709780
+  version_requirements: *2160571420
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2152709300 !ruby/object:Gem::Requirement
+  requirement: &2160570940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,7 +110,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152709300
+  version_requirements: *2160570940
 description: Prepare SSML and GRXML documents with ease
 email:
 - ben@langfeld.me