ruby_speech 0.3.3 → 0.3.4

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.3.4
+  * Eager-autoload all elements so that importing will work with elements that havn't been used yet directly
+  * Allow using the DSL with method calls out of the block
+  * Fix inspection/comparison of some elements that don't have a language attribute
+
 # 0.3.3
   * Allow `SSML::Element.import` and `GRXML::Element.import` to take a string as well as a Nokogiri::XML::Node
   * Allow importing GRXML/SSML documents via their respective modules (eg `RubySpeech::GRXML.import '<grammar ... />'`)

data/lib/ruby_speech.rb

@@ -10,8 +10,12 @@ module RubySpeech
 
   autoload :Version
 
-  autoload :GenericElement
-  autoload :SSML
-  autoload :GRXML
-  autoload :XML
+  eager_autoload do
+    autoload :GenericElement
+    autoload :SSML
+    autoload :GRXML
+    autoload :XML
+  end
 end
+
+ActiveSupport::Autoload.eager_autoload!

data/lib/ruby_speech/generic_element.rb

@@ -54,7 +54,7 @@ module RubySpeech
       def new(element_name, atts = {}, &block)
         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?
+          block_return = new_node.eval_dsl_block &block
           new_node << new_node.encode_special_chars(block_return) if block_return.is_a?(String)
         end
 
@@ -71,6 +71,12 @@ module RubySpeech
       end
     end
 
+    def eval_dsl_block(&block)
+      return unless block_given?
+      @block_binding = eval "self", block.binding
+      instance_eval &block
+    end
+
     def children
       super.map { |c| self.class.import c }
     end
@@ -92,13 +98,17 @@ module RubySpeech
 
     def method_missing(method_name, *args, &block)
       const_name = method_name.to_s.sub('ssml', '').titleize.gsub(' ', '')
-      const = self.class.module.const_get const_name
-      if const && self.class::VALID_CHILD_TYPES.include?(const)
-        if const == String
-          self << encode_special_chars(args.first)
-        else
-          self << const.new(*args, &block)
+      if self.class.module.const_defined? const_name
+        const = self.class.module.const_get const_name
+        if self.class::VALID_CHILD_TYPES.include?(const)
+          if const == String
+            self << encode_special_chars(args.first)
+          else
+            self << const.new(*args, &block)
+          end
         end
+      elsif @block_binding# && @block_binding.respond_to?(method_name)
+        @block_binding.send method_name, *args, &block
       else
         super
       end

data/lib/ruby_speech/grxml.rb

@@ -2,14 +2,16 @@ module RubySpeech
   module GRXML
     extend ActiveSupport::Autoload
 
-    autoload :Element
-    autoload :Grammar
-    autoload :Rule
-    autoload :Item
-    autoload :OneOf
-    autoload :Ruleref
-    autoload :Tag
-    autoload :Token
+    eager_autoload do
+      autoload :Element
+      autoload :Grammar
+      autoload :Rule
+      autoload :Item
+      autoload :OneOf
+      autoload :Ruleref
+      autoload :Tag
+      autoload :Token
+    end
 
     InvalidChildError = Class.new StandardError
 
@@ -17,7 +19,7 @@ module RubySpeech
 
     def self.draw(attributes = {}, &block)
       Grammar.new(attributes).tap do |grammar|
-        block_return = grammar.instance_eval(&block) if block_given?
+        block_return = grammar.eval_dsl_block &block
         grammar << block_return if block_return.is_a?(String)
       end
     end
@@ -27,3 +29,5 @@ module RubySpeech
     end
   end # GRXML
 end # RubySpeech
+
+ActiveSupport::Autoload.eager_autoload!

data/lib/ruby_speech/grxml/grammar.rb

@@ -32,7 +32,7 @@ module RubySpeech
         new_node[:version] = '1.0'
         new_node.namespace = GRXML_NAMESPACE
         new_node.language ||= "en-US"
-        new_node.instance_eval &block if block_given?
+        new_node.eval_dsl_block &block
         new_node
       end
 

data/lib/ruby_speech/grxml/item.rb

@@ -128,7 +128,7 @@ module RubySpeech
       end
 
       def eql?(o)
-        super o, :weight, :repeat, :language
+        super o, :weight, :repeat
       end
     end # Item
   end # GRXML

data/lib/ruby_speech/grxml/one_of.rb

@@ -33,10 +33,6 @@ module RubySpeech
         raise InvalidChildError, "A OneOf can only accept Item as children" unless VALID_CHILD_TYPES.include? arg.class
         super
       end
-
-      def eql?(o)
-        super o, :language
-      end
     end # OneOf
   end # GRXML
 end # RubySpeech

data/lib/ruby_speech/grxml/token.rb

@@ -29,10 +29,6 @@ module RubySpeech
         raise InvalidChildError, "A Token can only accept Strings as children" unless VALID_CHILD_TYPES.include? arg.class
         super
       end
-
-      def eql?(o)
-        super o, :language
-      end
     end # Token
   end # GRXML
 end # RubySpeech

