acts_as_sanitiled 1.1.4 → 1.1.5

data/VERSION

@@ -1 +1 @@
-1.1.4
+1.1.5

data/acts_as_sanitiled.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{acts_as_sanitiled}
-  s.version = "1.1.4"
+  s.version = "1.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gabe da Silveira"]

data/lib/acts_as_sanitiled.rb

@@ -14,6 +14,10 @@ module ActsAsSanitiled #:nodoc: all
     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 @@ module ActsAsSanitiled #:nodoc: all
               string = Sanitize.clean(string, sanitize_options) unless skip_sanitize
               textiled[attribute.to_s] = string
             end
-            textiled[attribute.to_s]
+            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 @@ module ActsAsSanitiled #:nodoc: all
           end
         end
 
-        define_method("#{attribute}_plain",  proc { strip_html(__send__(attribute)) 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

data/spec/sanitiled_spec.rb

@@ -41,16 +41,36 @@ EOF
     @body_plain   = "First line\nSecond line with bold\n\nSecond paragraph with special char™, XSS attribute,\nscript>script tag, and unclosed tag."
   end
 
-  it "should properly textilize and strip html" do
+  it "should properly textilize and sanitize by default" do
     @story.description.should.equal @desc_html
-    @story.description(:source).should.equal @desc_textile
+    @story.body.should.equal @body_html
+  end
+
+  it "should mark textilized and sanitized output as html safe" do
+    @story.description.should.be :html_safe?
+    @story.body.should.be :html_safe?
+  end if ActsAsSanitiled.html_safe_available?
+
+  it "should properly strip html when given the 'plain' option" do
     @story.description(:plain).should.equal @desc_plain
+    @story.body(:plain).should.equal @body_plain
+  end
 
-    @story.body.should.equal @body_html
+  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 if ActsAsSanitiled.html_safe_available?
+
+  it "should leave unchanged when given the 'source' option" do
+    @story.description(:source).should.equal @desc_textile
     @story.body(:source).should.equal @body_textile
-    @story.body(:plain).should.equal @body_plain
   end
 
+  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 if ActsAsSanitiled.html_safe_available?
+
   it "should raise when given a non-sensical option" do
     proc{ @story.description(:cassadaga) }.should.raise
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_sanitiled
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 1
   - 1
-  - 4
-  version: 1.1.4
+  - 5
+  version: 1.1.5
 platform: ruby
 authors: 
 - Gabe da Silveira