ruby_speech 1.0.0 → 1.0.1

data/.travis.yml

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

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-# develop
+# [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)
+  * 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
 
 # 1.0.0 - 2012-03-13
   * Bump major version because we have a stable API

data/README.md

@@ -239,7 +239,7 @@ Check out the [YARD documentation](http://rdoc.info/github/benlangfeld/ruby_spee
 
 ## Links:
 * [Source](https://github.com/benlangfeld/ruby_speech)
-* [Documentation](http://rdoc.info/github/benlangfeld/ruby_speech/master/frames)
+* [Documentation](http://rdoc.info/gems/ruby_speech/frames)
 * [Bug Tracker](https://github.com/benlangfeld/ruby_speech/issues)
 
 ## Note on Patches/Pull Requests

data/lib/ruby_speech/generic_element.rb

@@ -43,7 +43,7 @@ module RubySpeech
       def import(node)
         node = Nokogiri::XML.parse(node, nil, nil, Nokogiri::XML::ParseOptions::NOBLANKS).root unless node.is_a?(Nokogiri::XML::Node)
         return node.content if node.is_a?(Nokogiri::XML::Text)
-        klass = class_from_registration node.element_name
+        klass = class_from_registration node.node_name
         if klass && klass != self
           klass.import node
         else
@@ -52,22 +52,11 @@ module RubySpeech
       end
 
       def new(atts = {}, &block)
-        blk_proc = lambda do |new_node|
+        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)
         end
-
-        case RUBY_VERSION.split('.')[0,2].join.to_i
-        when 18
-          super(self.registered_name, nil, self.namespace).tap do |n|
-            blk_proc[n]
-          end
-        else
-          super(self.registered_name, nil, self.namespace) do |n|
-            blk_proc[n]
-          end
-        end
       end
     end
 
@@ -87,7 +76,7 @@ module RubySpeech
     end
 
     def version=(other)
-      write_attr :version, other
+      self[:version] = other
     end
 
     ##
@@ -101,7 +90,7 @@ module RubySpeech
     # @param [String] uri the base URI to which relative URLs are resolved
     #
     def base_uri=(uri)
-      write_attr 'xml:base', uri
+      self['xml:base'] = uri
     end
 
     def to_doc
@@ -133,9 +122,9 @@ module RubySpeech
         end.join(',') << ']' if attributes
 
         if namespace_href
-          find "ns:#{expression}", :ns => namespace_href
+          xpath "ns:#{expression}", :ns => namespace_href
         else
-          find expression
+          xpath expression
         end
       else
         super()

data/lib/ruby_speech/grxml/grammar.rb

@@ -36,7 +36,7 @@ module RubySpeech
       # @param [String] ia
       #
       def mode=(ia)
-        write_attr :mode, ia
+        self[:mode] = ia
       end
 
       ##
@@ -53,7 +53,7 @@ module RubySpeech
       # @param [String] ia
       #
       def root=(ia)
-        write_attr :root, ia
+        self[:root] = ia
       end
 
       ##
@@ -68,7 +68,7 @@ module RubySpeech
       # @param [String] ia
       #
       def tag_format=(s)
-        write_attr :'tag-format', s
+        self['tag-format'] = s
       end
 
       ##
@@ -104,7 +104,7 @@ module RubySpeech
       # @return self
       #
       def inline!
-        find("//ns:ruleref", :ns => namespace_href).each do |ref|
+        xpath("//ns:ruleref", :ns => namespace_href).each do |ref|
           rule = children(:rule, :id => ref[:uri].sub(/^#/, '')).first
           ref.swap rule.nokogiri_children
         end

data/lib/ruby_speech/grxml/item.rb

@@ -52,7 +52,7 @@ module RubySpeech
       #
       def weight=(w)
         raise ArgumentError, "A Item's weight attribute must be a positive floating point number" unless w.to_s.match(/[^0-9\.]/) == nil and w.to_f >= 0
-        write_attr :weight, w
+        self[:weight] = w
       end
 
       ##
@@ -99,7 +99,7 @@ module RubySpeech
             m < 0 || n < m
           end
         end
-        write_attr :repeat, r
+        self[:repeat] = r
       end
 
       ##
@@ -117,7 +117,7 @@ module RubySpeech
       #
       def repeat_prob=(rp)
         raise ArgumentError, "A Item's repeat probablity attribute must be a floating point number between 0.0 and 1.0" unless rp.to_s.match(/[^0-9\.]/) == nil and rp.to_f >= 0 and rp.to_f <= 1.0
-        write_attr :'repeat-prob', rp
+        self['repeat-prob'] = rp
       end
 
       def <<(arg)

data/lib/ruby_speech/grxml/rule.rb

@@ -36,7 +36,7 @@ module RubySpeech
       # @param [String] ia
       #
       def id=(ia)
-        write_attr :id, ia
+        self[:id] = ia
       end
 
       ##
@@ -57,7 +57,7 @@ module RubySpeech
       #
       def scope=(sc)
         raise ArgumentError, "A Rule's scope can only be 'public' or 'private'" unless %w{public private}.include?(sc.to_s)
-        write_attr :scope, sc
+        self[:scope] = sc
       end
 
       def <<(arg)

data/lib/ruby_speech/grxml/ruleref.rb

@@ -34,7 +34,7 @@ module RubySpeech
       #
       def uri=(u)
         raise ArgumentError, "A Ruleref can only take uri or special" if special
-        write_attr :uri, u
+        self[:uri] = u
       end
 
       ##
@@ -54,7 +54,7 @@ module RubySpeech
       def special=(sp)
         raise ArgumentError, "A Ruleref can only take uri or special" if uri
         raise ArgumentError, "The Ruleref#special method only takes :NULL, :VOID, and :GARBAGE" unless %w{NULL VOID GARBAGE}.include? sp.to_s
-        write_attr :special, sp
+        self[:special] = sp
       end
 
       def <<(*args)

data/lib/ruby_speech/ssml.rb

@@ -23,8 +23,8 @@ module RubySpeech
 
     SSML_NAMESPACE = 'http://www.w3.org/2001/10/synthesis'
 
-    def self.draw(&block)
-      Speak.new.tap do |speak|
+    def self.draw(*args, &block)
+      Speak.new(*args).tap do |speak|
         block_return = speak.eval_dsl_block &block
         speak << block_return if block_return.is_a?(String)
       end

data/lib/ruby_speech/ssml/audio.rb

@@ -31,7 +31,7 @@ module RubySpeech
       # @param [String] the source. Must be a valid URI
       #
       def src=(s)
-        write_attr :src, s
+        self[:src] = s
       end
 
       def <<(arg)

data/lib/ruby_speech/ssml/break.rb

@@ -27,7 +27,7 @@ module RubySpeech
       #
       def strength=(s)
         raise ArgumentError, "You must specify a valid strength (#{VALID_STRENGTHS.map(&:inspect).join ', '})" unless VALID_STRENGTHS.include? s
-        write_attr :strength, s
+        self[:strength] = s
       end
 
       ##
@@ -46,7 +46,7 @@ module RubySpeech
       #
       def time=(t)
         raise ArgumentError, "You must specify a valid time (positive float value in seconds)" unless t.is_a?(Numeric) && t >= 0
-        write_attr :time, "#{t}s"
+        self[:time] = "#{t}s"
       end
 
       def <<(*args)

data/lib/ruby_speech/ssml/emphasis.rb

@@ -28,7 +28,7 @@ module RubySpeech
       #
       def level=(l)
         raise ArgumentError, "You must specify a valid level (#{VALID_LEVELS.map(&:inspect).join ', '})" unless VALID_LEVELS.include? l
-        write_attr :level, l
+        self[:level] = l
       end
 
       def <<(arg)

data/lib/ruby_speech/ssml/mark.rb

@@ -27,7 +27,7 @@ module RubySpeech
       # @param [String] the name token
       #
       def name=(other)
-        write_attr :name, other
+        self[:name] = other
       end
 
       def <<(*args)

data/lib/ruby_speech/ssml/phoneme.rb

@@ -40,7 +40,7 @@ module RubySpeech
       # @param [String] other the phonemic/phonetic alphabet
       #
       def alphabet=(other)
-        write_attr :alphabet, other
+        self[:alphabet] = other
       end
 
       ##
@@ -56,7 +56,7 @@ module RubySpeech
       # @param [String] other the phoneme/phone string.
       #
       def ph=(other)
-        write_attr :ph, other
+        self[:ph] = other
       end
 
       def <<(arg)

data/lib/ruby_speech/ssml/prosody.rb

@@ -43,7 +43,7 @@ module RubySpeech
       def pitch=(p)
         hz = p.is_a?(String) && p.include?('Hz') && p.to_f > 0
         raise ArgumentError, "You must specify a valid pitch (\"[positive-number]Hz\", #{VALID_PITCHES.map(&:inspect).join ', '})" unless hz || VALID_PITCHES.include?(p)
-        write_attr :pitch, p
+        self[:pitch] = p
       end
 
       ##
@@ -61,7 +61,7 @@ module RubySpeech
       # @param [String] v
       #
       def contour=(v)
-        write_attr :contour, v
+        self[:contour] = v
       end
 
       ##
@@ -87,7 +87,7 @@ module RubySpeech
       def range=(p)
         hz = p.is_a?(String) && p.include?('Hz') && p.to_f > 0
         raise ArgumentError, "You must specify a valid range (\"[positive-number]Hz\", #{VALID_PITCHES.map(&:inspect).join ', '})" unless hz || VALID_PITCHES.include?(p)
-        write_attr :range, p
+        self[:range] = p
       end
 
       ##
@@ -112,7 +112,7 @@ module RubySpeech
       #
       def rate=(v)
         raise ArgumentError, "You must specify a valid rate ([positive-number](multiplier), #{VALID_RATES.map(&:inspect).join ', '})" unless (v.is_a?(Numeric) && v >= 0) || VALID_RATES.include?(v)
-        write_attr :rate, v
+        self[:rate] = v
       end
 
       ##
@@ -131,7 +131,7 @@ module RubySpeech
       #
       def duration=(t)
         raise ArgumentError, "You must specify a valid duration (positive float value in seconds)" unless t.is_a?(Numeric) && t >= 0
-        write_attr :duration, "#{t}s"
+        self[:duration] = "#{t}s"
       end
 
       ##
@@ -156,7 +156,7 @@ module RubySpeech
       #
       def volume=(v)
         raise ArgumentError, "You must specify a valid volume ([positive-number](0.0 -> 100.0), #{VALID_VOLUMES.map(&:inspect).join ', '})" unless (v.is_a?(Numeric) && (0..100).include?(v)) || VALID_VOLUMES.include?(v)
-        write_attr :volume, v
+        self[:volume] = v
       end
 
       def <<(arg)

data/lib/ruby_speech/ssml/say_as.rb

@@ -42,7 +42,7 @@ module RubySpeech
       # @param [String] ia
       #
       def interpret_as=(ia)
-        write_attr :'interpret-as', ia
+        self['interpret-as'] = ia
       end
 
       ##
@@ -61,7 +61,7 @@ module RubySpeech
       # @param [String] format
       #
       def format=(format)
-        write_attr :format, format
+        self[:format] = format
       end
 
       ##
@@ -84,7 +84,7 @@ module RubySpeech
       # @param [String] detail
       #
       def detail=(detail)
-        write_attr :detail, detail
+        self[:detail] = detail
       end
 
       def <<(arg)

data/lib/ruby_speech/ssml/sub.rb

@@ -26,7 +26,7 @@ module RubySpeech
       # @param [String] other the string to be spoken instead of the enclosed string
       #
       def alias=(other)
-        write_attr :alias, other
+        self[:alias] = other
       end
 
       def <<(arg)

data/lib/ruby_speech/ssml/voice.rb

@@ -29,7 +29,7 @@ module RubySpeech
       #
       def gender=(g)
         raise ArgumentError, "You must specify a valid gender (#{VALID_GENDERS.map(&:inspect).join ', '})" unless VALID_GENDERS.include? g
-        write_attr :gender, g
+        self[:gender] = g
       end
 
       ##
@@ -48,7 +48,7 @@ module RubySpeech
       #
       def age=(i)
         raise ArgumentError, "You must specify a valid age (non-negative integer)" unless i.is_a?(Integer) && i >= 0
-        write_attr :age, i
+        self[:age] = i
       end
 
       ##
@@ -67,7 +67,7 @@ module RubySpeech
       #
       def variant=(i)
         raise ArgumentError, "You must specify a valid variant (positive integer)" unless i.is_a?(Integer) && i > 0
-        write_attr :variant, i
+        self[:variant] = i
       end
 
       ##
@@ -92,7 +92,7 @@ module RubySpeech
       def name=(n)
         # TODO: Raise ArgumentError if names contain whitespace
         n = n.join(' ') if n.is_a? Array
-        write_attr :name, n
+        self[:name] = n
       end
 
       def <<(arg)

data/lib/ruby_speech/version.rb

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

data/lib/ruby_speech/xml/language.rb

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

data/ruby_speech.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   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.7.0"]
+  s.add_development_dependency %q<rspec>, [">= 2.7"]
   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"]

data/spec/ruby_speech/ssml/mark_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 module RubySpeech
   module SSML
     describe Mark do
-      its(:element_name) { should == 'mark' }
+      its(:node_name) { should == 'mark' }
 
       describe "setting options in initializers" do
         subject { Mark.new :name => 'foo' }

data/spec/ruby_speech/ssml_spec.rb

@@ -8,6 +8,11 @@ module RubySpeech
         SSML.draw.should == expected_doc
       end
 
+      it "can draw with a language" do
+        expected_doc = SSML::Speak.new language: 'pt-BR'
+        SSML.draw(language: 'pt-BR').should == expected_doc
+      end
+
       describe "when the return value of the block is a string" do
         it "should be inserted into the document" do
           expected_doc = SSML::Speak.new(:content => "Hi, I'm Fred")

data/spec/spec_helper.rb

@@ -1,6 +1,4 @@
-require 'rubygems'
 require 'ruby_speech'
-require 'mocha'
 
 include RubySpeech::GRXML
 include RubySpeech::XML::Language
@@ -17,7 +15,6 @@ puts "Loading the GRXML Schema from #{schema_file_path}..."
 GRXML_SCHEMA = Nokogiri::XML::Schema File.open(schema_file_path)
 puts "Finished loading schema."
 
-
 RSpec.configure do |config|
   config.mock_with :mocha
   config.filter_run :focus => true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_speech
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-13 00:00:00.000000000 Z
+date: 2012-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: niceogiri
-  requirement: &2156111400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156111400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2156110560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 3.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *2156110560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.7
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156108320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,21 +53,31 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2156108320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156106520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *2156106520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2156120380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *2156120380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.3
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2156119640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *2156119640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156118780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156118780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2156117620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156117620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2156116880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +149,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156116880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2156116380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +165,15 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *2156116380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2156115900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +181,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156115900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &2156115400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +197,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156115400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Prepare SSML and GRXML documents with ease
 email:
 - ben@langfeld.me
@@ -236,15 +296,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -28742056352021306
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -28742056352021306
 requirements: []
 rubyforge_project: ruby_speech
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A ruby library for TTS & ASR document preparation