trainbbcode 1.1.0 → 1.2.0

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    TrainBBCode (1.0.1)
+    TrainBBCode (1.1.0)
       coderay
 
 GEM
   remote: http://rubygems.org/
   specs:
-    coderay (0.9.6)
+    coderay (0.9.7)
     diff-lcs (1.1.2)
     rspec (2.3.0)
       rspec-core (~> 2.3.0)
@@ -23,5 +23,4 @@ PLATFORMS
 
 DEPENDENCIES
   TrainBBCode!
-  coderay
   rspec

data/README.rdoc

@@ -1,24 +1,18 @@
 = Train BBCode
 
+{Homepage}[http://trainbbcode.arcath.net/]
+
 Rails Gem for BBCode
 
 == Install
 
-=== As a Gem
-
-    gem install trainbbcode
-
-For rails you will need to add:
-
-    config.gem "trainbbcode"
+Add:
 
-to config/enviroments.rb and then install the gem using:
+    gem "trainbbcode"
 
-    rake gems:install
-    
-=== As a Plugin
+to your Gemfile and then install the gem using:
 
-    script/plugin install git://github.com/Arcath/TrainBBCode
+    bundle install
 
 == Usage
 

data/lib/trainbbcode.rb

@@ -4,6 +4,7 @@ require 'trainbbcode/configure.rb'
 require 'trainbbcode/string.rb'
 require 'trainbbcode/css.rb'
 require 'trainbbcode/swear_filter.rb'
+require 'trainbbcode/coderay'
 require 'rubygems'
 require 'coderay'
 
@@ -37,18 +38,6 @@ 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(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

data/lib/trainbbcode/application_helper.rb

@@ -4,4 +4,4 @@ module TBBCHelper
 		bbc.conf(config) if config
 		bbc.css
 	end
-end
+end

data/lib/trainbbcode/coderay.rb

@@ -0,0 +1,27 @@
+class TBBC
+    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], :css => :class) + "[/nobbc]"
+			input=input.gsub("[code lang=#{lang}]#{splits[1]}[/code]",parsed)
+		end
+		coderay_styled(input)
+	end
+	
+	def coderay_styled(input)
+	    output = input.gsub(/class="CodeRay"/,"style=\"background-color: #232323; border: 1px solid black; font-family: 'Courier New', 'Terminal', monospace; color: #E6E0DB; padding: 3px 5px; overflow: auto; font-size: 12px; margin: 12px 0;\"")
+		output = output.gsub(/<pre>/,"<pre style=\"margin: 0px; padding: 0px;\">")
+		output = output.gsub(/class="an"/,"style=\"#{@config[:syntax_highlighting_html]}\"").gsub(/class="c"/,"style=\"#{@config[:syntax_highlighting_comment]}\"")
+		output = output.gsub(/class="ch"/,"style=\"#{@config[:syntax_highlighting_escaped]}\"").gsub(/class="cl"/,"style=\"#{@config[:syntax_highlighting_class]}\"")
+		output = output.gsub(/class="co"/,"style=\"#{@config[:syntax_highlighting_constant]}\"").gsub(/class="fl"/,"style=\"#{@config[:syntax_highlighting_float]}\"")
+		output = output.gsub(/class="fu"/,"style=\"#{@config[:syntax_highlighting_function]}\"").gsub(/class="gv"/,"style=\"#{@config[:syntax_highlighting_global]}\"")
+		output = output.gsub(/class="i"/,"style=\"#{@config[:syntax_highlighting_integer]}\"").gsub(/class="il"/,"style=\"#{@config[:syntax_highlighting_inline]}\"")
+		output = output.gsub(/class="iv"/,"style=\"#{@config[:syntax_highlighting_instance]}\"").gsub(/class="pp"/,"style=\"#{@config[:syntax_highlighting_doctype]}\"")
+		output = output.gsub(/class="r"/,"style=\"#{@config[:syntax_highlighting_keyword]}\"").gsub(/class="rx"/,"style=\"#{@config[:syntax_highlighting_regex]}\"")
+		output = output.gsub(/class="s"/,"style=\"#{@config[:syntax_highlighting_string]}\"").gsub(/class="sy"/,"style=\"#{@config[:syntax_highlighting_symbol]}\"")
+		output = output.gsub(/class="ta"/,"style=\"#{@config[:syntax_highlighting_html]}\"").gsub(/class="pc"/,"style=\"#{@config[:syntax_highlighting_boolean]}\"")
+    end
+end

