ruby_speech 1.0.1 → 1.0.2

data/.gitignore

@@ -8,3 +8,4 @@ spec/reports
 doc
 .*.swp
 vendor
+tmp/

data/CHANGELOG.md

@@ -1,6 +1,9 @@
 # [develop](https://github.com/benlangfeld/ruby_speech)
 
-# [1.0.1](https://github.com/benlangfeld/ruby_speech/compare/v1.0.1...v1.0.1) - [2012-10-24](https://rubygems.org/gems/ruby_speech/versions/1.0.1)
+# [1.0.2](https://github.com/benlangfeld/ruby_speech/compare/v1.0.1...v1.0.2) - [2012-12-26](https://rubygems.org/gems/ruby_speech/versions/1.0.2)
+  * Bugfix: Get test suite passing on JRuby
+
+# [1.0.1](https://github.com/benlangfeld/ruby_speech/compare/v1.0.0...v1.0.1) - [2012-10-24](https://rubygems.org/gems/ruby_speech/versions/1.0.1)
   * Bugfix: Don't load rubygems because it is evil
   * Bugfix: Allow setting language (and other) attributes on root of SSML doc when using #draw DSL
 

data/Guardfile

@@ -1,4 +1,4 @@
-guard 'rspec', :version => 2, :cli => '--format documentation' do
+guard 'rspec', :cli => '--format documentation' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec/" }

data/lib/ruby_speech/generic_element.rb

@@ -55,7 +55,7 @@ module RubySpeech
         super(self.registered_name, nil, self.namespace) do |new_node|
           (self.defaults || {}).merge(atts).each_pair { |k, v| new_node.send :"#{k}=", v }
           block_return = new_node.eval_dsl_block &block
-          new_node << block_return if block_return.is_a?(String)
+          new_node.string block_return if block_return.is_a?(String) && block_return.present?
         end
       end
     end
@@ -83,7 +83,7 @@ module RubySpeech
     # @return [String] the base URI to which relative URLs are resolved
     #
     def base_uri
-      read_attr :base
+      read_attr 'xml:base'
     end
 
     ##
@@ -93,12 +93,6 @@ module RubySpeech
       self['xml:base'] = uri
     end
 
-    def to_doc
-      Nokogiri::XML::Document.new.tap do |doc|
-        doc << self
-      end
-    end
-
     def +(other)
       self.class.new(:base_uri => base_uri).tap do |new_element|
         (self.children + other.children).each do |child|
@@ -147,13 +141,7 @@ module RubySpeech
     end
 
     def string(other)
-      self << other
-    end
-
-    def <<(other)
-      other = encode_special_chars other if other.is_a? String
-      super other
-      self
+      self << Nokogiri::XML::Text.new(other, document)
     end
 
     def method_missing(method_name, *args, &block)

data/lib/ruby_speech/grxml/element.rb

@@ -17,6 +17,8 @@ module RubySpeech
 
       alias_method :nokogiri_children, :children
 
+      alias :to_doc :document
+
       include GenericElement
 
       def regexp_content # :nodoc:

data/lib/ruby_speech/ssml/element.rb

@@ -16,6 +16,8 @@ module RubySpeech
       end
 
       include GenericElement
+
+      alias :to_doc :document
     end # Element
   end # SSML
 end # RubySpeech

data/lib/ruby_speech/version.rb

@@ -1,3 +1,3 @@
 module RubySpeech
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/ruby_speech/xml/language.rb

@@ -2,7 +2,7 @@ module RubySpeech
   module XML
     module Language
       def language
-        read_attr :lang
+        self['xml:lang']
       end
 
       def language=(l)

data/ruby_speech.gemspec

@@ -18,7 +18,8 @@ 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>, ["~> 1.0"]
+  s.add_runtime_dependency %q<niceogiri>, ["~> 1.1", ">= 1.1.1"]
+  s.add_runtime_dependency %q<nokogiri>, ["~> 1.5", ">= 1.5.6"]
   s.add_runtime_dependency %q<activesupport>, [">= 3.0.7"]
 
   s.add_development_dependency %q<bundler>, [">= 1.0.0"]

data/spec/ruby_speech/grxml/grammar_spec.rb

@@ -122,14 +122,8 @@ module RubySpeech
       end
 
       describe "#to_doc" do
-        let(:expected_doc) do
-          Nokogiri::XML::Document.new.tap do |doc|
-            doc << Grammar.new
-          end
-        end
-
         it "should create an XML document from the grammar" do
-          Grammar.new.to_doc.to_s.should == expected_doc.to_s
+          subject.to_doc.should == subject.document
         end
       end
 

data/spec/ruby_speech/grxml_spec.rb

@@ -195,7 +195,7 @@ module RubySpeech
         end
         expected_doc = GRXML::Grammar.new
         3.times do
-          expected_doc << GRXML::Rule.new(:content => "I <3 nachos.")
+          expected_doc << GRXML::Rule.new(:native_content => "I <3 nachos.")
         end
         doc.should == expected_doc
       end

data/spec/ruby_speech/ssml/speak_spec.rb

@@ -140,14 +140,8 @@ module RubySpeech
       end
 
       describe "#to_doc" do
-        let(:expected_doc) do
-          Nokogiri::XML::Document.new.tap do |doc|
-            doc << Speak.new
-          end
-        end
-
-        it "should create an XML document from the speak" do
-          Speak.new.to_doc.to_s.should == expected_doc.to_s
+        it "should create an XML document from the grammar" do
+          subject.to_doc.should == subject.document
         end
       end
 

data/spec/ruby_speech/ssml_spec.rb

@@ -154,7 +154,7 @@ module RubySpeech
         end
         expected_doc = SSML::Speak.new
         2.times do
-          expected_doc << SSML::Voice.new(:content => "I <3 nachos.")
+          expected_doc << SSML::Voice.new(:native_content => "I <3 nachos.")
         end
         doc.should == expected_doc
       end

data/spec/support/matchers.rb

@@ -18,7 +18,7 @@ class SpeechDocMatcher
       @subject = s
     else
       doc = Nokogiri::XML::Document.new
-      doc << s
+      doc << s.to_xml
       @subject = doc
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_speech
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-24 00:00:00.000000000 Z
+date: 2012-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: niceogiri
@@ -18,7 +18,10 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +29,32 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.6
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -298,7 +326,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -28742056352021306
+      hash: 1835658384396428015
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -307,10 +335,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -28742056352021306
+      hash: 1835658384396428015
 requirements: []
 rubyforge_project: ruby_speech
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A ruby library for TTS & ASR document preparation