trainbbcode 0.3.4 → 0.3.5

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('trainbbcode','0.3.4') do |p|
+Echoe.new('trainbbcode','0.3.5') do |p|
 	p.description	= "Provides BBCode for Ruby."
 	p.url		= "http://www.arcath.net/pages/2"
 	p.author	= "Adam \"Arcath\" Laycock"

data/lib/trainbbcode.rb

@@ -156,11 +156,13 @@ class TBBC
 		s=s.gsub(/<br \/><\/(ul|li|table|tr|td|th)/,'</\1')
 	end
 	def coderay(s)	
+		s=s.gsub("\r","")
 		scan=s.scan(/\[code lang=(.+?)\](.+?)\[\/code\]/m)
 		scan.each do |a|
 			parse=a[1].gsub("&lt;","<").gsub("&gt;",">")
 			lang=a[0]
-			s=s.gsub(/\[code lang=.+?\]#{a[1]}\[\/code\]/m,"[nobbc]" + CodeRay.scan(parse, lang).div(:css => :class, :line_numbers => @config[:syntax_highlighting_line_numbers]) + "[/nobbc]")
+			parsed="[nobbc]" + CodeRay.scan(parse, lang).div(:css => :class, :line_numbers => @config[:syntax_highlighting_line_numbers]) + "[/nobbc]"
+			s=s.gsub("[code lang=#{a[0]}]#{a[1]}[/code]",parsed)
 		end
 		s
 	end

data/trainbbcode.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{trainbbcode}
-  s.version = "0.3.4"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adam \"Arcath\" Laycock"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: trainbbcode
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors: 
 - Adam "Arcath" Laycock