trainbbcode 0.3.1 → 0.3.2

data/Manifest

@@ -3,3 +3,4 @@ README.rdoc
 Rakefile
 init.rb
 lib/trainbbcode.rb
+trainbbcode.gemspec

data/README.rdoc

@@ -10,22 +10,11 @@ gem install trainbbcode
 
 For rails you will need to add:
 
-config.gem "trainbbcode"
-
-to config/enviroments.rb
-
-== Optional Requirements
-
-=== Ultraviolet
-
-If you want to use syntax highlighting you will need to install the "ultraviolet" gem
-
-Once you have the gem installed you will need to run:
-
-    uv -s ruby --copy-files css
-    gief css filez
+    config.gem "trainbbcode"
 
+to config/enviroments.rb and then install the gem using:
 
+    rake gems:install
 
 == Usage
 

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('trainbbcode','0.3.1') do |p|
+Echoe.new('trainbbcode','0.3.2') 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

@@ -30,6 +30,7 @@ class TBBC
 		config[:syntax_highlighting_symbol]	||= "color:#6C9CBD"
 		config[:syntax_highlighting_html]	||= "color:#E7BE69"
 		config[:syntax_highlighting_boolean]	||= "color:#6C9CBD"
+		config[:syntax_highlighting_line_numbers]||= :inline
 		#Instanize the config variable
 		@config=config
 	end
@@ -37,7 +38,7 @@ class TBBC
 		#Remove the < and > which will disable all HTML
 		s=s.gsub("<","&lt;").gsub(">","&gt;") unless @config[:disable_html] == false
 		#CodeRay
-		s=coderay(s)
+		s=coderay(s) unless @config[:syntax_highlighting] == false
 		#Convert new lines to <br />'s
 		s=s.gsub(/\n/,'<br />') unless @config[:newline_enabled] == false
 		#[nobbc] tags
@@ -154,12 +155,11 @@ class TBBC
 		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(s)
-		
-		s.gsub(/\[code( lang=(.+?))?\](.+?)\[\/code\]/m) do
-			parse=$3.gsub("&lt;","<").gsub("&gt;",">")
-			"[nobbc]" + CodeRay.scan(parse, $2).div(:css => :class) + "[/nobbc]"
-		end
+	def coderay(s)	
+		scan=s.scan(/\[code lang=(.+?)\](.+?)\[\/code\]/m)
+		parse=scan[0][1].gsub("&lt;","<").gsub("&gt;",">")
+		lang=scan[0][0]
+		"[nobbc]" + CodeRay.scan(parse, lang).div(:css => :class, :line_numbers => @config[:syntax_highlighting_line_numbers]) + "[/nobbc]"
 	end
 end
 

data/trainbbcode.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{trainbbcode}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adam \"Arcath\" Laycock"]
-  s.date = %q{2010-03-30}
+  s.date = %q{2010-03-31}
   s.description = %q{Provides BBCode for Ruby.}
   s.email = %q{adam@arcath.net}
   s.extra_rdoc_files = ["README.rdoc", "lib/trainbbcode.rb"]
-  s.files = ["README.rdoc", "Rakefile", "init.rb", "lib/trainbbcode.rb", "Manifest", "trainbbcode.gemspec"]
+  s.files = ["Manifest", "README.rdoc", "Rakefile", "init.rb", "lib/trainbbcode.rb", "trainbbcode.gemspec"]
   s.homepage = %q{http://www.arcath.net/pages/2}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Trainbbcode", "--main", "README.rdoc"]
   s.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: trainbbcode
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Adam "Arcath" Laycock
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-30 00:00:00 +01:00
+date: 2010-03-31 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,11 +32,11 @@ extra_rdoc_files:
 - README.rdoc
 - lib/trainbbcode.rb
 files: 
+- Manifest
 - README.rdoc
 - Rakefile
 - init.rb
 - lib/trainbbcode.rb
-- Manifest
 - trainbbcode.gemspec
 has_rdoc: true
 homepage: http://www.arcath.net/pages/2