ruby_speech 0.3.0 → 0.3.1

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.3.1
+  * Get the whole test suite passing on Ruby 1.8.7 and JRuby (thanks to Taylor Carpenter!)
+
 # 0.3.0
   * Feature (Taylor Carpenter): Added support for GRXML documents with most elements implemented.
 

data/README.md

@@ -46,7 +46,7 @@ Once your `Speak` is fully prepared and you're ready to send it off for processi
 You may also then need to call `to_s`.
 
 
-Contruct a GRXML (SGR) document like this:
+Contruct a GRXML (SRGS) document like this:
 
 ```ruby
 require 'ruby_speech'

data/lib/ruby_speech/grxml/element.rb

@@ -59,11 +59,22 @@ module RubySpeech
       end
 
       def self.new(element_name, atts = {}, &block)
-        super(element_name) do |new_node|
+        blk_proc = lambda do |new_node|
           atts.each_pair { |k, v| new_node.send :"#{k}=", v }
           block_return = new_node.instance_eval &block if block_given?
           new_node << new_node.encode_special_chars(block_return) if block_return.is_a?(String)
         end
+
+        case RUBY_VERSION.split('.')[0,2].join.to_i
+        when 18
+          super(element_name).tap do |n|
+            blk_proc[n]
+          end
+        else
+          super(element_name) do |n|
+            blk_proc[n]
+          end
+        end
       end
 
       def children

data/lib/ruby_speech/ssml/element.rb

@@ -59,11 +59,22 @@ module RubySpeech
       end
 
       def self.new(element_name, atts = {}, &block)
-        super(element_name) do |new_node|
+        blk_proc = lambda do |new_node|
           atts.each_pair { |k, v| new_node.send :"#{k}=", v }
           block_return = new_node.instance_eval &block if block_given?
           new_node << new_node.encode_special_chars(block_return) if block_return.is_a?(String)
         end
+
+        case RUBY_VERSION.split('.')[0,2].join.to_i
+        when 18
+          super(element_name).tap do |n|
+            blk_proc[n]
+          end
+        else
+          super(element_name) do |n|
+            blk_proc[n]
+          end
+        end
       end
 
       def children

data/lib/ruby_speech/version.rb

@@ -1,3 +1,3 @@
 module RubySpeech
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/ruby_speech.gemspec

@@ -18,11 +18,11 @@ 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.0.4"]
+  s.add_runtime_dependency %q<niceogiri>, [">= 0.1.0"]
   s.add_runtime_dependency %q<activesupport>, [">= 3.0.7"]
 
   s.add_development_dependency %q<bundler>, ["~> 1.0.0"]
-  s.add_development_dependency %q<rspec>, ["~> 2.3.0"]
+  s.add_development_dependency %q<rspec>, [">= 2.7.0"]
   s.add_development_dependency %q<ci_reporter>, [">= 1.6.3"]
   s.add_development_dependency %q<yard>, ["~> 0.7.0"]
   s.add_development_dependency %q<rake>, [">= 0"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_speech
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,23 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-22 00:00:00.000000000 +01:00
-default_executable: 
+date: 2011-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: niceogiri
-  requirement: &2164745280 !ruby/object:Gem::Requirement
+  requirement: &2156086660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2164745280
+  version_requirements: *2156086660
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2164744760 !ruby/object:Gem::Requirement
+  requirement: &2156086140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +32,10 @@ dependencies:
         version: 3.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *2164744760
+  version_requirements: *2156086140
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2164744280 !ruby/object:Gem::Requirement
+  requirement: &2156085660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,21 +43,21 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2164744280
+  version_requirements: *2156085660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2164743800 !ruby/object:Gem::Requirement
+  requirement: &2156085180 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2164743800
+  version_requirements: *2156085180
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2164743320 !ruby/object:Gem::Requirement
+  requirement: &2156084680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +65,10 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *2164743320
+  version_requirements: *2156084680
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2164742820 !ruby/object:Gem::Requirement
+  requirement: &2156084120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +76,10 @@ dependencies:
         version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *2164742820
+  version_requirements: *2156084120
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2164742300 !ruby/object:Gem::Requirement
+  requirement: &2156083320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164742300
+  version_requirements: *2156083320
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2164741820 !ruby/object:Gem::Requirement
+  requirement: &2156082020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164741820
+  version_requirements: *2156082020
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2164741300 !ruby/object:Gem::Requirement
+  requirement: &2156081100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164741300
+  version_requirements: *2156081100
 description: Prepare SSML and GRXML documents with ease
 email:
 - ben@langfeld.me
@@ -172,7 +171,6 @@ files:
 - spec/ruby_speech/ssml_spec.rb
 - spec/spec_helper.rb
 - spec/support/matchers.rb
-has_rdoc: true
 homepage: https://github.com/benlangfeld/ruby_speech
 licenses: []
 post_install_message: 
@@ -193,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ruby_speech
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A ruby library for TTS & ASR document preparation
@@ -216,3 +214,4 @@ test_files:
 - spec/ruby_speech/ssml_spec.rb
 - spec/spec_helper.rb
 - spec/support/matchers.rb
+has_rdoc: