lib/ruby_speech/grxml.rb in ruby_speech-0.3.3 vs lib/ruby_speech/grxml.rb in ruby_speech-0.3.4

@@ -1,29 +1,33 @@
 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
 
     GRXML_NAMESPACE = 'http://www.w3.org/2001/06/grammar'
 
     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
 
     def self.import(other)
       Element.import other
     end
   end # GRXML
 end # RubySpeech
+
+ActiveSupport::Autoload.eager_autoload!