rbbcode 0.1.8 → 0.1.11

data/.document

@@ -0,0 +1,5 @@
+lib/**/*.rb
+bin/*
+- 
+features/**/*.feature
+LICENSE.txt

data/Gemfile

@@ -0,0 +1,13 @@
+source 'http://rubygems.org'
+
+gem 'sanitize-url', '>= 0.1.3'
+
+# Add dependencies to develop your gem here.
+# Include everything needed to run rake, tests, features, etc.
+group :development do
+  gem 'rspec', '~> 2.3.0'
+  gem 'bluecloth'
+  gem 'yard', '~> 0.6.0'
+  gem 'bundler', '~> 1.0.0'
+  gem 'jeweler', '~> 1.5.2'
+end

data/LICENSE.txt

@@ -0,0 +1,21 @@
+Copyright (c) 2004-2008 David Heinemeier Hansson
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

data/README.markdown

@@ -1,12 +1,7 @@
-The gem is fixed!
-=================
-
-Due to a defective gemspec, at least one version (0.1.3) wasn't packaging the lib directory in the .gem file. This has been corrected in 0.1.4. Sorry for the delay in fixing this.
-
 About RbbCode
 =============
 
-RbbCode is a customizable Ruby library for parsing BB Code.
+RbbCode is a customizable Ruby library for parsing BB Code originally developed by Jarret (https://github.com/jarrett/rbbcode).
 
 RbbCode validates and cleans input. It supports customizable schemas so you can set rules about what tags are allowed where. The default rules are designed to ensure valid HTML output.
 
@@ -75,6 +70,15 @@ As you can infer from the second example, RbbCode does not support attributes li
 
 RbbCode does not support all the tags listed on Wikpedia out of the box, and probably never will. However, you can easily add support for as many tags as you want.
 
+
+BBCode Syntax Extensions
+========================
+
+In order to support inline BBCode tags like smileys I added the following syntax:
+    [:tagname]
+  
+These tags do not need to be closed. For HTML generation the method html_from_tagname_tag(node) is called, as usual.
+
 XSS Prevention
 ==============
 
@@ -119,4 +123,4 @@ Installation
 If that doesn't work, it's probably because RbbCode is hosted on Gemcutter, and your computer doesn't know about Gemcutter yet. To fix that:
 
 	gem install gemcutter
-	gem tumble
+	gem tumble

data/Rakefile

@@ -0,0 +1,35 @@
+require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+require 'rake'
+
+require 'jeweler'
+
+Jeweler::Tasks.new do |gem|
+	gem.name = 'rbbcode'
+	gem.homepage = "http://github.com/jarrett/rbbcode"
+	gem.license = "MIT"
+	gem.summary = 'Ruby BB Code parser'
+	gem.description = 'RbbCode is a customizable Ruby library for parsing BB Code. RbbCode validates and cleans input. It supports customizable schemas so you can set rules about what tags are allowed where. The default rules are designed to ensure valid HTML output.'
+	gem.email = "jarrett@jarrettcolby.com, aq1018@gmail.com"
+	gem.authors = ['Jarrett Colby', "aq1018@gmail.com"]
+end
+Jeweler::RubygemsDotOrgTasks.new
+
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
+  spec.rspec_opts = "--color --format progress"
+end
+
+task :default => :spec
+
+require 'yard'
+YARD::Rake::YardocTask.new

data/VERSION

@@ -0,0 +1 @@
+0.1.11

data/lib/rbbcode/html_maker.rb

@@ -55,7 +55,7 @@ module RbbCode
 			attributes.each do |attr, value|
 				output << " #{attr}=\"#{value}\""
 			end
-			if contents.nil? or contents.empty?
+			if contents.nil? or contents.empty? and not tag_name == 'code'
 				output << '/>'
 			else
 				output << ">#{contents}</#{tag_name}>"
@@ -87,4 +87,4 @@ module RbbCode
 			DEFAULT_TAG_MAPPINGS[tag_name]
 		end
 	end
-end
+end

data/lib/rbbcode/parser.rb

@@ -29,4 +29,4 @@ module RbbCode
 			[:schema, :tree_maker, :html_maker]
 		end
 	end
-end
+end

data/lib/rbbcode/schema.rb

@@ -268,6 +268,7 @@ module RbbCode
 		end
 		
 		def text_valid_in_context?(*ancestors)
+		  ancestors.flatten!
 			if @no_text.include?(ancestors[0].to_s)
 				return false
 			end
@@ -295,6 +296,8 @@ module RbbCode
 			tag('img').may_not_be_nested
 			tag('code').may_not_be_nested
 			tag('code').is_preformatted
+			#tag('code').may_not_be_empty
+			tag('quote').may_not_be_empty
 			tag('p').may_not_be_nested
 			tag('*').must_be_child_of('list')
 			tag('*').closes_twins
@@ -303,4 +306,4 @@ module RbbCode
 			tag('list').may_not_contain_text
 		end
 	end
-end
+end

data/lib/rbbcode/tree_maker.rb

@@ -56,6 +56,11 @@ module RbbCode
 	
 	class TagNode < Node
 		def self.from_opening_bb_code(parent, bb_code)
+		  # Remove colon if leave_tag
+		  if bb_code[1,1] == ':'
+		    bb_code = "[#{bb_code[2..-1]}"
+		  end
+		  
 			if equal_index = bb_code.index('=')
 				tag_name = bb_code[1, equal_index - 1]
 				value = bb_code[(equal_index + 1)..-2]
@@ -149,6 +154,7 @@ module RbbCode
 					elsif child.tag_name == @schema.paragraph_tag_name
 						# It's an empty paragraph tag
 						true
+					#elsif not node.is_a?(RootNode) and @schema.block_level?(node.tag_name) and child.tag_name == @schema.line_break_tag_name and node.children.last == child
 					elsif @schema.block_level?(node.tag_name) and child.tag_name == @schema.line_break_tag_name and node.children.last == child
 						# It's a line break a the end of the block-level element
 						true
@@ -192,8 +198,21 @@ module RbbCode
 			# be temporarily split up as we append bytes onto the text nodes. But as of yet, I haven't found
 			# a way that this could cause a problem. The bytes always come back together again. (It would be a problem
 			# if we tried to count the characters for some reason, but we don't do that.)
-			str.each_byte do |char_code|
-				char = char_code.chr
+
+      # AQ: #each_byte doesn't work with ruby 1.9+, but luckily we have #each_char
+      split_method = :each_byte
+      split_method = :each_char if RUBY_VERSION.split('.')[1] > "8"
+      
+			block = Proc.new do |char|
+			  if split_method == :each_char
+			    # ruby 1.9
+			    char_code = char.ord
+		    else
+		      # ruby 1.8
+		      char_code = char
+		      char = char_code.chr
+	      end
+
 				case current_token_type
 				when :unknown
 					case char
@@ -275,6 +294,9 @@ module RbbCode
 					when '/'
 						current_token_type = :closing_tag
 						current_token << '/'
+				  when ':'
+				    current_token_type = :leaf_tag
+				    current_token << ':'
 					else
 						if tag_name_char?(char_code)
 							current_token_type = :opening_tag
@@ -328,6 +350,21 @@ module RbbCode
 						current_token_type = :text
 						current_token << char
 					end
+				when :leaf_tag
+				  if tag_name_char?(char_code) or char == '='
+						current_token << char
+					elsif char == ']'
+					  current_token << ']'
+					  tag_node = TagNode.from_opening_bb_code(current_parent, current_token)
+					  
+					  if @schema.tag(tag_node.tag_name).valid_in_context?(*ancestor_list(current_parent))
+					    current_parent.children << tag_node
+					    current_token_type = :unknown
+					    current_token = ''
+					  else
+					    current_token_type = :text
+					  end  
+					end
 				when :closing_tag
 					if tag_name_char?(char_code)
 						current_token << char
@@ -376,6 +413,9 @@ module RbbCode
 					raise "Unknown token type in state machine: #{current_token_type}"
 				end
 			end
+
+      str.send(split_method, &block)
+      
 			# Handle whatever's left in the current token
 			if current_token_type != :break and !current_token.empty?
 				current_parent << TextNode.new(current_parent, current_token)
@@ -387,4 +427,4 @@ module RbbCode
 			(char_code >= LOWER_A_CODE and char_code <= LOWER_Z_CODE) or (char_code >= UPPER_A_CODE and char_code <= UPPER_Z_CODE) or char_code.chr == '*'
 		end
 	end	
-end
+end

data/rbbcode.gemspec

@@ -0,0 +1,82 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{rbbcode}
+  s.version = "0.1.11"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Jarrett Colby", "aq1018@gmail.com"]
+  s.date = %q{2011-02-19}
+  s.description = %q{RbbCode is a customizable Ruby library for parsing BB Code. RbbCode validates and cleans input. It supports customizable schemas so you can set rules about what tags are allowed where. The default rules are designed to ensure valid HTML output.}
+  s.email = %q{jarrett@jarrettcolby.com, aq1018@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.markdown"
+  ]
+  s.files = [
+    ".document",
+    "Gemfile",
+    "LICENSE.txt",
+    "README.markdown",
+    "Rakefile",
+    "VERSION",
+    "lib/rbbcode.rb",
+    "lib/rbbcode/html_maker.rb",
+    "lib/rbbcode/parser.rb",
+    "lib/rbbcode/schema.rb",
+    "lib/rbbcode/tree_maker.rb",
+    "pkg/rbbcode-0.1.8.gem",
+    "rbbcode.gemspec",
+    "spec/html_maker_spec.rb",
+    "spec/node_spec_helper.rb",
+    "spec/parser_spec.rb",
+    "spec/schema_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/tree_maker_spec.rb"
+  ]
+  s.homepage = %q{http://github.com/jarrett/rbbcode}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Ruby BB Code parser}
+  s.test_files = [
+    "spec/html_maker_spec.rb",
+    "spec/node_spec_helper.rb",
+    "spec/parser_spec.rb",
+    "spec/schema_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/tree_maker_spec.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<sanitize-url>, [">= 0.1.3"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_development_dependency(%q<bluecloth>, [">= 0"])
+      s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+    else
+      s.add_dependency(%q<sanitize-url>, [">= 0.1.3"])
+      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_dependency(%q<bluecloth>, [">= 0"])
+      s.add_dependency(%q<yard>, ["~> 0.6.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    end
+  else
+    s.add_dependency(%q<sanitize-url>, [">= 0.1.3"])
+    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+    s.add_dependency(%q<bluecloth>, [">= 0"])
+    s.add_dependency(%q<yard>, ["~> 0.6.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+  end
+end
+

data/spec/html_maker_spec.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require File.expand_path(File.dirname(__FILE__) + '/node_spec_helper')
 

data/spec/node_spec_helper.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module RbbCode
 	class RootNode
 		def == (other_node)

data/spec/parser_spec.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 $KCODE = 'u'
 
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
@@ -8,110 +9,155 @@ describe RbbCode::Parser do
 			@parser = RbbCode::Parser.new
 		end
 		
-		it 'should create paragraphs and line breaks' do
-			bb_code = "This is one paragraph.\n\nThis is another paragraph."
-			@parser.parse(bb_code).should == '<p>This is one paragraph.</p><p>This is another paragraph.</p>'
-			bb_code = "This is one line.\nThis is another line."
-			@parser.parse(bb_code).should == '<p>This is one line.<br/>This is another line.</p>'
-		end
-		
-		it 'should turn [b] to <strong>' do
-			@parser.parse('This is [b]bold[/b] text').should == '<p>This is <strong>bold</strong> text</p>'
-		end
-		
-		it 'should turn [i] to <em> by default' do
-			@parser.parse('This is [i]italic[/i] text').should == '<p>This is <em>italic</em> text</p>'
-		end
-		
-		it 'should turn [u] to <u>' do
-			@parser.parse('This is [u]underlined[/u] text').should == '<p>This is <u>underlined</u> text</p>'
-		end
-		
-		it 'should turn [url]http://google.com[/url] to a link' do
-			@parser.parse('Visit [url]http://google.com[/url] now').should == '<p>Visit <a href="http://google.com">http://google.com</a> now</p>'
-		end
-		
-		it 'should turn [url=http://google.com]Google[/url] to a link' do
-			@parser.parse('Visit [url=http://google.com]Google[/url] now').should == '<p>Visit <a href="http://google.com">Google</a> now</p>'
-		end
-		
-		it 'should turn [img] to <img>' do
-			@parser.parse('[img]http://example.com/image.jpg[/img]').should == '<p><img src="http://example.com/image.jpg" alt=""/></p>'
-		end
-		
-		it 'should parse nested tags' do
-			@parser.parse('[b][i]This is bold-italic[/i][/b]').should == '<p><strong><em>This is bold-italic</em></strong></p>'
-		end
-		
-		it 'should not put <p> tags around <ul> tags' do
-			@parser.parse("Text.\n\n[list]\n[*]Foo[/*]\n[*]Bar[/*]\n[/list]\n\nMore text.").should == '<p>Text.</p><ul><li>Foo</li><li>Bar</li></ul><p>More text.</p>'
-		end
-		
-		it 'should ignore forbidden or unrecognized tags' do
-			@parser.parse('There is [foo]no such thing[/foo] as a foo tag').should == '<p>There is no such thing as a foo tag</p>'
-		end
+        it 'should create paragraphs and line breaks' do
+          bb_code = "This is one paragraph.\n\nThis is another paragraph."
+          @parser.parse(bb_code).should == '<p>This is one paragraph.</p><p>This is another paragraph.</p>'
+          bb_code = "This is one line.\nThis is another line."
+          @parser.parse(bb_code).should == '<p>This is one line.<br/>This is another line.</p>'
+        end
+        
+        it 'should turn [b] to <strong>' do
+          @parser.parse('This is [b]bold[/b] text').should == '<p>This is <strong>bold</strong> text</p>'
+        end
+        
+        it 'should turn [i] to <em> by default' do
+          @parser.parse('This is [i]italic[/i] text').should == '<p>This is <em>italic</em> text</p>'
+        end
+        
+        it 'should turn [u] to <u>' do
+          @parser.parse('This is [u]underlined[/u] text').should == '<p>This is <u>underlined</u> text</p>'
+        end
+        
+        it 'should turn [url]http://google.com[/url] to a link' do
+          @parser.parse('Visit [url]http://google.com[/url] now').should == '<p>Visit <a href="http://google.com">http://google.com</a> now</p>'
+        end
+        
+        it 'should turn [url=http://google.com]Google[/url] to a link' do
+          @parser.parse('Visit [url=http://google.com]Google[/url] now').should == '<p>Visit <a href="http://google.com">Google</a> now</p>'
+        end
+        
+        it 'should turn [img] to <img>' do
+          @parser.parse('[img]http://example.com/image.jpg[/img]').should == '<p><img src="http://example.com/image.jpg" alt=""/></p>'
+        end
+        
+        it 'should parse nested tags' do
+          @parser.parse('[b][i]This is bold-italic[/i][/b]').should == '<p><strong><em>This is bold-italic</em></strong></p>'
+        end
+        
+        it 'should not put <p> tags around <ul> tags' do
+          @parser.parse("Text.\n\n[list]\n[*]Foo[/*]\n[*]Bar[/*]\n[/list]\n\nMore text.").should == '<p>Text.</p><ul><li>Foo</li><li>Bar</li></ul><p>More text.</p>'
+        end
+        
+        it 'should ignore forbidden or unrecognized tags' do
+          @parser.parse('There is [foo]no such thing[/foo] as a foo tag').should == '<p>There is no such thing as a foo tag</p>'
+        end
+        
+        it 'should recover gracefully from malformed or improperly matched tags' do
+          @parser.parse('This [i/]tag[/i] is malformed').should == '<p>This [i/]tag is malformed</p>'
+          @parser.parse('This [i]]tag[/i] is malformed').should == '<p>This <em>]tag</em> is malformed</p>'
+          @parser.parse('This [i]tag[[/i] is malformed').should == '<p>This <em>tag[</em> is malformed</p>'
+          @parser.parse('This [i]tag[//i] is malformed').should == '<p>This <em>tag[//i] is malformed</em></p>'
+          @parser.parse('This [[i]tag[/i] is malformed').should == '<p>This [<em>tag</em> is malformed</p>'
+          @parser.parse('This [i]tag[/i]] is malformed').should == '<p>This <em>tag</em>] is malformed</p>'
+          @parser.parse('This [i]i tag[i] is not properly matched').should == '<p>This <em>i tag is not properly matched</em></p>'
+          @parser.parse('This i tag[/i] is not properly matched').should == '<p>This i tag is not properly matched</p>'
+        end
+        
+        it 'should escape < and >' do
+          @parser.parse('This is [i]italic[/i], but this it not <i>italic</i>.').should == '<p>This is <em>italic</em>, but this it not &lt;i&gt;italic&lt;/i&gt;.</p>'
+        end
+        
+        it 'should work when the string begins with a tag' do
+          @parser.parse('[b]This is bold[/b]').should == '<p><strong>This is bold</strong></p>'
+        end
+        
+        it 'should handle UTF8' do
+          @parser.parse("Here's some UTF-8: [i]א[/i]. And here's some ASCII text.").should == "<p>Here's some UTF-8: <em>א</em>. And here's some ASCII text.</p>"
+        end
+        
+        # Bugs reported and fixed:
+        
+        it 'should not leave an open <em> tag when parsing "foo [i][/i] bar"' do
+          # Thanks to Vizakenjack for finding this. It creates an empty <em> tag. Browsers don't like this, so we need to replace it.
+          @parser.parse('foo [i][/i] bar').should match(/<p>foo +bar<\/p>/)
+        end
+        
+        it 'should not raise when parsing "Are you a real phan yet?\r\n\r\n[ ] Yes\r\n[X] No"' do
+          # Thanks to sblackstone for finding this.
+          @parser.parse("Are you a real phan yet?\r\n\r\n[ ] Yes\r\n[X] No")
+        end
+        
+        it 'should support images inside links' do
+          # Thanks to Vizakenjack for finding this.
+          @parser.parse('[url=http://www.google.com][img]http://www.123.com/123.png[/img][/url]').should ==
+            '<p><a href="http://www.google.com"><img src="http://www.123.com/123.png" alt=""/></a></p>'
+        end
+        
+        it 'can parse phpBB-style [*] tags' do
+          # Thanks to motiv for finding this
+          @parser.parse("[list]\n[*]one\n[*]two\n[/list]"
+          ).should == '<ul><li>one</li><li>two</li></ul>'
+        end
+        
+        context 'parsing [code] tags' do
+          # Thanks to fatalerrorx for finding these
+          it 'wraps the <code> tags in <pre> tags' do
+            @parser.parse('The [code]some code[/code] should be preformatted').should == '<p>The <pre><code>some code</code></pre> should be preformatted</p>'
+          end
+          
+          it 'leaves line breaks inside untouched' do
+            @parser.parse("Two lines of code:\n\n[code]line 1\n\nline 2[/code]\n\nAnd some more text.").should ==
+              "<p>Two lines of code:</p><p><pre><code>line 1\n\nline 2</code></pre></p><p>And some more text.</p>"
+          end
+          
+          it 'treats tags other than the closing tag as literals' do
+            @parser.parse('[code]This is [b]bold[/b] text[/code]').should == '<p><pre><code>This is [b]bold[/b] text</code></pre></p>'
+          end
+        end
+    
+    # Leave tag support
+    
+    it 'should parse allowed leaf tags' do
+      schema = RbbCode::Schema.new
+      schema.allow_tag(:br)
+      html_maker = CustomHtmlMaker.new
+      @parser = RbbCode::Parser.new(:schema => schema, :html_maker => html_maker)
+      
+      @parser.parse('This text should contain a [:br] HTML tag').should == '<p>This text should contain a <br /> HTML tag</p>'
+    end
+    
+        # Bug from original version
+        it 'should not parse multiple not closing tags' do
+          schema = RbbCode::Schema.new
+          schema.allow_tag(:Qsmiley)
+          html_maker = CustomHtmlMaker.new
+          @parser = RbbCode::Parser.new(:schema => schema, :html_maker => html_maker)
+          
+          @parser.parse('Two smileys: 1) [Qsmiley] and 2) [Qsmiley]').should_not == '<p>Two smileys: 1) <smiley /> and 2) <smiley /></p>'
+        end
+        
+        it 'should parse multiple allowed leaf tags' do
+          schema = RbbCode::Schema.new
+          schema.allow_tag(:br)
+          html_maker = CustomHtmlMaker.new
+          @parser = RbbCode::Parser.new(:schema => schema, :html_maker => html_maker)
+          
+          @parser.parse('This text should contain a [:br] HTML tag and another one [:br]').should == '<p>This text should contain a <br /> HTML tag and another one <br /></p>'
+        end
+        
+        it 'should parse unknown leaf tags as text' do
+          @parser.parse('This text should contain a [:pseudo] BBCode tag').should == '<p>This text should contain a [:pseudo] BBCode tag</p>'
+        end
+    
+    # Bugs
+    
+    it 'should omit empty quotes' do
+      @parser.parse("[quote][/quote]").should == ""
+    end
+    
+    it 'should parse empty codes' do
+      @parser.parse("[code][/code]").should == "<p><pre><code></code></pre></p>"
+    end
 		
-		it 'should recover gracefully from malformed or improperly matched tags' do
-			@parser.parse('This [i/]tag[/i] is malformed').should == '<p>This [i/]tag is malformed</p>'
-			@parser.parse('This [i]]tag[/i] is malformed').should == '<p>This <em>]tag</em> is malformed</p>'
-			@parser.parse('This [i]tag[[/i] is malformed').should == '<p>This <em>tag[</em> is malformed</p>'
-			@parser.parse('This [i]tag[//i] is malformed').should == '<p>This <em>tag[//i] is malformed</em></p>'
-			@parser.parse('This [[i]tag[/i] is malformed').should == '<p>This [<em>tag</em> is malformed</p>'
-			@parser.parse('This [i]tag[/i]] is malformed').should == '<p>This <em>tag</em>] is malformed</p>'
-			@parser.parse('This [i]i tag[i] is not properly matched').should == '<p>This <em>i tag is not properly matched</em></p>'
-			@parser.parse('This i tag[/i] is not properly matched').should == '<p>This i tag is not properly matched</p>'
-		end
-		
-		it 'should escape < and >' do
-			@parser.parse('This is [i]italic[/i], but this it not <i>italic</i>.').should == '<p>This is <em>italic</em>, but this it not &lt;i&gt;italic&lt;/i&gt;.</p>'
-		end
-		
-		it 'should work when the string begins with a tag' do
-			@parser.parse('[b]This is bold[/b]').should == '<p><strong>This is bold</strong></p>'
-		end
-		
-		it 'should handle UTF8' do
-			@parser.parse("Here's some UTF-8: [i]א[/i]. And here's some ASCII text.").should == "<p>Here's some UTF-8: <em>א</em>. And here's some ASCII text.</p>"
-		end
-		
-		# Bugs reported and fixed:
-		
-		it 'should not leave an open <em> tag when parsing "foo [i][/i] bar"' do
-			# Thanks to Vizakenjack for finding this. It creates an empty <em> tag. Browsers don't like this, so we need to replace it.
-			@parser.parse('foo [i][/i] bar').should match(/<p>foo +bar<\/p>/)
-		end
-		
-		it 'should not raise when parsing "Are you a real phan yet?\r\n\r\n[ ] Yes\r\n[X] No"' do
-			# Thanks to sblackstone for finding this.
-			@parser.parse("Are you a real phan yet?\r\n\r\n[ ] Yes\r\n[X] No")
-		end
-		
-		it 'should support images inside links' do
-			# Thanks to Vizakenjack for finding this.
-			@parser.parse('[url=http://www.google.com][img]http://www.123.com/123.png[/img][/url]').should ==
-				'<p><a href="http://www.google.com"><img src="http://www.123.com/123.png" alt=""/></a></p>'
-		end
-		
-		it 'can parse phpBB-style [*] tags' do
-			# Thanks to motiv for finding this
-			@parser.parse("[list]\n[*]one\n[*]two\n[/list]"
-			).should == '<ul><li>one</li><li>two</li></ul>'
-		end
-		
-		context 'parsing [code] tags' do
-			# Thanks to fatalerrorx for finding these
-			it 'wraps the <code> tags in <pre> tags' do
-				@parser.parse('The [code]some code[/code] should be preformatted').should == '<p>The <pre><code>some code</code></pre> should be preformatted</p>'
-			end
-			
-			it 'leaves line breaks inside untouched' do
-				@parser.parse("Two lines of code:\n\n[code]line 1\n\nline 2[/code]\n\nAnd some more text.").should ==
-					"<p>Two lines of code:</p><p><pre><code>line 1\n\nline 2</code></pre></p><p>And some more text.</p>"
-			end
-			
-			it 'treats tags other than the closing tag as literals' do
-				@parser.parse('[code]This is [b]bold[/b] text[/code]').should == '<p><pre><code>This is [b]bold[/b] text</code></pre></p>'
-			end
-		end
 	end
-end
+end

data/spec/schema_spec.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe RbbCode::Schema do

data/spec/spec_helper.rb

@@ -1,9 +1,17 @@
 require 'rubygems'
 require 'test/unit'
-require 'spec'
+require 'rspec'
 
-#def puts(foo)
-#	raise 'puts called'
-#end
+require File.expand_path(File.dirname(__FILE__) + '/../lib/rbbcode')
 
-require File.expand_path(File.dirname(__FILE__) + '/../lib/rbbcode')
+class CustomHtmlMaker < RbbCode::HtmlMaker
+  
+  def html_from_br_tag(node)
+    '<br />'
+  end
+  
+  def html_from_Qsmiley_tag(node)
+    '<smiley />'
+  end
+  
+end

data/spec/tree_maker_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require File.expand_path(File.dirname(__FILE__) + '/node_spec_helper')
 require 'pp'
@@ -119,4 +120,4 @@ describe RbbCode::TreeMaker do
 			end
 		end
 	end
-end
+end

metadata

@@ -1,92 +1,178 @@
 --- !ruby/object:Gem::Specification 
 name: rbbcode
 version: !ruby/object:Gem::Version 
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 11
+  version: 0.1.11
 platform: ruby
 authors: 
 - Jarrett Colby
+- aq1018@gmail.com
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-03-20 00:00:00 -05:00
+date: 2011-02-19 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: sanitize-url
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
+        - 0
         - 1
         - 3
-        - 0
-        version: 1.3.0
+        version: 0.1.3
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  name: rspec
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 3
+        - 0
+        version: 2.3.0
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: sanitize-url
+  type: :development
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: bluecloth
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: yard
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        - 0
+        version: 0.6.0
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: bundler
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
+        - 1
+        - 0
         - 0
+        version: 1.0.0
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: jeweler
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
         - 1
-        - 3
-        version: 0.1.3
-  type: :runtime
-  version_requirements: *id002
+        - 5
+        - 2
+        version: 1.5.2
+  requirement: *id006
 description: RbbCode is a customizable Ruby library for parsing BB Code. RbbCode validates and cleans input. It supports customizable schemas so you can set rules about what tags are allowed where. The default rules are designed to ensure valid HTML output.
-email: jarrett@jarrettcolby.com
+email: jarrett@jarrettcolby.com, aq1018@gmail.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
+- LICENSE.txt
 - README.markdown
 files: 
+- .document
+- Gemfile
+- LICENSE.txt
+- README.markdown
+- Rakefile
+- VERSION
 - lib/rbbcode.rb
 - lib/rbbcode/html_maker.rb
 - lib/rbbcode/parser.rb
 - lib/rbbcode/schema.rb
 - lib/rbbcode/tree_maker.rb
-- README.markdown
+- pkg/rbbcode-0.1.8.gem
+- rbbcode.gemspec
+- spec/html_maker_spec.rb
+- spec/node_spec_helper.rb
+- spec/parser_spec.rb
+- spec/schema_spec.rb
+- spec/spec_helper.rb
+- spec/tree_maker_spec.rb
 has_rdoc: true
 homepage: http://github.com/jarrett/rbbcode
-licenses: []
-
+licenses: 
+- MIT
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby BB Code parser