lib/merb-gen/generator.rb in merb-gen-0.9.4 vs lib/merb-gen/generator.rb in merb-gen-0.9.5

@@ -10,13 +10,12 @@
     
     class Generator < Templater::Generator
       
       def initialize(*args)
         super
-        options[:orm] ||= Merb.orm_generator_scope
-        options[:testing_framework] ||= Merb.test_framework_generator_scope
-        
-        options[:orm] = :none if options[:orm] == :merb_default # FIXME: temporary until this is fixed in merb-core 
+        options[:orm] ||= Merb.orm
+        options[:testing_framework] ||= Merb.test_framework
+        options[:template_engine] ||= Merb.template_engine
       end
     
       # Inside a template, wraps a block of code properly in modules, keeping the indentation correct
       # 
       # @param modules<Array[#to_s]> an array of modules to use for nesting
\ No newline at end of file