ruby_speech 0.1.3 → 0.1.4

data/.travis.yml

@@ -0,0 +1,14 @@
+rvm:
+  - 1.9.2
+  - rbx
+  - rbx-2.0
+  - jruby
+  - ruby-head
+
+notifications:
+  irc: "irc.freenode.org#adhearsion-dev"
+
+branches:
+  only:
+    - master
+    - develop

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.1.4
+  Bugfix: Speak#+ now returns a brand new Speak rather than modifying the original object
+  Bugfix: Speak#+ now re-sets the namespace on child elements to ensure no default namespace prefix is added
+
 # 0.1.3
   Bugfix: Strings included via the DSL (both as a block return value and by calling #string) are now properly escaped
 

data/lib/ruby_speech/ssml/speak.rb

@@ -8,7 +8,7 @@ module RubySpeech
     class Speak < Element
       include XML::Language
 
-      VALID_CHILD_TYPES = [Nokogiri::XML::Element, String, Break, Emphasis, Prosody, SayAs, Voice].freeze
+      VALID_CHILD_TYPES = [String, Break, Emphasis, Prosody, SayAs, Voice].freeze
 
       ##
       # Create a new SSML speak root element
@@ -52,8 +52,10 @@ module RubySpeech
       end
 
       def +(other)
-        other.children.each { |child| self << child }
-        self
+        self.class.new(:base_uri => base_uri).tap do |new_speak|
+          new_speak.children = self.children + other.children
+          new_speak.children.each { |c| c.namespace = new_speak.namespace }
+        end
       end
 
       def eql?(o)

data/lib/ruby_speech/version.rb

@@ -1,3 +1,3 @@
 module RubySpeech
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/ruby_speech.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency %q<bundler>, ["~> 1.0.0"]
   s.add_development_dependency %q<rspec>, ["~> 2.3.0"]
   s.add_development_dependency %q<ci_reporter>, [">= 1.6.3"]
-  s.add_development_dependency %q<yard>, ["~> 0.6.0"]
+  s.add_development_dependency %q<yard>, ["~> 0.7.0"]
   s.add_development_dependency %q<rake>, [">= 0"]
   s.add_development_dependency %q<mocha>, [">= 0"]
   s.add_development_dependency %q<i18n>, [">= 0"]

data/spec/ruby_speech/ssml/speak_spec.rb

@@ -141,7 +141,9 @@ module RubySpeech
         expected_concat << Voice.new(:name => 'frank', :content => "Hi, I'm Frank")
         expected_concat << Voice.new(:name => 'millie', :content => "Hi, I'm Millie")
 
-        (speak1 + speak2).should == expected_concat
+        concat = (speak1 + speak2)
+        concat.should == expected_concat
+        concat.to_s.should_not include('default')
       end
     end # Speak
   end # SSML

metadata

@@ -1,163 +1,126 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruby_speech
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
+version: !ruby/object:Gem::Version
+  version: 0.1.4
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Ben Langfeld
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-10 00:00:00 +01:00
+date: 2011-08-06 00:00:00.000000000 +01:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: niceogiri
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2157192140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.0.4
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2157192140
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &2157191620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 7
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.7
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2157191620
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &2157191140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2157191140
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2157190660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.3.0
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: ci_reporter
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2157190660
+- !ruby/object:Gem::Dependency
+  name: ci_reporter
+  requirement: &2157190180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 6
-        - 3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.6.3
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2157190180
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &2157183900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        - 0
-        version: 0.6.0
+      - !ruby/object:Gem::Version
+        version: 0.7.0
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2157183900
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2157183320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *2157183320
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &2157182760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: i18n
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *2157182760
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &2157182140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
+  prerelease: false
+  version_requirements: *2157182140
 description: Prepare SSML and GRXML documents with ease
-email: 
+email:
 - ben@langfeld.me
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE.md
@@ -191,36 +154,29 @@ files:
 has_rdoc: true
 homepage: https://github.com/benlangfeld/ruby_speech
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: ruby_speech
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A ruby library for TTS & ASR document preparation
-test_files: 
+test_files:
 - spec/ruby_speech/ssml/break_spec.rb
 - spec/ruby_speech/ssml/emphasis_spec.rb
 - spec/ruby_speech/ssml/prosody_spec.rb