data/lib/ruby_speech/ssml.rb

@@ -2,14 +2,16 @@ module RubySpeech
   module SSML
     extend ActiveSupport::Autoload
 
-    autoload :Audio
-    autoload :Break
-    autoload :Element
-    autoload :Emphasis
-    autoload :Prosody
-    autoload :SayAs
-    autoload :Speak
-    autoload :Voice
+    eager_autoload do
+      autoload :Audio
+      autoload :Break
+      autoload :Element
+      autoload :Emphasis
+      autoload :Prosody
+      autoload :SayAs
+      autoload :Speak
+      autoload :Voice
+    end
 
     InvalidChildError = Class.new StandardError
 
@@ -17,7 +19,7 @@ module RubySpeech
 
     def self.draw(&block)
       Speak.new.tap do |speak|
-        block_return = speak.instance_eval(&block) if block_given?
+        block_return = speak.eval_dsl_block &block
         speak << block_return if block_return.is_a?(String)
       end
     end
@@ -27,3 +29,5 @@ module RubySpeech
     end
   end # SSML
 end # RubySpeech
+
+ActiveSupport::Autoload.eager_autoload!

data/lib/ruby_speech/ssml/speak.rb

@@ -24,7 +24,7 @@ module RubySpeech
         new_node[:version] = '1.0'
         new_node.namespace = SSML_NAMESPACE
         new_node.language ||= "en-US"
-        new_node.instance_eval &block if block_given?
+        new_node.eval_dsl_block &block
         new_node
       end
 

data/lib/ruby_speech/version.rb

@@ -1,3 +1,3 @@
 module RubySpeech
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/lib/ruby_speech/xml.rb

@@ -2,6 +2,10 @@ module RubySpeech
   module XML
     extend ActiveSupport::Autoload
 
-    autoload :Language
+    eager_autoload do
+      autoload :Language
+    end
   end # XML
 end # RubySpeech
+
+ActiveSupport::Autoload.eager_autoload!

data/spec/ruby_speech/grxml_spec.rb

@@ -28,6 +28,21 @@ module RubySpeech
         doc.should == expected_doc
       end
 
+      it "should allow accessing methods defined outside the block" do
+        def foo
+          'bar'
+        end
+
+        doc = GRXML.draw do
+          rule :id => foo
+        end
+
+        expected_doc = GRXML::Grammar.new
+        rule = GRXML::Rule.new(:id => foo)
+        expected_doc << rule
+        doc.should == expected_doc
+      end
+
       it "should raise error if given an empty rule" do
         pending 'Reject empty rules -- http://www.w3.org/TR/2002/CR-speech-grammar-20020626/#S3.1 http://www.w3.org/Voice/2003/srgs-ir/test/rule-no-empty.grxml'
         lambda { GRXML.draw { rule :id => 'main' }}.should raise_error

data/spec/ruby_speech/ssml_spec.rb

@@ -56,6 +56,19 @@ module RubySpeech
         doc.should == expected_doc
       end
 
+      it "should allow accessing methods defined outside the block" do
+        def foo
+          'bar'
+        end
+
+        doc = SSML.draw do
+          string foo
+        end
+
+        expected_doc = SSML::Speak.new :content => foo
+        doc.should == expected_doc
+      end
+
       describe "embedding" do
         it "SSML documents" do
           doc1 = RubySpeech::SSML.draw do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_speech
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: niceogiri
-  requirement: &2157143800 !ruby/object:Gem::Requirement
+  requirement: &2156730280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2157143800
+  version_requirements: *2156730280
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2157143180 !ruby/object:Gem::Requirement
+  requirement: &2156729680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *2157143180
+  version_requirements: *2156729680
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2157142500 !ruby/object:Gem::Requirement
+  requirement: &2156728960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2157142500
+  version_requirements: *2156728960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157141800 !ruby/object:Gem::Requirement
+  requirement: &2156728320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2157141800
+  version_requirements: *2156728320
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2157141220 !ruby/object:Gem::Requirement
+  requirement: &2156727580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *2157141220
+  version_requirements: *2156727580
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2157140600 !ruby/object:Gem::Requirement
+  requirement: &2156726900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *2157140600
+  version_requirements: *2156726900
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2157140000 !ruby/object:Gem::Requirement
+  requirement: &2156726240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157140000
+  version_requirements: *2156726240
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2157139300 !ruby/object:Gem::Requirement
+  requirement: &2156725500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157139300
+  version_requirements: *2156725500
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2157138760 !ruby/object:Gem::Requirement
+  requirement: &2156724880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157138760
+  version_requirements: *2156724880
 description: Prepare SSML and GRXML documents with ease
 email:
 - ben@langfeld.me
@@ -186,7 +186,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3968593317999839588
+      hash: -1285553440311979925
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -195,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3968593317999839588
+      hash: -1285553440311979925
 requirements: []
 rubyforge_project: ruby_speech
 rubygems_version: 1.8.10