data/lib/trainbbcode/configure.rb

@@ -20,31 +20,31 @@ class TBBC
 	#
 	# Is non-overiding so any config set by the user in thier own file remains.
 	def load_config_from_defaults
-		@config[:configed_by]			||= "user"
-		@config[:image_alt]			||= "Posted Image" 
-		@config[:url_target]			||= "_BLANK"
-		@config[:allow_defaults]		||= true
-		@config[:table_width]			||= "100%"
-		@config[:syntax_highlighting]		||= true
-		@config[:syntax_highlighting_html]	||= "color:#E7BE69"
-		@config[:syntax_highlighting_comment]	||= "color:#BC9358; font-style: italic;"
-		@config[:syntax_highlighting_escaped]	||= "color:#509E4F"
-		@config[:syntax_highlighting_class]	||= "color:#FFF"
-		@config[:syntax_highlighting_constant]	||= "color:#FFF"
-		@config[:syntax_highlighting_float]	||= "color:#A4C260"
-		@config[:syntax_highlighting_function]	||= "color:#FFC56D"
-		@config[:syntax_highlighting_global]	||= "color:#D0CFFE"
-		@config[:syntax_highlighting_integer]	||= "color:#A4C260"
-		@config[:syntax_highlighting_inline]	||= "background:#151515"
-		@config[:syntax_highlighting_instance]	||= "color:#D0CFFE"
-		@config[:syntax_highlighting_doctype]	||= "color:#E7BE69"
-		@config[:syntax_highlighting_keyword]	||= "color:#CB7832"
-		@config[:syntax_highlighting_regex]	||= "color:#A4C260"
-		@config[:syntax_highlighting_string]	||= "color:#A4C260"
-		@config[:syntax_highlighting_symbol]	||= "color:#6C9CBD"
-		@config[:syntax_highlighting_html]	||= "color:#E7BE69"
-		@config[:syntax_highlighting_boolean]	||= "color:#6C9CBD"
-		@config[:syntax_highlighting_line_numbers]||= :inline
-		@config[:swear_words]			||= []
+		@config[:configed_by]			            ||= "user"
+		@config[:image_alt]			                ||= "Posted Image" 
+		@config[:url_target]			            ||= "_BLANK"
+		@config[:allow_defaults]		            ||= true
+		@config[:table_width]			            ||= "100%"
+		@config[:syntax_highlighting]		        ||= true
+		@config[:syntax_highlighting_html]	        ||= "color:#E7BE69"
+		@config[:syntax_highlighting_comment]	    ||= "color:#BC9358; font-style: italic;"
+		@config[:syntax_highlighting_escaped]	    ||= "color:#509E4F"
+		@config[:syntax_highlighting_class]	        ||= "color:#FFF"
+		@config[:syntax_highlighting_constant]	    ||= "color:#FFF"
+		@config[:syntax_highlighting_float]	        ||= "color:#A4C260"
+		@config[:syntax_highlighting_function]	    ||= "color:#FFC56D"
+		@config[:syntax_highlighting_global]	    ||= "color:#D0CFFE"
+		@config[:syntax_highlighting_integer]	    ||= "color:#A4C260"
+		@config[:syntax_highlighting_inline]	    ||= "background:#151515"
+		@config[:syntax_highlighting_instance]	    ||= "color:#D0CFFE"
+		@config[:syntax_highlighting_doctype]	    ||= "color:#E7BE69"
+		@config[:syntax_highlighting_keyword]	    ||= "color:#CB7832"
+		@config[:syntax_highlighting_regex]	        ||= "color:#A4C260"
+		@config[:syntax_highlighting_string]	    ||= "color:#A4C260"
+		@config[:syntax_highlighting_symbol]	    ||= "color:#6C9CBD"
+		@config[:syntax_highlighting_html]	        ||= "color:#E7BE69"
+		@config[:syntax_highlighting_boolean]	    ||= "color:#6C9CBD"
+		@config[:syntax_highlighting_line_numbers]  ||= :inline
+		@config[:swear_words]			            ||= []
 	end
 end

data/lib/trainbbcode/css.rb

@@ -2,46 +2,7 @@ class TBBC
 	
 	# Returns the css required for coderay
 	def css(config = nil)
