trainbbcode.rb in trainbbcode-1.2.0

- old
+ new

@@ -2,10 +2,11 @@
 require 'trainbbcode/tags.rb'
 require 'trainbbcode/configure.rb'
 require 'trainbbcode/string.rb'
 require 'trainbbcode/css.rb'
 require 'trainbbcode/swear_filter.rb'
+require 'trainbbcode/coderay'
 require 'rubygems'
 require 'coderay'
 
 #Helper Method
 if defined? Rails
@@ -34,21 +35,9 @@
 	
 	def correctbrs(s)
 		#Corrects the extra brs
 		s=s.gsub(/<br \/><(ul|li|table|tr|td|th)/,'<\1')
 		s=s.gsub(/<br \/><\/(ul|li|table|tr|td|th)/,'</\1')
-	end
-	
-	def coderay(input)	
-		input=input.gsub("\r","")
-		scan=input.scan(/\[code lang=(.+?)\](.+?)\[\/code\]/m)
-		scan.each do |splits|
-			parse=splits[1].gsub("&lt;","<").gsub("&gt;",">")
-			lang=splits[0]
-			parsed="[nobbc]" + CodeRay.scan(parse, lang).div(:line_numbers => @config[:syntax_highlighting_line_numbers]) + "[/nobbc]"
-			input=input.gsub("[code lang=#{lang}]#{splits[1]}[/code]",parsed)
-		end
-		input
 	end
 
 	def needs_html_safe?
 		if defined? Rails
 			return Rails.version =~ /^3\./