sanitize 1.1.0 → 1.1.1.dev.20091102

data/HISTORY

@@ -1,6 +1,11 @@
 Sanitize History
 ================================================================================
 
+Version 1.1.1.dev (git)
+  * Requires Nokogiri >= 1.4.0.
+  * Added elements h1 through h6 to the Relaxed whitelist. [Suggested by David
+    Reese]
+
 Version 1.1.0 (2009-10-11)
   * Migrated from Hpricot to Nokogiri. Requires libxml2 >= 2.7.2 [Adam Hooper]
   * Added an :output config setting to allow the output format to be specified.

data/README.rdoc

@@ -15,14 +15,14 @@ or maliciously-formed HTML. When in doubt, Sanitize always errs on the side of
 caution.
 
 *Author*::    Ryan Grove (mailto:ryan@wonko.com)
-*Version*::   1.1.0 (2009-10-11)
+*Version*::   1.1.1.dev (git)
 *Copyright*:: Copyright (c) 2009 Ryan Grove. All rights reserved.
 *License*::   MIT License (http://opensource.org/licenses/mit-license.php)
 *Website*::   http://github.com/rgrove/sanitize
 
 == Requires
 
-* Nokogiri
+* Nokogiri >= 1.4.0
 * libxml2 >= 2.7.2
 
 == Installation
@@ -152,10 +152,12 @@ The following lovely people have contributed to Sanitize in the form of patches
 or ideas that later became code:
 
 * Peter Cooper <git@peterc.org>
+* Gabe da Silveira <gabe@websaviour.com>
 * Ryan Grove <ryan@wonko.com>
 * Adam Hooper <adam@adamhooper.com>
 * Mutwin Kraus <mutle@blogage.de>
 * Dev Purkayastha <dev.purkayastha@gmail.com>
+* David Reese <work@whatcould.com>
 * Ben Wanicur <bwanicur@verticalresponse.com>
 
 == License

data/lib/sanitize/config/relaxed.rb

@@ -25,9 +25,10 @@ class Sanitize
     RELAXED = {
       :elements => [
         'a', 'b', 'blockquote', 'br', 'caption', 'cite', 'code', 'col',
-        'colgroup', 'dd', 'dl', 'dt', 'em', 'i', 'img', 'li', 'ol', 'p', 'pre',
-        'q', 'small', 'strike', 'strong', 'sub', 'sup', 'table', 'tbody', 'td',
-        'tfoot', 'th', 'thead', 'tr', 'u', 'ul'],
+        'colgroup', 'dd', 'dl', 'dt', 'em', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6',
+        'i', 'img', 'li', 'ol', 'p', 'pre', 'q', 'small', 'strike', 'strong',
+        'sub', 'sup', 'table', 'tbody', 'td', 'tfoot', 'th', 'thead', 'tr', 'u',
+        'ul'],
 
       :attributes => {
         'a'          => ['href', 'title'],

data/lib/sanitize/version.rb

@@ -1,3 +1,3 @@
 class Sanitize
-  VERSION = '1.1.0'
+  VERSION = '1.1.1.dev.20091102'
 end

data/lib/sanitize.rb

@@ -113,23 +113,21 @@ class Sanitize
       end
     end
 
+    # Nokogiri 1.3.3 (and possibly earlier versions) always returns a US-ASCII
+    # string no matter what we ask for. This will be fixed in 1.4.0, but for
+    # now we have to hack around it to prevent errors.
+    output_method_params = {:encoding => 'utf-8', :indent => 0}
     if @config[:output] == :xhtml
       output_method = fragment.method(:to_xhtml)
+      output_method_params.merge!(:save_with => Nokogiri::XML::Node::SaveOptions::AS_XHTML)
     elsif @config[:output] == :html
       output_method = fragment.method(:to_html)
     else
       raise Error, "unsupported output format: #{@config[:output]}"
     end
 
-    if RUBY_VERSION >= '1.9'
-      # Nokogiri 1.3.3 (and possibly earlier versions) always returns a US-ASCII
-      # string no matter what we ask for. This will be fixed in 1.4.0, but for
-      # now we have to hack around it to prevent errors.
-      result = output_method.call(:encoding => 'utf-8', :indent => 0).force_encoding('utf-8')
-      result.gsub!(">\n", '>')
-    else
-      result = output_method.call(:encoding => 'utf-8', :indent => 0).gsub(">\n", '>')
-    end
+    result = output_method.call(output_method_params)
+    result.force_encoding('utf-8') if RUBY_VERSION >= '1.9'
 
     return result == html ? nil : html[0, html.length] = result
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sanitize
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.1.dev.20091102
 platform: ruby
 authors: 
 - Ryan Grove
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-11 00:00:00 -07:00
+date: 2009-11-02 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.3.3
+        version: 1.4.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: bacon
@@ -77,9 +77,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
   version: 
 requirements: []