-		conf config
-		output="		<style type=\"text/css\">
-			.CodeRay {
-				background-color: #232323;
-				border: 1px solid black;
-				font-family: 'Courier New', 'Terminal', monospace;
-				color: #E6E0DB;
-				padding: 3px 5px;
-				overflow: auto;
-				font-size: 12px;
-				margin: 12px 0;
-			}
-			.CodeRay pre {
-				margin: 0px;
-				padding: 0px;
-			}
-
-			.CodeRay .an { #{@config[:syntax_highlighting_html]} }		/* html attribute */
-			.CodeRay .c  { #{@config[:syntax_highlighting_comment]} }	/* comment */
-			.CodeRay .ch { #{@config[:syntax_highlighting_escaped]} }	/* escaped character */
-			.CodeRay .cl { #{@config[:syntax_highlighting_class]} }		/* class */
-			.CodeRay .co { #{@config[:syntax_highlighting_constant]} }	/* constant */
-			.CodeRay .fl { #{@config[:syntax_highlighting_float]} }		/* float */
-			.CodeRay .fu { #{@config[:syntax_highlighting_function]} }	/* function */
-			.CodeRay .gv { #{@config[:syntax_highlighting_global]} }	/* global variable */
-			.CodeRay .i  { #{@config[:syntax_highlighting_integer]} }	/* integer */
-			.CodeRay .il { #{@config[:syntax_highlighting_inline]} }	/* inline code */
-			.CodeRay .iv { #{@config[:syntax_highlighting_instance]} }	/* instance variable */
-			.CodeRay .pp { #{@config[:syntax_highlighting_doctype]} }	/* doctype */
-			.CodeRay .r  { #{@config[:syntax_highlighting_keyword]} }	/* keyword */
-			.CodeRay .rx { #{@config[:syntax_highlighting_regex]} }		/* regex */
-			.CodeRay .s  { #{@config[:syntax_highlighting_string]} }	/* string */
-			.CodeRay .sy { #{@config[:syntax_highlighting_symbol]} }	/* symbol */
-			.CodeRay .ta { #{@config[:syntax_highlighting_html]} }		/* html tag */
-			.CodeRay .pc { #{@config[:syntax_highlighting_boolean]} }	/* boolean */
-		</style>" 
-		if needs_html_safe? then
-			return output.html_safe
-		else
-			return output
-		end
+        warn "[DEPRECATION] `css` is no longer used, styles are applied inline."
+        ""
 	end
 end

data/lib/trainbbcode/tags.rb

@@ -1,26 +1,30 @@
 class TBBC
-	Tags =  [[/\[b\](.*?)\[\/b\]/,'<strong>\1</strong>',:strong_enabled],
-		[/\[i\](.*?)\[\/i\]/,'<i>\1</i>',:italic_enabled],
-		[/\[u\](.*?)\[\/u\]/,'<u>\1</u>',:underline_enabled],
-		[/\[url\](.*?)\[\/url\]/,'<a href="\1" target="@config[:url_target]">\1</a>',:url_enabled],
-		[/\[url=(.*?)\](.*?)\[\/url\]/,'<a href="\1" target="@config[:url_target]">\2</a>',:url_enabled],
-		[/\[url=(.*?) target=(.*?)\](.*?)\[\/url\]/,'<a href="\1" target="\2">\3</a>',:url_enabled],
-		[/\[img\](.*?)\[\/img\]/,'<img src="\1" alt="@config[:image_alt]" />',:image_enabled],
-		[/\[img alt=(.*?)\](.*?)\[\/img\]/,'<img src="\2" alt="\1" />',:image_enabled],
-		[/\[ul\](.*?)\[\/ul\]/,'<ul>\1</ul>',:list_enabled],
-		[/\[ol\](.*?)\[\/ol\]/,'<ol>\1</ol>',:list_enabled],
-		[/\[li\](.*?)\[\/li\]/,'<li>\1</li>',:list_enabled],
-		[/\[quote\](.*?)\[\/quote\]/,'<blockquote>\1</blockquote>',:quote_enabled],
-		[/\[quote=(.*?)\](.*?)\[\/quote\]/,'<blockquote><i>Posted by <b>\1</b></i><br />\2</blockquote>',:quote_enabled],
-		[/\[color=(.*?)\](.*?)\[\/color\]/,'<span style="color:\1;">\2</span>',:color_enabled],
-		[/\[center\](.*?)\[\/center\]/,'<div style="text-align:center">\1</div>',:alignment_enabled],
-		[/\[left\](.*?)\[\/left\]/,'<div style="text-align:left">\1</div>',:alignment_enabled],
-		[/\[right\](.*?)\[\/right\]/,'<div style="text-align:right">\1</div>',:alignment_enabled],
-		[/\[acronym=(.*?)\](.*?)\[\/acronym\]/,'<acronym title="\1">\2</acronym>',:acronym_enabled],
-		[/\[table\](.*?)\[\/table\]/,'<table width="@config[:table_width]">\1</table>',:table_enabled],
-		[/\[tr\](.*?)\[\/tr\]/,'<tr>\1</tr>',:table_enabled],
-		[/\[td\](.*?)\[\/td\]/,'<td>\1</td>',:table_enabled],
-		[/\[th\](.*?)\[\/th\]/,'<th>\1</th>',:table_enabled]]
+	Tags =  [[/\[b\](.*?)\[\/b\]/,'<strong>\1</strong>',:strong_enabled,"[b]BOLD[/b]","<strong>BOLD</strong>"],
+		[/\[i\](.*?)\[\/i\]/,'<i>\1</i>',:italic_enabled,"[i]italics[/i]","<i>italics</i>"],
+		[/\[u\](.*?)\[\/u\]/,'<u>\1</u>',:underline_enabled,"[u]underline[/u]","<u>underline</u>"],
+		[/\[url\](.*?)\[\/url\]/,'<a href="\1" target="@config[:url_target]">\1</a>',:url_enabled,"[url]http://www.example.com[/url]","<a href=\"http://www.example.com\" target=\"_BLANK\">http://www.example.com</a>"],
+		[/\[url=(.*?)\](.*?)\[\/url\]/,'<a href="\1" target="@config[:url_target]">\2</a>',:url_enabled,"[url=http://www.example.com]Example[/url]","<a href=\"http://www.example.com\" target=\"_BLANK\">Example</a>"],
+		[/\[url=(.*?) target=(.*?)\](.*?)\[\/url\]/,'<a href="\1" target="\2">\3</a>',:url_enabled,"[url=http://www.example.com]Example[/url]","<a href=\"http://www.example.com\" target=\"_BLANK\">Example</a>"],
+ 		[/\[img\](.*?)\[\/img\]/,'<img src="\1" alt="@config[:image_alt]" />',:image_enabled,"[img]test.jpg[/img]","<img src=\"test.jpg\" alt=\"Posted Image\" />"],
+		[/\[img alt=(.*?)\](.*?)\[\/img\]/,'<img src="\2" alt="\1" />',:image_enabled,"[img alt=Posted Image]test.jpg[/img]","<img src=\"test.jpg\" alt=\"Posted Image\" />"],
+		[/\[ul\](.*?)\[\/ul\]/,'<ul>\1</ul>',:list_enabled,"[ul]list[/ul]","<ul>list</ul>"],
+		[/\[ol\](.*?)\[\/ol\]/,'<ol>\1</ol>',:list_enabled,"[ol]list[/ol]","<ol>list</ol>"],
+		[/\[li\](.*?)\[\/li\]/,'<li>\1</li>',:list_enabled,"[li]list[/li]","<li>list</li>"],
+		[/\[quote\](.*?)\[\/quote\]/,'<blockquote>\1</blockquote>',:quote_enabled,"[quote]quote[/quote]","<blockquote>quote</blockquote>"],
+		[/\[quote=(.*?)\](.*?)\[\/quote\]/,'<blockquote><i>Posted by <b>\1</b></i><br />\2</blockquote>',:quote_enabled,"[quote=user]quote[/quote]","<blockquote><i>Posted by <b>user</b></i><br />quote</blockquote>"],
+		[/\[color=(.*?)\](.*?)\[\/color\]/,'<span style="color:\1;">\2</span>',:color_enabled,"[color=red]red text[/color]","<span style=\"color:red;\">red text</span>"],
+		[/\[center\](.*?)\[\/center\]/,'<div style="text-align:center">\1</div>',:alignment_enabled,"[center]centered text[/center]","<div style=\"text-align:center\">centered text</div>"],
+		[/\[left\](.*?)\[\/left\]/,'<div style="text-align:left">\1</div>',:alignment_enabled,"[left]left text[/left]","<div style=\"text-align:left\">left text</div>"],
+		[/\[right\](.*?)\[\/right\]/,'<div style="text-align:right">\1</div>',:alignment_enabled,"[right]right text[/right]","<div style=\"text-align:right\">right text</div>"],
+		[/\[acronym=(.*?)\](.*?)\[\/acronym\]/,'<acronym title="\1">\2</acronym>',:acronym_enabled,"[acronym=this]that[/acronym]","<acronym title=\"this\">that</acronym>"],
+		[/\[table\](.*?)\[\/table\]/,'<table width="@config[:table_width]">\1</table>',:table_enabled,"[table]...[/table]","<table width=\"100%\">...</table>"],
+		[/\[tr\](.*?)\[\/tr\]/,'<tr>\1</tr>',:table_enabled,"[tr]...[/tr]","<tr>...</tr>"],
+		[/\[td\](.*?)\[\/td\]/,'<td>\1</td>',:table_enabled,"[td]...[/td]","<td>...</td>"],
+		[/\[th\](.*?)\[\/th\]/,'<th>\1</th>',:table_enabled,"[th]...[/th]","<th>...</th>"],
+		[/\[h1\](.*?)\[\/h1\]/,'<h1>\1</h1>',:header_enabled,'[h1]heading[/h1]',"<h1>heading</h1>"],
+		[/\[h2\](.*?)\[\/h2\]/,'<h2>\1</h2>',:header_enabled,'[h2]heading[/h2]',"<h2>heading</h2>"],
+		[/\[h3\](.*?)\[\/h3\]/,'<h3>\1</h3>',:header_enabled,'[h3]heading[/h3]',"<h3>heading</h3>"],
+		[/\[h4\](.*?)\[\/h4\]/,'<h4>\1</h4>',:header_enabled,'[h4]heading[/h4]',"<h4>heading</h4>"]]
 	
 	private
 	

data/lib/trainbbcode/version.rb

@@ -1,3 +1,3 @@
 class TBBC
-	VERSION = "1.1.0"
+	VERSION = "1.2.0"
 end

data/spec/trainbbcode_spec.rb

@@ -5,9 +5,11 @@ def upcaser(input)
 end
 
 describe TBBC, "#parse" do
-	it "Should return <strong>BOLD</strong> for [b]BOLD[/b]" do
-		TBBC.new.parse("[b]BOLD[/b]").should == "<strong>BOLD</strong>"
-	end
+	TBBC::Tags.each do |tag|
+	   it "Should return #{tag[4]} for #{tag[3]}" do
+	       tag[3].tbbc.should == tag[4]
+       end
+    end
 end
 
 describe String, "#tbbc" do
@@ -33,5 +35,5 @@ describe String, "#tbbc" do
 
 	it "Should allow for 2 identical callbacks per string" do
 		"[up]HeLlo WorLd[/up] and [up]Bye bYe WorLd[/up]".tbbc(:custom_tags => [[/\[up\](.*?)\[\/up\]/,"Callback: upcaser",true]]).should == "HELLO WORLD and BYE BYE WORLD"
-	end 
+	end
 end

data/trainbbcode.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
 	s.platform = Gem::Platform::RUBY
 	s.authors = ["Adam \"Arcath\" Laycock"]
 	s.email = ["gems@arcath.net"]
-	s.homepage = "http://www.arcath.net"
+	s.homepage = "http://trainbbcode.arcath.net"
 	s.summary = "Provides BBCode for Ruby."
 	
 	s.add_development_dependency "rspec"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: trainbbcode
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Adam "Arcath" Laycock
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-21 00:00:00 +00:00
+date: 2011-05-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,6 +64,7 @@ files:
 - init.rb
 - lib/trainbbcode.rb
 - lib/trainbbcode/application_helper.rb
+- lib/trainbbcode/coderay.rb
 - lib/trainbbcode/configure.rb
 - lib/trainbbcode/css.rb
 - lib/trainbbcode/parse.rb
@@ -74,7 +75,7 @@ files:
 - spec/trainbbcode_spec.rb
 - trainbbcode.gemspec
 has_rdoc: true
-homepage: http://www.arcath.net
+homepage: http://trainbbcode.arcath.net
 licenses: []
 
 post_install_message: 
@@ -103,9 +104,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Provides BBCode for Ruby.
-test_files: []
-
+test_files: 
+- spec/trainbbcode_spec.rb