ruby_speech 2.1.2 → 2.2.0

data/lib/ruby_speech/grxml/grammar.rb

@@ -1,3 +1,14 @@
+require 'ruby_speech/xml/language'
+
+%w{
+  rule
+  item
+  one_of
+  ruleref
+  tag
+  token
+}.each { |f| require "ruby_speech/grxml/#{f}" }
+
 module RubySpeech
   module GRXML
     ##
@@ -18,7 +29,7 @@ module RubySpeech
 
       register :grammar
 
-      self.defaults = { :version => '1.0', :language => "en-US" }
+      self.defaults = { :version => '1.0', :language => "en-US", namespace: GRXML_NAMESPACE }
 
       VALID_CHILD_TYPES = [Nokogiri::XML::Element, Nokogiri::XML::Text, Rule, Tag].freeze
 
@@ -75,7 +86,8 @@ module RubySpeech
       # @return [Rule] The root rule node for the document
       #
       def root_rule
-        children(:rule, :id => root).first
+        element = rule_with_id root
+        self.class.import element if element
       end
 
       ##
@@ -104,12 +116,14 @@ module RubySpeech
       # @return self
       #
       def inline!
-        xpath("//ns:ruleref", :ns => namespace_href).each do |ref|
-          rule = children(:rule, :id => ref[:uri].sub(/^#/, '')).first
-          ref.swap rule.nokogiri_children
+        xpath("//ns:ruleref", :ns => GRXML_NAMESPACE).each do |ref|
+          rule = rule_with_id ref[:uri].sub(/^#/, '')
+          ref.swap rule.children
         end
 
-        non_root_rules = xpath "./ns:rule[@#{namespace_href && Nokogiri.jruby? ? 'ns:' : ''}id!='#{root}']", :ns => namespace_href
+        query = "./ns:rule[@id!='#{root}']"
+        query += "|./ns:rule[@ns:id!='#{root}']" if Nokogiri.jruby?
+        non_root_rules = xpath query, :ns => namespace_href
         non_root_rules.remove
 
         self
@@ -127,10 +141,10 @@ module RubySpeech
           next if [Token, Tag].include?(element_type)
 
           tokens = split_tokens(element).map do |string|
-            Token.new.tap { |token| token << string }
+            Token.new(document).tap { |token| token << string }.node
           end
 
-          element.swap Nokogiri::XML::NodeSet.new(Nokogiri::XML::Document.new, tokens)
+          element.swap Nokogiri::XML::NodeSet.new(document, tokens)
         end
       end
 
@@ -143,10 +157,7 @@ module RubySpeech
           next if element === self
 
           imported_element = self.class.import element
-          next unless imported_element.respond_to? :normalize_whitespace
-
-          imported_element.normalize_whitespace
-          element.swap imported_element
+          imported_element.normalize_whitespace if imported_element.respond_to?(:normalize_whitespace)
         end
       end
 
@@ -178,6 +189,12 @@ module RubySpeech
         !root || root_rule
       end
 
+      def rule_with_id(id)
+        query = "ns:rule[@id='#{id}']"
+        query += "|ns:rule[@ns:id='#{id}']" if Nokogiri.jruby?
+        at_xpath query, ns: GRXML_NAMESPACE
+      end
+
       def split_tokens(element)
         element.to_s.split(/(\".*\")/).reject(&:empty?).map do |string|
           match = string.match /^\"(.*)\"$/

data/lib/ruby_speech/grxml/item.rb

@@ -1,3 +1,5 @@
+require 'ruby_speech/xml/language'
+
 module RubySpeech
   module GRXML
     ##
@@ -26,6 +28,17 @@ module RubySpeech
     # xml:lang declares declaration declares the language of the grammar section for the item element just as xml:lang in the <grammar> element declares for the entire document
     #
     class Item < Element
+
+      %w{
+        rule
+        one_of
+        ruleref
+        tag
+        token
+      }.each { |f| require "ruby_speech/grxml/#{f}" }
+
+      include XML::Language
+
       Inf = 1.0 / 0.0
 
       register :item

data/lib/ruby_speech/grxml/matcher.rb

@@ -1,3 +1,7 @@
+require 'ruby_speech/grxml/match'
+require 'ruby_speech/grxml/no_match'
+require 'ruby_speech/grxml/potential_match'
+require 'ruby_speech/grxml/max_match'
 require 'ruby_speech/ruby_speech'
 
 if RUBY_PLATFORM =~ /java/
@@ -17,7 +21,7 @@ module RubySpeech
       def initialize(grammar)
         @grammar = grammar
         prepare_grammar
-        compile_regex regexp_content
+        compile_regex regexp_content.gsub(/\?<[\w\d\s]*>/, '')
       end
 
       ##

data/lib/ruby_speech/grxml/one_of.rb

@@ -1,3 +1,6 @@
+require 'ruby_speech/xml/language'
+require 'ruby_speech/grxml/item'
+
 module RubySpeech
   module GRXML
     ##
@@ -13,6 +16,7 @@ module RubySpeech
     # FIXME: Ensure an 'item' element is in the oneof block... this may be at the final draw or when OneOf is called...
     #
     class OneOf < Element
+      include XML::Language
 
       register :'one-of'
 

data/lib/ruby_speech/grxml/rule.rb

@@ -1,3 +1,13 @@
+require 'ruby_speech/xml/language'
+
+%w{
+  item
+  one_of
+  ruleref
+  tag
+  token
+}.each { |f| require "ruby_speech/grxml/#{f}" }
+
 module RubySpeech
   module GRXML
     ##

data/lib/ruby_speech/grxml/token.rb

@@ -1,3 +1,5 @@
+require 'ruby_speech/xml/language'
+
 module RubySpeech
   module GRXML
     ##
@@ -9,6 +11,7 @@ module RubySpeech
     #  The token element may include an optional xml:lang attribute to indicate the language of the contained token.
     #
     class Token < Element
+      include XML::Language
 
       register :token
 

data/lib/ruby_speech/nlsml.rb

@@ -1,18 +1,12 @@
+require 'ruby_speech/nlsml/document'
+require 'ruby_speech/nlsml/builder'
+
 module RubySpeech
   module NLSML
-    extend ActiveSupport::Autoload
-
     NLSML_NAMESPACE = 'http://www.ietf.org/xml/ns/mrcpv2'
 
-    eager_autoload do
-      autoload :Builder
-      autoload :Document
-    end
-
     def self.draw(options = {}, &block)
       Builder.new(options, &block).document
     end
   end
 end
-
-ActiveSupport::Autoload.eager_autoload!

data/lib/ruby_speech/ssml.rb

@@ -1,30 +1,30 @@
 module RubySpeech
   module SSML
-    extend ActiveSupport::Autoload
-
-    eager_autoload do
-      autoload :Audio
-      autoload :Break
-      autoload :Desc
-      autoload :Element
-      autoload :Emphasis
-      autoload :Mark
-      autoload :P
-      autoload :Phoneme
-      autoload :Prosody
-      autoload :S
-      autoload :SayAs
-      autoload :Speak
-      autoload :Sub
-      autoload :Voice
-    end
-
     InvalidChildError = Class.new StandardError
 
     SSML_NAMESPACE = 'http://www.w3.org/2001/10/synthesis'
 
+    %w{
+      audio
+      break
+      desc
+      element
+      emphasis
+      mark
+      p
+      phoneme
+      prosody
+      s
+      say_as
+      speak
+      sub
+      voice
+    }.each { |f| require "ruby_speech/ssml/#{f}" }
+
     def self.draw(*args, &block)
-      Speak.new(*args).tap do |speak|
+      document = Nokogiri::XML::Document.new
+      Speak.new(document, *args).tap do |speak|
+        document.root = speak.node
         block_return = speak.eval_dsl_block &block
         speak << block_return if block_return.is_a?(String)
       end
@@ -35,5 +35,3 @@ module RubySpeech
     end
   end # SSML
 end # RubySpeech
-
-ActiveSupport::Autoload.eager_autoload!

data/lib/ruby_speech/ssml/audio.rb

@@ -1,3 +1,5 @@
+require 'ruby_speech/ssml/element'
+
 module RubySpeech
   module SSML
     ##
@@ -14,6 +16,21 @@ module RubySpeech
     #
     class Audio < Element
 
+      %w{
+        break
+        desc
+        emphasis
+        mark
+        p
+        phoneme
+        prosody
+        s
+        say_as
+        speak
+        sub
+        voice
+      }.each { |f| require "ruby_speech/ssml/#{f}" }
+
       register :audio
 
       VALID_CHILD_TYPES = [Nokogiri::XML::Element, Nokogiri::XML::Text, String, Audio, Break, Desc, Emphasis, Mark, P, Phoneme, Prosody, S, SayAs, Sub, Voice].freeze

data/lib/ruby_speech/ssml/desc.rb

@@ -1,3 +1,6 @@
+require 'ruby_speech/ssml/element'
+require 'ruby_speech/xml/language'
+
 module RubySpeech
   module SSML
     ##
@@ -6,6 +9,7 @@ module RubySpeech
     # http://www.w3.org/TR/speech-synthesis/#S3.2.2
     #
     class Desc < Element
+      include XML::Language
 
       register :desc
 

data/lib/ruby_speech/ssml/element.rb

@@ -1,8 +1,8 @@
-require 'active_support/core_ext/class/attribute'
+require 'ruby_speech/generic_element'
 
 module RubySpeech
   module SSML
-    class Element < Niceogiri::XML::Node
+    class Element
       def self.namespace
         SSML_NAMESPACE
       end
@@ -17,7 +17,9 @@ module RubySpeech
 
       include GenericElement
 
-      alias :to_doc :document
+      def to_doc
+        document
+      end
     end # Element
   end # SSML
 end # RubySpeech

data/lib/ruby_speech/ssml/emphasis.rb

@@ -1,3 +1,5 @@
+require 'ruby_speech/ssml/element'
+
 module RubySpeech
   module SSML
     ##
@@ -7,6 +9,21 @@ module RubySpeech
     #
     class Emphasis < Element
 
+      %w{
+        audio
+        break
+        desc
+        mark
+        p
+        phoneme
+        prosody
+        s
+        say_as
+        speak
+        sub
+        voice
+      }.each { |f| require "ruby_speech/ssml/#{f}" }
+
       register :emphasis
 
       VALID_LEVELS = [:strong, :moderate, :none, :reduced].freeze

data/lib/ruby_speech/ssml/mark.rb

@@ -1,3 +1,5 @@
+require 'ruby_speech/ssml/element'
+
 module RubySpeech
   module SSML
     ##

data/lib/ruby_speech/ssml/p.rb

@@ -1,3 +1,6 @@
+require 'ruby_speech/ssml/element'
+require 'ruby_speech/xml/language'
+
 module RubySpeech
   module SSML
     ##
@@ -8,6 +11,24 @@ module RubySpeech
     #
     class P < Element
 
+      %w{
+        audio
+        break
+        desc
+        element
+        emphasis
+        mark
+        phoneme
+        prosody
+        s
+        say_as
+        speak
+        sub
+        voice
+      }.each { |f| require "ruby_speech/ssml/#{f}" }
+
+      include XML::Language
+
       register :p
 
       VALID_CHILD_TYPES = [Nokogiri::XML::Element, Nokogiri::XML::Text, String, Audio, Break, Emphasis, Mark, Phoneme, Prosody, S, SayAs, Sub, Voice].freeze

data/lib/ruby_speech/ssml/phoneme.rb

@@ -1,3 +1,5 @@
+require 'ruby_speech/ssml/element'
+
 module RubySpeech
   module SSML
     ##

data/lib/ruby_speech/ssml/prosody.rb

@@ -13,6 +13,21 @@ module RubySpeech
     #
     class Prosody < Element
 
+      %w{
+        audio
+        break
+        desc
+        emphasis
+        mark
+        p
+        phoneme
+        s
+        say_as
+        speak
+        sub
+        voice
+      }.each { |f| require "ruby_speech/ssml/#{f}" }
+
       register :prosody
 
       VALID_PITCHES     = [:'x-low', :low, :medium, :high, :'x-high', :default].freeze

data/lib/ruby_speech/ssml/s.rb

@@ -1,3 +1,6 @@
+require 'ruby_speech/ssml/element'
+require 'ruby_speech/xml/language'
+
 module RubySpeech
   module SSML
     ##
@@ -8,6 +11,23 @@ module RubySpeech
     #
     class S < Element
 
+      %w{
+        audio
+        break
+        desc
+        emphasis
+        mark
+        p
+        phoneme
+        prosody
+        say_as
+        speak
+        sub
+        voice
+      }.each { |f| require "ruby_speech/ssml/#{f}" }
+
+      include XML::Language
+
       register :s
 
       VALID_CHILD_TYPES = [Nokogiri::XML::Element, Nokogiri::XML::Text, String, Audio, Break, Emphasis, Mark, Phoneme, Prosody, SayAs, Sub, Voice].freeze