ClothRed 0.3.0 → 0.3.1

data/lib/clothred.rb

@@ -19,24 +19,25 @@ class ClothRed < String
     ["</b>", "*"], ["<cite>", "??"], ["</cite>", "??"], ["<code>", "@"], 
     ["</code>", "@"], ["<del>", "-"], ["</del>", "-"], ["<ins>", "+"], 
     ["</ins>", "+"], ["<sup>","^"], ["</sup>","^"], ["<sub>","~"], ["</sub>","~"], 
-    ["<strong>", "*"], ["</strong>", "*"], ["<i>","__"], ["</i>", "__"] 
+    ["<strong>", "*"], ["</strong>", "*"], ["<i>","__"], ["</i>", "__"]
   ]
   
   HEADINGS = [
-    ["<h1>","h1. "], ["</h1>", ""], ["<h2>","h2. "], ["</h2>", ""], 
-    ["<h3>","h3. "], ["</h3>", ""], ["<h4>","h4. "], ["</h4>", ""], 
-    ["<h5>","h5. "], ["</h5>", ""], ["<h6>","h6. "], ["</h6>", ""], 
-    ["<h7>","h7. "], ["</h7>", ""]
+    ["<h1>","h1. "], ["</h1>", "\n\n"], ["<h2>","h2. "], ["</h2>", "\n\n"], 
+    ["<h3>","h3. "], ["</h3>", "\n\n"], ["<h4>","h4. "], ["</h4>", "\n\n"], 
+    ["<h5>","h5. "], ["</h5>", "\n\n"], ["<h6>","h6. "], ["</h6>", "\n\n"], 
+    ["<h7>","h7. "], ["</h7>", "\n\n"]
   ]
   
   STRUCTURES = [
-    ["<p>", ""],["</p>","\n\n"], ["<blockquote>", "bq. "], ["</blockquote>",""]
+    ["<p>", ""],["</p>","\n\n"], ["<blockquote>", "bq. "], ["</blockquote>",""], 
+    ["<br />", "\n"], ["<br>", "\n"]
   ]
   
   ENTITIES = [
     ["&#8220;", '"'], ["&#8221;", '"'], ["&#8212;", "--"], ["&#8212;", "--"], 
     ["&#8211;","-"], ["&#8230;", "..."], ["&#215;", " x "], ["&#8482;","(tm)"], 
-    ["&#174;","(R)"], ["&#169;","(C)"], ["&#8217;", "'"]
+    ["&#174;","(R)"], ["&#169;","(c)"], ["&#8217;", "'"]
   ]
   
   TABLES = [

data/test/test_entities.rb

@@ -18,7 +18,7 @@ class TestClothRedEntities < Test::Unit::TestCase
   ENTITIES_TEST = [
     ["&#8220;", '"'], ["&#8221;", '"'], ["&#8212;", "--"], ["&#8212;", "--"], 
     ["&#8211;","-"], ["&#8230;", "..."], ["&#215;", " x "], ["&#8482;","(tm)"], 
-    ["&#174;","(R)"], ["&#169;","(C)"], ["&#8217;", "'"]
+    ["&#174;","(R)"], ["&#169;","(c)"], ["&#8217;", "'"]
   ]
   
   def test_entities

data/test/test_headings.rb

@@ -14,14 +14,14 @@ end
 require 'test/unit'
 
 class TestClothRedHeadings < Test::Unit::TestCase
- 
+
   HEADING_TEST = [
-    ["<h1>Heading 1</h1>","h1. Heading 1"], ["<h2>Heading 2</h2>", "h2. Heading 2"],
-    ["<h3>Heading 3", "h3. Heading 3"], ["<h4>Heading 4</h4>", "h4. Heading 4"],
-    ["<h5>Heading 5", "h5. Heading 5"], ["<h6>Heading 6</h6>", "h6. Heading 6"]
+  ["<h1>Heading 1</h1>","h1. Heading 1\n\n"], ["<h2>Heading 2</h2>", "h2. Heading 2\n\n"],
+  ["<h3>Heading 3", "h3. Heading 3\n\n"], ["<h4>Heading 4</h4>", "h4. Heading 4\n\n"],
+  ["<h5>Heading 5", "h5. Heading 5\n\n"], ["<h6>Heading 6</h6>", "h6. Heading 6\n\n"]
   ]
-  
-  
+
+
   def test_headings
     HEADING_TEST.each do |html, textile|
       test_html = ClothRed.new(html)
@@ -29,4 +29,18 @@ class TestClothRedHeadings < Test::Unit::TestCase
       assert_equal(textile,result)
     end
   end
+
+  MIST_TEST = [
+  ["<h1>Heading 1</h1><h2>Heading 2</h2>","h1. Heading 1\n\nh2. Heading 2\n\n"],
+  ]
+
+
+  def test_headings
+    MIST_TEST.each do |html, textile|
+      test_html = ClothRed.new(html)
+      result = test_html.to_textile
+      assert_equal(textile,result)
+    end
+  end
+
 end

data/test/test_structure.rb

@@ -17,7 +17,8 @@ class TestClothRedStructures < Test::Unit::TestCase
  
   STRUCTURE_TEST = [
   ["<blockquote>blockquote</blockquote>","bq. blockquote"],
-  ["<p>paragraph</p><p>another paragraph</p>", "paragraph\n\nanother paragraph\n\n"]
+  ["<p>paragraph</p><p>another paragraph</p>", "paragraph\n\nanother paragraph\n\n"], 
+  ["HTML page break<br>", "HTML page break\n"], ["XHTML page break<br />", "XHTML page break\n"]
   ]
   
   

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.1
 specification_version: 1
 name: ClothRed
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
-date: 2007-04-12 00:00:00 +02:00
+  version: 0.3.1
+date: 2007-04-13 00:00:00 +02:00
 summary: "RedCloth in reverse: Converting HTML into Textile markup"
 require_paths: 
 - lib