zevarito-undress 0.2 → 0.2.1

data/lib/undress.rb

@@ -46,13 +46,9 @@ module Undress
         fixup_list(list) if list.parent != "li" && list.parent.name !~ /ul|ol/
       end
 
-      (@doc/"span[@style*='italic']").each       { |e| e.swap "<em>#{e.inner_html}</em>" }
-      
-      (@doc/"span[@style*='underline']").each    { |e| e.swap "<ins>#{e.inner_html}</ins>" } 
-
-      (@doc/"span[@style*='line-through']").each { |e| e.swap "<del>#{e.inner_html}</del>" }
-
-      (@doc/"span[@style*='bold']").each      { |e| e.swap "<strong>#{e.inner_html}</strong>" }
+      (@doc/"p|span").each do |e|
+        fixup_span_with_styles(e)
+      end
     end
 
     # Delete tabs, newlines and more than 2 spaces from inside elements
@@ -67,6 +63,18 @@ module Undress
       end
     end
 
+    # For those elements like <span> if they are used to represent bold, italic
+    # such as those used on wysiwyg editors, we remove that after convert to not
+    # use them on the final convertion.
+    def fixup_span_with_styles(e)
+        return if !e.has_attribute?("style")
+
+        if e["style"] =~ /italic/        then e.inner_html = "<em>#{e.inner_html}</em>"          end
+        if e["style"] =~ /underline/     then e.inner_html = "<ins>#{e.inner_html}</ins>"        end
+        if e["style"] =~ /line-through/  then e.inner_html = "<del>#{e.inner_html}</del>"        end
+        if e["style"] =~ /bold/          then e.inner_html = "<strong>#{e.inner_html}</strong>"  end
+    end
+
     # Fixup a badly nested list such as <ul> sibling to <li> instead inside of <li>.
     def fixup_list(list)
       list.children.each {|e| fixup_list(e) if e.elem? && e.name =~ /ol|ul/}

data/test/test_greencloth.rb

@@ -21,10 +21,19 @@ class Undress::GreenClothTest < Test::Unit::TestCase
   # this is ok to ensure invalid html -> to greencloth but xhtmlize! must have
   # tests on test_undress or something too
   context "parsing not valid xhtml documents" do
-    test "font-weight=bold styles in <span> elements should be <strong>" do
-      html = "<p>some text <span style='font-weight=bold'>bold</span> with style</p>"
+    test "a <span> bold, italic, underline, line-through at the same time" do
+      html = "<p>some text <span style='font-weight:bold; font-style:italic; text-decoration:underline; text-decoration:line-through'>bold</span> with style</p>"
+      greencloth = "some text *-+_bold_+-* with style\n"
+      assert_renders_greencloth greencloth, html 
+    end
+
+    test "font-weight:bold styles in <span> elements should be <strong>" do
+      html = "<p>some text <span style='font-weight:bold'>bold</span> with style</p>"
       greencloth = "some text *bold* with style\n"
       assert_renders_greencloth greencloth, html 
+      html = "<p style='font-weight:bold'>some text bold with style</p>"
+      greencloth = "*some text bold with style*\n"
+      assert_renders_greencloth greencloth, html 
     end
 
     test "style 'line-through' should be converted to <del> in <span> elements" do
@@ -32,7 +41,7 @@ class Undress::GreenClothTest < Test::Unit::TestCase
       greencloth = "with -some- in the -paragraph-\n"
       assert_renders_greencloth greencloth, html 
 	    html = "<p style='text-decoration: line-through;'>with some in the paragraph</p>"
-      greencloth = "with some in the paragraph\n"
+      greencloth = "-with some in the paragraph-\n"
       assert_renders_greencloth greencloth, html 
     end
 
@@ -41,7 +50,7 @@ class Undress::GreenClothTest < Test::Unit::TestCase
       greencloth = "with +some+ in the +paragraph+\n"
       assert_renders_greencloth greencloth, html 
 	    html = "<p style='text-decoration: underline;'>with some in the paragraph</p>"
-      greencloth = "with some in the paragraph\n"
+      greencloth = "+with some in the paragraph+\n"
       assert_renders_greencloth greencloth, html 
     end
 
@@ -50,7 +59,7 @@ class Undress::GreenClothTest < Test::Unit::TestCase
       greencloth = "with _some_ in the _paragraph_\n"
       assert_renders_greencloth greencloth, html 
 	    html = "<p style='font-style: italic;'>with some in the paragraph</p>"
-      greencloth = "with some in the paragraph\n"
+      greencloth = "_with some in the paragraph_\n"
       assert_renders_greencloth greencloth, html 
     end
 

data/undress.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name    = "undress"
-  s.version = "0.2"
+  s.version = "0.2.1"
   s.date    = "2009-07-29"
 
   s.description = "Simply translate HTML to Textile, Markdown, or whatever other markup format you need"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zevarito-undress
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: 0.2.1
 platform: ruby
 authors: 
 - "Nicol\xC3\xA1s Sanguinetti"