0
@@ -1 +1 @@
0
-1.5.0
0
+1.5.1

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
@@ -309,8 +310,9 @@ END
0
       when SILENT_SCRIPT
0
         sub_line = line[1..-1]
0
         unless sub_line[0] == SILENT_COMMENT
0
-          push_silent(sub_line, true)
0
-          if @block_opened && !mid_block_keyword?(line)
0
+          mbk = mid_block_keyword?(line)
0
+          push_silent(sub_line, !mbk)
0
+          if (@block_opened && !mbk) || line[1..-1].split(' ', 2)[0] == "case"
0
             push_and_tabulate([:script])
0
           end
0
         end
0
@@ -589,7 +591,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
@@ -8,12 +8,12 @@ module Haml
0
   module Helpers
0
     self.extend self
0
     
0
-    @@action_view = false
0
+    @@action_view_defined = defined?(ActionView)
0
     @@force_no_action_view = false
0
 
0
     # Returns whether or not ActionView is installed on the system.
0
     def self.action_view?
0
-      @@action_view
0
+      @@action_view_defined
0
     end
0
 
0
     # Isolates the whitespace-sensitive tags in the string and uses preserve
0
@@ -186,11 +186,6 @@ module Haml
0
     end
0
     
0
     private
0
-    
0
-    # Sets whether or not ActionView is installed on the system.
0
-    def self.action_view(value) # :nodoc:
0
-      @@action_view = value
0
-    end
0
 
0
     # Gets a reference to the current Haml::Buffer object.
0
     def buffer
0
@@ -226,6 +221,7 @@ module Haml
0
       end
0
       result.to_s
0
     end
0
+    alias_method :capture_erb_with_buffer, :capture_haml_with_buffer
0
 
0
     # Returns whether or not the current template is a Haml template.
0
     # 
0
@@ -235,8 +231,6 @@ module Haml
0
     def is_haml?
0
       @haml_stack ? @haml_stack.size > 0 : false
0
     end
0
-    
0
-    include ActionViewMods if self.const_defined?  "ActionViewMods"
0
   end
0
 end
0
 

0
@@ -9,42 +9,24 @@ rescue LoadError
0
 end
0
 
0
 if action_view_included
0
-  class ActionView::Base
0
-    alias_method :old_concat, :concat unless instance_methods.include? "old_concat"
0
-    alias_method :old_form_tag, :form_tag unless instance_methods.include? "old_form_tag"
0
-
0
-    alias_method :old_form_for, :form_for unless instance_methods.include? "old_form_for"
0
-  end
0
-  
0
-  module Haml
0
+  module ActionView
0
+    # This overrides various helpers in ActionView
0
+    # to make them work more effectively with Haml.
0
     module Helpers
0
-      # This module overrides various helpers in ActionView
0
-      # to make them work more effectively with Haml.
0
-      # It also defines several helper methods,
0
-      # available from a Haml template,
0
-      # which are only useful within the context of ActionView.
0
-      # It's not available unless ActionView is installed.
0
-      #
0
-      #--
0
-      # Methods in this module should be nodoc'd.
0
-      #++
0
-      module ActionViewMods
0
-        def self.included(othermod) # :nodoc:
0
-          othermod.class_eval do
0
-            action_view(true)
0
-            alias_method :capture_erb_with_buffer, :capture_haml_with_buffer
0
-          end
0
-        end
0
-        
0
-        def concat(string, binding = nil) # :nodoc:
0
+      # :stopdoc:
0
+      module TextHelper
0
+        def concat_with_haml(string, binding = nil)
0
           if is_haml?
0
             buffer.buffer.concat(string)
0
           else
0
-            old_concat(string, binding)
0
+            concat_without_haml(string, binding)
0
           end
0
         end
0
-        
0
-        def form_tag(url_for_options = {}, options = {}, *parameters_for_url, &proc) # :nodoc:
0
+        alias_method_chain :concat, :haml
0
+      end
0
+      
0
+      module FormTagHelper
0
+        def form_tag_with_haml(url_for_options = {}, options = {}, *parameters_for_url, &proc)
0
           if block_given? && is_haml?
0
             oldproc = proc 
0
             proc = bind_proc do |*args|
0
@@ -54,29 +36,33 @@ if action_view_included
0
               tab_down
0
             end
0
           end
0
-          res = old_form_tag(url_for_options, options, *parameters_for_url, &proc) + "\n"
0
+          res = form_tag_without_haml(url_for_options, options, *parameters_for_url, &proc) + "\n"
0
           concat "\n" if block_given? && is_haml?
0
           res
0
         end
0
-
0
-        def form_for(object_name, *args, &proc) # :nodoc:
0
+        alias_method_chain :form_tag, :haml
0
+      end
0
+      
0
+      module FormHelper
0
+        def form_for_with_haml(object_name, *args, &proc)
0
           if block_given? && is_haml?
0
             oldproc = proc 
0
             proc = bind_proc do |*args|
0
               tab_up
0
               oldproc.call(*args)
0
               tab_down
0
-            end            
0
+            end
0
           end
0
-          old_form_for(object_name, *args, &proc)
0
+          form_for_without_haml(object_name, *args, &proc)
0
           concat "\n" if block_given? && is_haml?
0
         end
0
-
0
-        def generate_content_class_names
0
-          controller.controller_name + " " + controller.action_name
0
-        end
0
+        alias_method_chain :form_for, :haml
0
+      end
0
+      
0
+      def generate_content_class_names
0
+        controller.controller_name + " " + controller.action_name
0
       end
0
+      # :startdoc:
0
     end
0
   end
0
 end
0
-

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

0
@@ -62,9 +62,9 @@ class HelperTest < Test::Unit::TestCase
0
 
0
     begin
0
       ActionView::Base.new.render(:inline => "<%= concat('foo') %>")
0
-    rescue ArgumentError
0
+    rescue ArgumentError, NameError
0
       proper_behavior = true
0
-    end    
0
+    end
0
     assert(proper_behavior)
0
   end
0
   

0
@@ -41,3 +41,5 @@ stuff followed by whitespace
0
   Woah a period.
0
 <![endif]-->
0
 testtest
0
+<foo />
0
+<foo />

0
@@ -38,4 +38,14 @@
0
 /[if gte IE5.2]
0
   Woah a period.
0
 = "test" |
0
-  "test" |
0
\ No newline at end of file
0
+  "test" |
0
+- case :foo
0
+- when :bar
0
+  %bar/
0
+- when :foo
0
+  %foo/
0
+- case :foo
0
+  - when :bar
0
+    %bar/
0
+  - when :foo
0
+    %foo/