0
@@ -129,13 +129,6 @@ END
0
         }
0
       }
0
 
0
-      unless @options[:suppress_eval]
0
-        @options[:filters].merge!({
0
-          'erb' => ERB,
0
-          'ruby' => Haml::Filters::Ruby
0
-        })
0
-      end
0
-
0
       if !NOT_LOADED.include? 'redcloth'
0
         @options[:filters].merge!({
0
           'redcloth' => RedCloth,
0
@@ -149,6 +142,14 @@ END
0
 
0
       @options.rec_merge! options
0
 
0
+      unless @options[:suppress_eval]
0
+        @options[:filters].merge!({
0
+          'erb' => ERB,
0
+          'ruby' => Haml::Filters::Ruby
0
+        })
0
+      end
0
+      @options[:filters].rec_merge! options[:filters] if options[:filters]
0
+
0
       @precompiled = @options[:precompiled]
0
 
0
       @template = template.strip #String
0
@@ -589,7 +590,7 @@ END
0
         warn(FLAT_WARNING) if flattened && !defined?(Test::Unit)
0
 
0
         value_exists = !value.empty?
0
-        attributes_hash = "nil" unless attributes_hash
0
+        attributes_hash = "nil" if attributes_hash.nil? || @options[:suppress_eval]
0
         object_ref = "nil" unless object_ref
0
 
0
         if @block_opened 

0
@@ -57,6 +57,15 @@ class EngineTest < Test::Unit::TestCase
0
 
0
   def test_stop_eval
0
     assert_equal("", render("= 'Hello'", :suppress_eval => true))
0
+    assert_equal("<div id='foo' />\n", render("#foo{:yes => 'no'}/", :suppress_eval => true))
0
+
0
+    begin
0
+      assert_equal("", render(":ruby\n  puts 'hello'", :suppress_eval => true))
0
+    rescue Haml::HamlError => err
0
+      caught = true
0
+      assert_equal('Filter "ruby" is not defined!', err.message)
0
+    end
0
+    assert(caught, "Rendering a ruby filter without evaluating didn't throw an error!")
0
   end
0
 
0
   def test_attr_wrapper