Don't break compatibility for pre-rails_xss rails

ralph · Feb 16, 2011 · d930fd1 · d930fd1
1 parent cb8df05
commit d930fd1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/lib/acts_as_sanitiled.rb b/lib/acts_as_sanitiled.rb
@@ -14,6 +14,10 @@ def self.included(klass)
     klass.extend ClassMethods
   end
 
+  def self.html_safe_available?
+    "".respond_to?(:html_safe)
+  end
+
   module ClassMethods
     def acts_as_textiled(*attributes)
       raise "only acts_as_sanitized or acts_as_sanitiled can take an options hash" if attributes.last.is_a?(Hash)
@@ -58,7 +62,7 @@ def acts_as_sanitiled(*attributes)
               string = Sanitize.clean(string, sanitize_options) unless skip_sanitize
               textiled[attribute.to_s] = string
             end
-            textiled[attribute.to_s].html_safe
+            ActsAsSanitiled.html_safe_available? ? textiled[attribute.to_s].html_safe : textiled[attribute.to_s]
           elsif type.nil? && self[attribute].nil?
             nil
           elsif type_options.include?(type.to_s)
@@ -68,7 +72,7 @@ def acts_as_sanitiled(*attributes)
           end
         end
 
-        define_method("#{attribute}_plain",  proc { strip_html(__send__(attribute)).html_safe if __send__(attribute) } )
+        define_method("#{attribute}_plain",  proc { ActsAsSanitiled.html_safe_available? ? strip_html(__send__(attribute)).html_safe : strip_html(__send__(attribute)) if __send__(attribute) } )
         define_method("#{attribute}_source", proc { __send__("#{attribute}_before_type_cast") } )
 
         @textiled_attributes << attribute

diff --git a/spec/sanitiled_spec.rb b/spec/sanitiled_spec.rb
@@ -49,7 +49,7 @@
   it "should mark textilized and sanitized output as html safe" do
     @story.description.should.be :html_safe?
     @story.body.should.be :html_safe?
-  end
+  end if ActsAsSanitiled.html_safe_available?
 
   it "should properly strip html when given the 'plain' option" do
     @story.description(:plain).should.equal @desc_plain
@@ -59,7 +59,7 @@
   it "should mark output stripped of html as html safe" do
     @story.description(:plain).should.be :html_safe?
     @story.body(:plain).should.be :html_safe?
-  end
+  end if ActsAsSanitiled.html_safe_available?
 
   it "should leave unchanged when given the 'source' option" do
     @story.description(:source).should.equal @desc_textile
@@ -69,7 +69,7 @@
   it "should not mark raw source as html safe" do
     @story.description(:source).should.not.be :html_safe?
     @story.body(:source).should.not.be :html_safe?
-  end
+  end if ActsAsSanitiled.html_safe_available?
 
   it "should raise when given a non-sensical option" do
     proc{ @story.description(:cassadaga) }.should.raise