ClothRed 0.1.0 → 0.2.0

data/lib/clothred.rb

@@ -17,7 +17,7 @@ License:: BSD
 
 class ClothRed < String
 #--
-  FORMATTING_HTML = [
+  TEXT_FORMATTING = [
     ["<b>", "**"], ["</b>","**"], ["<em>","_"], ["</em>", "_"], ["<b>", "*"], 
     ["</b>", "*"], ["<cite>", "??"], ["</cite>", "??"], ["<code>", "@"], 
     ["</code>", "@"], ["<del>", "-"], ["</del>", "-"], ["<ins>", "+"], 
@@ -25,18 +25,69 @@ class ClothRed < String
     ["<strong>", "*"], ["</strong>", "*"], ["<i>","__"], ["</i>", "__"] 
   ]
   
+  HEADINGS = [
+    ["<h1>","h1. "], ["</h1>", ""], ["<h2>","h2. "],["</h2>", ""], 
+    ["<h3>","h3. "], ["</h3>", ""], ["<h4>","h4. "],["</h4>", ""], 
+    ["<h5>","h5. "], ["</h5>", ""], ["<h6>","h6. "],["</h6>", ""]
+  ]
+  
+  STRUCTURES = [
+    ["<p>", ""],["</p>","\n\n"], ["<blockquote>", "bq. "], ["</blockquote>",""]
+  ]
+  
   def initialize (html)
     super(html)
+    @workingcopy = html.dup
   end
 #++  
   #Call all necessary methods to convert a string of HTML into Textile markup.
   
   def to_textile
-    html = self.dup
-    FORMATTING_HTML.each do |htmltag, textiletag|
-      html.gsub!(htmltag, textiletag)
+   
+  headings(@workingcopy)
+  structure(@workingcopy)
+  text_formatting(@workingcopy)
+
+  @workingcopy
+
+end
+  
+#--
+  #The conversion methods themselves are private.
+  private
+  
+  def text_formatting(text)
+    TEXT_FORMATTING.each do |htmltag, textiletag|
+      text.gsub!(htmltag, textiletag)
     end
-    html
+    text
   end
   
+  
+  def headings(text)
+    HEADINGS.each do |htmltag, textiletag|
+      text.gsub!(htmltag, textiletag)
+    end
+    text
+  end
+  
+  
+  def structure(text)
+    STRUCTURES.each do |htmltag, textiletag|
+      text.gsub!(htmltag, textiletag)
+    end
+    text
+  end
+  
+  def tables(text)
+    #TODO: Translate Tables
+    text
+  end
+  
+  
+  def css_styles(text)
+    #TODO: Translate CSS-styles
+    text
+  end
+#++
 end

data/test/test_formatting.rb

@@ -24,12 +24,12 @@ class TestClothRedFormatting <  Test::Unit::TestCase
     ["<del>delete</del>", "-delete-"], ["<ins>underline</ins>", "+underline+"], 
     ["<sup>superscript</sup>","^superscript^"], ["<sub>subscript</sub>","~subscript~"] 
   ]
-  
+ 
   def test_textformatting
     FORMATTING_STRINGS.each do |html, textile|
       test_html = ClothRed.new(html)
       result = test_html.to_textile
-      assert_equal(textile,result.to_s)
+      assert_equal(textile,result)
     end
   end
 

data/test/test_headings.rb

@@ -0,0 +1,32 @@
+# test_headings.rb
+# 12. April 2007
+#
+
+$:.unshift File.join(File.dirname(__FILE__),'..','lib')
+
+begin
+  require "rubygems"
+  require "clothred"
+rescue LoadError
+  require "clothred"
+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"]
+  ]
+  
+  
+  def test_headings
+    HEADING_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

@@ -0,0 +1,31 @@
+# test_structure.rb
+# 12. April 2007
+#
+
+$:.unshift File.join(File.dirname(__FILE__),'..','lib')
+
+begin
+  require "rubygems"
+  require "clothred"
+rescue LoadError
+  require "clothred"
+end
+
+require 'test/unit'
+
+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"]
+  ]
+  
+  
+  def test_structures
+    STRUCTURE_TEST.each do |html, textile|
+      test_html = ClothRed.new(html)
+      result = test_html.to_textile
+      assert_equal(textile,result)
+    end
+  end
+end

metadata

@@ -3,14 +3,14 @@ rubygems_version: 0.9.1
 specification_version: 1
 name: ClothRed
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2007-04-11 00:00:00 +02:00
+  version: 0.2.0
+date: 2007-04-12 00:00:00 +02:00
 summary: "RedCloth in reverse: Converting HTML into Textile markup"
 require_paths: 
 - lib
 email: cmdjackryan@gmail.com
 homepage: 
-rubyforge_project: 
+rubyforge_project: clothred
 description: 
 autorequire: clothred
 default_executable: 
@@ -32,6 +32,8 @@ files:
 - lib/clothred.rb
 - lib/README.rdoc
 - test/test_formatting.rb
+- test/test_headings.rb
+- test/test_structure.rb
 - doc/html
 - doc/html/classes
 - doc/html/created.rid