lib/hypertemplate/hook/tilt.rb in hypertemplate-1.2.0 vs lib/hypertemplate/hook/tilt.rb in hypertemplate-1.2.1

@@ -23,15 +23,14 @@
           super(view, line, options, &block)
           @registry = registry
         end
         
         def initialize_engine
-          return if defined?(::Hypertemplate)
           require_template_library 'hypertemplate'
         end
 
         def prepare
-          @media_type = options[:media_type]
+          @media_type = options[:media_type] || @options[:media_type]
           raise Hypertemplate::BuilderError.new("Content type required to build representation.") unless @media_type
         end
 
         def precompiled_preamble(locals)
           local_assigns = super