dasil003-sanitize 1.1.0 → 1.1.1

data/HISTORY

@@ -1,6 +1,14 @@
 Sanitize History
 ================================================================================
 
+Version 1.1.1 (2009-10-14)
+  * Fixed formatting issue that was clobbering whitespace
+
+Version 1.1.0 (2009-10-13)
+  * Add object_urls support for flash video embed
+
+=== DASIL003 FORK ===
+
 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

@@ -1,5 +1,10 @@
 = Sanitize
 
+*NOTICE: This is a forked version of sanitize that bakes crude flash
+embed code support.  Ryan is working on a transformations branch that
+will allow this functionality to be implemented as middleware at which
+point I plan on killing this fork.*
+
 Sanitize is a whitelist-based HTML sanitizer. Given a list of acceptable
 elements and attributes, Sanitize will remove all unacceptable HTML from a
 string.

data/lib/sanitize.rb

@@ -144,23 +144,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

data/lib/sanitize/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dasil003-sanitize
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Ryan Grove
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-13 00:00:00 -07:00
+date: 2009-10-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency