0
@@ -1,10 +1,6 @@
0
 if defined?(ActionView) and not defined?(Merb::Plugins)
0
   module ActionView
0
     class Base # :nodoc:
0
-      def is_haml?
0
-        false
0
-      end
0
-
0
       def render_with_haml(*args, &block)
0
         return non_haml { render_without_haml(*args, &block) } if is_haml?
0
         render_without_haml(*args, &block)

0
@@ -16,3 +16,15 @@ class Hash # :nodoc:
0
     self
0
   end
0
 end
0
+
0
+class Object
0
+  # Haml overrides various ActionView helpers,
0
+  # which call an #is_haml? method
0
+  # to determine whether or not the current context object
0
+  # is a proper Haml context.
0
+  # Because ActionView helpers may be included in non-ActionView::Base classes,
0
+  # it's a good idea to define is_haml? for all objects.
0
+  def is_haml?
0
+    false
0
+  end
0
+end

0
@@ -171,6 +171,9 @@ class HelperTest < Test::Unit::TestCase
0
   end
0
   
0
   class ActsLikeTag
0
+    # We want to be able to have people include monkeypatched ActionView helpers
0
+    # without redefining is_haml?.
0
+    # This is accomplished via Object#is_haml?, and this is a test for it.
0
     include ActionView::Helpers::TagHelper
0
     def to_s
0
       content_tag :p, 'some tag content'