rubb 0.9.1 → 0.9.2

data/README.rdoc

@@ -1,6 +1,6 @@
 = RuBB
 
-BBCode Parser for Ruby.
+BBCode gem for Ruby.
 
 RuBB parses BBCode by generating a parse tree, so it is able to handle nested BBCode tags properly.
 
@@ -18,23 +18,36 @@ RuBB parses BBCode by generating a parse tree, so it is able to handle nested BB
 
 RuBB supports the following BBCode tags:
 
-  [b]text[/b]
-  [i]text[/i]
-  [u]text[/u]
-  [s]text[/s]
-  [size=10]text[/size]
-  [color=#ff0000]text[/color]
-  [center]text[/center]
-  [quote]text[/quote]
-  [quote=someone]text[/quote]
-  [url]http://github.com/petejkim/rubb/[/url]
-  [url=http://github.com/petejkim/rubb/]RuBB[/url]
-  [img]http://test.com/test.jpg[/img]
-  [img=640x480]http://test.com/test.jpg[/img]
-  [ul][li]text[/li][/ul]
-  [ol][li]text[/li][/ol]
-  [code]text[/code]
-  [table][tr][th]text[/th][/tr][tr][td]text[/td][/tr][/table]
+  [b]text[/b] => <strong>text</strong>
+  [i]text[/i] => <em>text</em>
+  [u]text[/u] => <ins>text</ins>
+  [s]text[/s] => <del>text</del>
+  
+  [size=10]text[/size]        => <span style="font-size: 10px;">text</span>
+  [color=#ff0000]text[/color] => <span style="color: #ff0000;">text</span>
+  
+  [left]text[/left]     => <span style="text-align: left;">text</span>
+  [center]text[/center] => <span style="text-align: center;">text</span>
+  [right]text[/right]   => <span style="text-align: right;">text</span>
+  
+  [quote]text[/quote]         => <blockquote><p>text</p></blockquote>
+  [quote=someone]text[/quote] => <blockquote><dl><dt>someone</dt><dd><p>text</p></dd></dl></blockquote>
+  
+  [url]http://github.com/petejkim/rubb/[/url]      => <a href="http://github.com/petejkim/rubb/">http://github.com/petejkim/rubb/</a>
+  [url=http://github.com/petejkim/rubb/]RuBB[/url] => <a href="http://github.com/petejkim/rubb/">RuBB</a>
+  
+  [email]test@test.com[/email]            => <a href="mailto:test@test.com">test@test.com</a>
+  [email=test@test.com]Test Email[/email] => <a href="mailto:test@test.com">Test Email</a>
+  
+  [img]http://test.com/test.jpg[/img]         => <img src="http://test.com/test.jpg" alt="" />
+  [img=640x480]http://test.com/test.jpg[/img] => <img src="http://test.com/test.jpg" style="width: 640px; height: 480px;" alt="" />
+  
+  [ul][li]text[/li][/ul] => <ul><li>text</li></ul>
+  [ol][li]text[/li][/ol] => <ol><li>text</li></ol>
+  
+  [code]text[/code] => <pre>text</pre>
+  
+  [table][tr][th]text[/th][/tr][tr][td]text[/td][/tr][/table] => <table><tr><th>text</th></tr><tr><td>text</td></tr></table>
 
 == Copyright
 

data/Rakefile

@@ -6,7 +6,7 @@ begin
   
   Jeweler::Tasks.new do |s|
     s.name              = "rubb"
-    s.summary           = "BBCode Parser for Ruby that supports nested BBCode tags."
+    s.summary           = "BBCode gem for Ruby that supports nested BBCode tags."
     s.description       = s.summary
     s.homepage          = "http://github.com/petejkim/rubb"
     s.authors           = ["Peter Jihoon Kim"]

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.9.2

data/lib/rubb/node.rb

@@ -1,11 +1,9 @@
 module RuBB
   class Node
     attr_accessor :children
-    attr_accessor :leftover
   
     def initialize(options={})
       @children = options[:children] || []
-      @leftover = options[:leftover]
     end
   
     def <<(child)

data/lib/rubb/node/email.rb

@@ -0,0 +1,26 @@
+module RuBB
+  class Node
+    class Email < Node
+      attr_accessor :email
+      
+      def initialize(options={})
+        super(options)
+        @email = options[:email] || ''
+      end
+      
+      def to_html
+        unless(@email.empty?)
+          html = "<a href=\"mailto:#{Parser.escape_quotes(@email)}\">"
+          @children.each do |child|
+            html += child ? child.to_html : ''
+          end
+          html + '</a>'
+        else
+          email = Parser.escape_quotes(@children.map {|c| c ? c.to_html : '' }.join)
+          html = "<a href=\"mailto:#{email}\">#{email}</a>"
+        end
+      end
+    end
+  end
+end
+

data/lib/rubb/node/quote.rb

@@ -9,13 +9,15 @@ module RuBB
       end
       
       def to_html
-        html = '<p class="rubb_quote_header">Quote:</p><blockquote>'
-        html += "<p class=\"rubb_quote_who\">Originally Posted by <strong>#{Parser.escape_quotes(@who)}</strong></p>" unless(@who.empty?)
-        html += '<p class="rubb_quote_content">'
+        html = '<blockquote>'
+        html += "<dl><dt>#{Parser.escape_quotes(@who)}</dt><dd>" unless(@who.empty?)
+        html += '<p>'
         @children.each do |child|
           html += child ? child.to_html : ''
         end
-        html + '</p></blockquote>'
+        html += '</p>'
+        html += '</dd></dl>' unless(@who.empty?)
+        html + '</blockquote>'
       end
     end
   end

data/lib/rubb/parser.rb

@@ -43,17 +43,24 @@ module RuBB
         when 'size'
           Node::Styled.new(:style_hash => {'font-size' => (extra_params[:param] ? extra_params[:param].to_f.to_s + 'px' : nil)})
         when 'color'
-          Node::Styled.new(:style_hash => {'color' => (extra_params[:param] || nil)})
+          Node::Styled.new(:style_hash => {'color' => (extra_params[:param] ? extra_params[:param].to_s : nil)})
+        when 'left'
+          Node::Styled.new(:style_hash => {'text-align' => 'left'})
         when 'center'
           Node::Styled.new(:style_hash => {'text-align' => 'center'})
+        when 'right'
+          Node::Styled.new(:style_hash => {'text-align' => 'right'})
         when 'quote'
-          Node::Quote.new(:who => (extra_params[:param] || ''))
+          Node::Quote.new(:who => (extra_params[:param] ? extra_params[:param].to_s : ''))
         when 'url'
           ignore_bbcode_in_children = true if extra_params[:param].nil?
-          Node::URL.new(:url => (extra_params[:param] || ''))
+          Node::URL.new(:url => (extra_params[:param] ? extra_params[:param].to_s : ''))
+        when 'email'
+          ignore_bbcode_in_children = true if extra_params[:param].nil?
+          Node::Email.new(:email => (extra_params[:param] ? extra_params[:param].to_s : ''))
         when 'img'
           ignore_bbcode_in_children = true
-          if(extra_params[:param] && (dimensions = extra_params[:param].split('x')).size >= 2)
+          if(extra_params[:param] && (dimensions = extra_params[:param].to_s.split('x')).size >= 2)
             Node::Image.new(:width => dimensions[0].to_i, :height => dimensions[1].to_i)
           else
             Node::Image.new
@@ -101,9 +108,9 @@ module RuBB
                     node << Node::Text.new(:text => match_data[0], :ignore_whitespace => true)
                   else
                     case tag_name
-                    when 'b', 'i', 'u', 's', 'code', 'center', 'ul', 'ol', 'table'
+                    when 'b', 'i', 'u', 's', 'code', 'left', 'center', 'right', 'ul', 'ol', 'table'
                       node << parse(code, tag_name)
-                    when 'url', 'img', 'size', 'color', 'quote'
+                    when 'url', 'email', 'img', 'size', 'color', 'quote'
                       if(tag[1] == '=' && tag.size > 2) # param is present
                         param = remove_wrapping_quotes(tag[2..(tag.size)].join(' '))
                         node << parse(code, tag_name, {:param => param})

data/rubb.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubb}
-  s.version = "0.9.1"
+  s.version = "0.9.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Jihoon Kim"]
-  s.date = %q{2010-07-12}
-  s.description = %q{BBCode Parser for Ruby that supports nested BBCode tags.}
+  s.date = %q{2010-07-13}
+  s.description = %q{BBCode gem for Ruby that supports nested BBCode tags.}
   s.email = %q{raingrove@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
      "init.rb",
      "lib/rubb.rb",
      "lib/rubb/node.rb",
+     "lib/rubb/node/email.rb",
      "lib/rubb/node/image.rb",
      "lib/rubb/node/quote.rb",
      "lib/rubb/node/simple.rb",
@@ -40,7 +41,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{BBCode Parser for Ruby that supports nested BBCode tags.}
+  s.summary = %q{BBCode gem for Ruby that supports nested BBCode tags.}
   s.test_files = [
     "test/test_helper.rb",
      "test/test_rubb.rb"

data/test/test_rubb.rb

@@ -47,21 +47,33 @@ class RuBBTest < Test::Unit::TestCase
     assert_equal html, bb.bb_to_html
   end
   
+  def test_left
+    bb   = '[left]hello[/left]'
+    html = '<span style="text-align: left;">hello</span>'
+    assert_equal html, bb.bb_to_html
+  end
+  
   def test_center
     bb   = '[center]hello[/center]'
     html = '<span style="text-align: center;">hello</span>'
     assert_equal html, bb.bb_to_html
   end
   
+  def test_right
+    bb   = '[right]hello[/right]'
+    html = '<span style="text-align: right;">hello</span>'
+    assert_equal html, bb.bb_to_html
+  end
+  
   def test_quote
     bb   = '[quote]hello world![/quote]'
-    html = '<p class="rubb_quote_header">Quote:</p><blockquote><p class="rubb_quote_content">hello world!</p></blockquote>'
+    html = '<blockquote><p>hello world!</p></blockquote>'
     assert_equal html, bb.bb_to_html
   end
   
   def test_named_quote
     bb   = '[quote=raingrove]hello world![/quote]'
-    html = '<p class="rubb_quote_header">Quote:</p><blockquote><p class="rubb_quote_who">Originally Posted by <strong>raingrove</strong></p><p class="rubb_quote_content">hello world!</p></blockquote>'
+    html = '<blockquote><dl><dt>raingrove</dt><dd><p>hello world!</p></dd></dl></blockquote>'
     assert_equal html, bb.bb_to_html
   end
   
@@ -107,6 +119,18 @@ class RuBBTest < Test::Unit::TestCase
     assert_equal html, bb.bb_to_html
   end
   
+  def test_email_simple
+    bb   = '[email]test@test.com[/email]'
+    html = '<a href="mailto:test@test.com">test@test.com</a>'
+    assert_equal html, bb.bb_to_html
+  end
+  
+  def test_email_named
+    bb   = '[email=test@test.com]Test[/email]'
+    html = '<a href="mailto:test@test.com">Test</a>'
+    assert_equal html, bb.bb_to_html
+  end
+  
   def test_escape_quotes
     bb   = "[url=hello\">hello<p class='test'>hi</p><a href=\"]hello[/url]"
     html = "<a href=\"hello\\\"&gt;hello&lt;p class=\\\'test\\\'&gt;hi&lt;/p&gt;&lt;a href=\\\"\">hello</a>"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - Peter Jihoon Kim
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-12 00:00:00 +09:00
+date: 2010-07-13 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
-description: BBCode Parser for Ruby that supports nested BBCode tags.
+description: BBCode gem for Ruby that supports nested BBCode tags.
 email: raingrove@gmail.com
 executables: []
 
@@ -36,6 +36,7 @@ files:
 - init.rb
 - lib/rubb.rb
 - lib/rubb/node.rb
+- lib/rubb/node/email.rb
 - lib/rubb/node/image.rb
 - lib/rubb/node/quote.rb
 - lib/rubb/node/simple.rb
@@ -77,7 +78,7 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: BBCode Parser for Ruby that supports nested BBCode tags.
+summary: BBCode gem for Ruby that supports nested BBCode tags.
 test_files: 
 - test/test_helper.rb
 - test/test_rubb.rb