Permalink
Browse files

Merge branch 'release/0.3.2'

  • Loading branch information...
2 parents 74d4801 + e83bd40 commit d3f76ed2858d098ed2ab8c4d0efd52aec8b91d38 @benlangfeld benlangfeld committed Nov 25, 2011
Showing with 8 additions and 15 deletions.
  1. +2 −0 .gitignore
  2. +3 −0 CHANGELOG.md
  3. +0 −12 lib/ruby_speech/ssml/element.rb
  4. +1 −1 lib/ruby_speech/version.rb
  5. +1 −1 ruby_speech.gemspec
  6. +1 −1 spec/ruby_speech/ssml/speak_spec.rb
View
@@ -1,3 +1,4 @@
+.DS_Store
*.gem
.bundle
Gemfile.lock
@@ -6,3 +7,4 @@ spec/reports
.yardoc
doc
.*.swp
+vendor
View
@@ -1,3 +1,6 @@
+# 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.
+
# 0.3.1
* Get the whole test suite passing on Ruby 1.8.7 and JRuby (thanks to Taylor Carpenter!)
@@ -46,18 +46,6 @@ def self.import(node)
end
end
- # Inherit the attributes and children of an XML::Node
- #
- # @param [XML::Node] node the node to inherit
- # @return [self]
- def inherit(node)
- inherit_attrs node.attributes
- node.children.each do |c|
- self << c.dup
- end
- self
- end
-
def self.new(element_name, atts = {}, &block)
blk_proc = lambda do |new_node|
atts.each_pair { |k, v| new_node.send :"#{k}=", v }
@@ -1,3 +1,3 @@
module RubySpeech
- VERSION = "0.3.1"
+ VERSION = "0.3.2"
end
View
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
s.require_paths = ["lib"]
- s.add_runtime_dependency %q<niceogiri>, [">= 0.1.0"]
+ s.add_runtime_dependency %q<niceogiri>, [">= 0.1.1"]
s.add_runtime_dependency %q<activesupport>, [">= 3.0.7"]
s.add_development_dependency %q<bundler>, ["~> 1.0.0"]
@@ -26,7 +26,7 @@ module SSML
it { should be_instance_of Speak }
- its(:language) { pending; should == 'jp' }
+ its(:language) { should == 'jp' }
its(:base_uri) { should == 'blah' }
end

0 comments on commit d3f76ed

Please sign in to comment.