texta 0.1.2 → 0.1.3

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'  
 require 'echoe'  
 
-Echoe.new('texta', '0.1.2') do |p|  
+Echoe.new('texta', '0.1.3') do |p|  
   p.description     = "texta: heuristic text formatting"  
   p.url             = "http://github.com/pboy/texta"  
   p.author          = "pboy"  

data/lib/texta.rb

@@ -4,6 +4,8 @@ require "htmlentities"
 require "rdiscount"
 
 module Texta
+  class Error < ArgumentError; end
+  
   def self.init
     String.send :include, self
   end
@@ -50,23 +52,50 @@ module Texta
     
     def process(node)
       case node.name
-      when *%w(i b li)
+      # bold
+      when "b", "strong"
+        "**" + children(node).join(" ") + "**"
+      # italic
+      when "i", "em"
+        "_" + children(node).join(" ") + "_"
+      # plain
+      when "u"
         children(node).join(" ")
+      when "p"
+        children(node).join(" ") + "\n"
+      when "br"
+        "\n"
+
+      # headlines
       when /h([1-2])/
         char = $1 == "1" ? "=" : "-"
         s = children(node).join(" ")
         "#{s}\n" + char * [ [s.length, 6].min, 32 ].max + "\n\n"
       when /h([1-6])/   
         "#" * $1.to_i + " " + children(node).join(" ") + "\n\n"
+      
+      # text nodes
       when "text"
         s = node.to_s.gsub(/(^\s+)|(\s+$)/, "")
         s == "" ? nil : s 
-      when "p"
+      
+      # tables
+      
+      when "table"
+        children(node).join("")
+      when "tr"
         children(node).join(" ") + "\n"
+      when "th"
+        "**" + children(node).join(" ") + "**"
+      when "td"
+        children(node).join(" ")
+      # lists
       when "ul"
         children(node).map { |s| "- #{s}\n" }.join + "\n"
+      when "li"
+        children(node).join(" ")
       else
-        invalid_argument!("node #{node.name}")
+        raise Error, "node <#{node.name}>"
       end
     end
   end
@@ -147,7 +176,7 @@ HTML
   end
 
   def test_string_module
-    assert_equal "a chd d\n", "a <b>chd</b> d".texta(:text)
+    assert_equal "a **chd** d\n", "a <b>chd</b> d".texta(:text)
   end
 
   def test_invalid_option
@@ -192,4 +221,47 @@ HTML
   def test_nil
     assert_testa nil, nil, nil
   end
+
+  def test_table
+input = <<-HTML
+<table><tr>
+  <th>Farben</th>
+  <td>halbtransparent, halbtransparent blau (Polycarbonat)</td>
+</tr>
+<tr>
+  <th>Material</th>
+  <td>Körper und Flügel aus Polycarbonat</td>
+</tr>
+<tr>
+  <th>Abmessungen</th>
+  <td>
+    <u>Höhe</u>: 44cm<br>
+    <u>Durchmesser</u>: 122cm<br>
+  </td>
+</tr>
+<tr><th>Sonstiges</th><td>Steuerung über Fernbedienung</td></tr>
+</table>
+HTML
+
+    text = <<-TEXT
+**Farben** halbtransparent, halbtransparent blau (Polycarbonat)
+**Material** Körper und Flügel aus Polycarbonat
+**Abmessungen** Höhe : 44cm 
+ Durchmesser : 122cm 
+
+**Sonstiges** Steuerung über Fernbedienung
+TEXT
+
+    html = <<-HTML
+<p><strong>Farben</strong> halbtransparent, halbtransparent blau (Polycarbonat)
+ <strong>Material</strong> K&ouml;rper und Fl&uuml;gel aus Polycarbonat
+ <strong>Abmessungen</strong> H&ouml;he : 44cm
+ Durchmesser : 122cm</p>
+
+<p> <strong>Sonstiges</strong> Steuerung &uuml;ber Fernbedienung</p>
+HTML
+
+    assert_testa input, text, html
+  end
+  
 end

data/texta.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{texta}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["pboy"]
-  s.date = %q{2009-12-23}
+  s.date = %q{2009-12-26}
   s.description = %q{texta: heuristic text formatting}
   s.email = %q{eno-pboy@open-lab.org}
   s.extra_rdoc_files = ["README.rdoc", "lib/texta.rb"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: texta
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - pboy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-23 00:00:00 +01:00
+date: 2009-12-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency