rbbcode 0.1.6 → 0.1.7

data/lib/rbbcode/html_maker.rb

@@ -19,12 +19,12 @@ module RbbCode
 		
 		def make_html(node)
 			output = ''
-			case node.class.to_s
-			when 'RbbCode::RootNode'
+			case node
+			when RbbCode::RootNode
 				node.children.each do |child|
 					output << make_html(child)
 				end
-			when 'RbbCode::TagNode'
+			when RbbCode::TagNode
 				custom_tag_method = "html_from_#{node.tag_name}_tag"
 				if respond_to?(custom_tag_method)
 					output << send(custom_tag_method, node)
@@ -33,9 +33,14 @@ module RbbCode
 					node.children.each do |child|
 						inner_html << make_html(child)
 					end
-					output << content_tag(map_tag_name(node.tag_name), inner_html)
+					to_append = content_tag(map_tag_name(node.tag_name), inner_html)
+					if node.preformatted?
+						to_append = content_tag('pre', to_append)
+					end
+					output << to_append
+					#puts output
 				end
-			when 'RbbCode::TextNode'
+			when RbbCode::TextNode
 				output << node.text
 			else
 				raise "Don't know how to make HTML from #{node.class}"

data/lib/rbbcode/schema.rb

@@ -50,6 +50,16 @@ module RbbCode
 			@name = name
 		end
 		
+		def is_not_preformatted
+			@schema.unmark_as_preformatted(@name)
+			self
+		end
+		
+		def is_preformatted
+			@schema.mark_as_preformatted(@name)
+			self
+		end
+		
 		def may_be_nested
 			@schema.allow_descent(@name, @name)
 			self
@@ -154,6 +164,7 @@ module RbbCode
 			@required_parents = {}
 			@no_text = []
 			@twin_closers = []
+			@preformatted = []
 		end
 		
 		def close_twins(tag_name)
@@ -199,6 +210,7 @@ module RbbCode
 			@never_empty = []
 			@no_text = []
 			@twin_closers = []
+			@preformatted = []
 			use_defaults
 		end
 		
@@ -206,10 +218,18 @@ module RbbCode
 			'br'
 		end
 		
+		def mark_as_preformatted(tag_name)
+			@preformatted << tag_name.to_s unless @preformatted.include?(tag_name.to_s)
+		end
+		
 		def paragraph_tag_name
 			'p'
 		end
 		
+		def preformatted?(tag_name)
+			@preformatted.include?(tag_name.to_s)
+		end
+		
 		def require_parents(parents, child) #:nodoc:
 			@required_parents[child.to_s] = parents.collect { |p| p.to_s }
 			parents.each do |parent|
@@ -254,6 +274,10 @@ module RbbCode
 			return true
 		end
 
+		def unmark_as_preformatted(tag_name)
+			@preformatted.delete(tag_name.to_s)
+		end
+
 		def unrequire_parent(parent, child)
 			@required_parents.delete(child.to_s)
 		end
@@ -270,6 +294,7 @@ module RbbCode
 			tag('url').may_not_be_nested
 			tag('img').may_not_be_nested
 			tag('code').may_not_be_nested
+			tag('code').is_preformatted
 			tag('p').may_not_be_nested
 			tag('*').must_be_child_of('list')
 			tag('*').closes_twins

data/lib/rbbcode/tree_maker.rb

@@ -70,6 +70,7 @@ module RbbCode
 			super(parent)
 			@tag_name = tag_name
 			@value = value
+			@preformatted = false
 		end
 		
 		def inner_bb_code
@@ -78,6 +79,14 @@ module RbbCode
 			end
 		end
 		
+		def preformat!
+			@preformatted = true
+		end
+		
+		def preformatted?
+			@preformatted
+		end
+		
 		def to_bb_code
 			if @value.nil?
 				output = "[#{@tag_name}]"
@@ -262,7 +271,7 @@ module RbbCode
 					case char
 					when '['
 						current_parent << TextNode.new(current_parent, '[')
-						# No need to reset current_token or current_token_type
+						# No need to reset current_token or current_token_type, because now we're in a new possible tag
 					when '/'
 						current_token_type = :closing_tag
 						current_token << '/'
@@ -302,7 +311,12 @@ module RbbCode
 							current_parent << tag_node
 							current_parent = tag_node
 						end # else, don't do anything--the tag is invalid and will be ignored
-						current_token_type = :unknown
+						if @schema.preformatted?(current_parent.tag_name)
+							current_token_type = :preformatted
+							current_parent.preformat!
+						else
+							current_token_type = :unknown
+						end
 						current_token = ''
 					elsif char == "\r" or char == "\n"
 						current_parent << TextNode.new(current_parent, current_token)
@@ -339,6 +353,27 @@ module RbbCode
 						current_token_type = :text
 						current_token << char
 					end					
+				when :preformatted
+					if char == '['
+						current_parent << TextNode.new(current_parent, current_token)
+						current_token_type = :possible_preformatted_end
+						current_token = '['
+					else
+						current_token << char
+					end
+				when :possible_preformatted_end
+					current_token << char
+					if current_token == "[/#{current_parent.tag_name}]" # Did we just see the closing tag for this preformatted element?
+						current_parent = current_parent.parent
+						current_token_type = :unknown
+						current_token = ''
+					elsif char == ']' # We're at the end of this opening/closing tag, and it's not the closing tag for the preformatted element
+						current_parent << TextNode.new(current_parent, current_token)
+						current_token_type = :preformatted
+						current_token = ''
+					end
+				else
+					raise "Unknown token type in state machine: #{current_token_type}"
 				end
 			end
 			# Handle whatever's left in the current token

data/spec/html_maker_spec.rb

@@ -76,5 +76,15 @@ describe RbbCode::HtmlMaker do
 				end
 			end
 		end
-	end
+		
+		it 'wraps preformatted tags in <pre>' do
+			expect_html('<p><pre><code>Some code</code></pre></p>') do
+				tag('p') do
+					tag('code', nil, true) do
+						text 'Some code'
+					end
+				end
+			end
+		end
+	end	
 end

data/spec/node_spec_helper.rb

@@ -78,8 +78,9 @@ class NodeBuilder
 		self << TextNode.new(@current_parent, contents)
 	end
 	
-	def tag(tag_name, value = nil, &block)
+	def tag(tag_name, value = nil, preformatted = false, &block)
 		tag_node = TagNode.new(@current_parent, tag_name, value)
+		tag_node.preformat! if preformatted
 		self << tag_node
 		original_parent = @current_parent
 		@current_parent = tag_node

data/spec/parser_spec.rb

@@ -39,10 +39,6 @@ describe RbbCode::Parser do
 			@parser.parse('[img]http://example.com/image.jpg[/img]').should == '<p><img src="http://example.com/image.jpg" alt=""/></p>'
 		end
 		
-		it 'should turn [code] to <code>' do
-			@parser.parse('Too bad [code]method_missing[/code] is rarely useful').should == '<p>Too bad <code>method_missing</code> is rarely useful</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
@@ -101,5 +97,21 @@ describe RbbCode::Parser do
 			@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

data/spec/spec_helper.rb

@@ -2,8 +2,8 @@ require 'rubygems'
 require 'test/unit'
 require 'spec'
 
-def puts(foo)
-	raise 'puts called'
-end
+#def puts(foo)
+#	raise 'puts called'
+#end
 
 require File.expand_path(File.dirname(__FILE__) + '/../lib/rbbcode')

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Jarrett Colby
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-07 00:00:00 -06:00
+date: 2010-03-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency