trainbbcode 1.0.1 → 1.1.0

data/.gitignore

@@ -0,0 +1,6 @@
+pkg/*
+Manifest
+*.gem
+*~
+tmp/*
+*.bundle

data/Gemfile

@@ -0,0 +1,5 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in lorem.gemspec
+gemspec
+

data/Gemfile.lock

@@ -0,0 +1,27 @@
+PATH
+  remote: .
+  specs:
+    TrainBBCode (1.0.1)
+      coderay
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    coderay (0.9.6)
+    diff-lcs (1.1.2)
+    rspec (2.3.0)
+      rspec-core (~> 2.3.0)
+      rspec-expectations (~> 2.3.0)
+      rspec-mocks (~> 2.3.0)
+    rspec-core (2.3.1)
+    rspec-expectations (2.3.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  TrainBBCode!
+  coderay
+  rspec

data/Rakefile

@@ -1,15 +1,2 @@
-require 'rubygems'
-require 'rake'
-require 'echoe'
-
-Echoe.new('trainbbcode','1.0.1') do |p|
-	p.description	= "Provides BBCode for Ruby."
-	p.url		= "http://www.arcath.net/"
-	p.author	= "Adam \"Arcath\" Laycock"
-	p.email		= "adam@arcath.net"
-	p.ignore_pattern= ["tmp/*", "scripts/*"]
-	p.development_dependencies	= []
-	p.runtime_dependencies	= ["coderay"]
-end
-
-Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| load ext }
+require 'bundler'
+Bundler::GemHelper.install_tasks

data/lib/trainbbcode.rb

@@ -8,7 +8,7 @@ require 'rubygems'
 require 'coderay'
 
 #Helper Method
-if defined? RAILS_ROOT then
+if defined? Rails
 	require 'trainbbcode/application_helper.rb'
 	ActionView::Base.send :include, TBBCHelper
 end
@@ -44,10 +44,17 @@ class TBBC
 		scan.each do |splits|
 			parse=splits[1].gsub("&lt;","<").gsub("&gt;",">")
 			lang=splits[0]
-			parsed="[nobbc]" + CodeRay.scan(parse, lang).div(:css => :class, :line_numbers => @config[:syntax_highlighting_line_numbers]) + "[/nobbc]"
+			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\./
+		else
+			return false
+		end
+	end
 end

data/lib/trainbbcode/css.rb

@@ -1,5 +1,6 @@
 class TBBC
-
+	
+	# Returns the css required for coderay
 	def css(config = nil)
 		conf config
 		output="		<style type=\"text/css\">
@@ -37,6 +38,10 @@ class TBBC
 			.CodeRay .ta { #{@config[:syntax_highlighting_html]} }		/* html tag */
 			.CodeRay .pc { #{@config[:syntax_highlighting_boolean]} }	/* boolean */
 		</style>" 
-		return output
+		if needs_html_safe? then
+			return output.html_safe
+		else
+			return output
+		end
 	end
 end

data/lib/trainbbcode/parse.rb

@@ -32,6 +32,10 @@ class TBBC
 			end	
 		end
 		input=correctbrs input
-		return input
+		if needs_html_safe? then
+			return input.html_safe
+		else
+			return input
+		end
 	end
 end

data/lib/trainbbcode/tags.rb

@@ -28,7 +28,12 @@ class TBBC
 	def runtag(s,tag)
 		check = tag[2]
 		check = @config[tag[2]] if is_symbol? tag[2]
-		s=s.gsub(tag[0],replace_config_values(tag[1])) unless check == false
+		if tag[1] =~ /^Callback:/
+			s = run_callback(s, tag[0], tag[1])
+		else
+			pattern = tag[1]
+			s=s.gsub(tag[0],replace_config_values(pattern)) unless check == false
+		end
 		s
 	end
 	
@@ -44,4 +49,21 @@ class TBBC
 			return s
 		end
 	end
+
+	def run_callback(string, regex, callback)
+		code = callback.gsub(/^Callback: /, '')
+		output = string
+		string.scan(regex).each do |arguments|
+			arguments_pass = build_pass_string(arguments)
+			replace = eval "#{code}#{arguments_pass}"
+			output = output.sub(regex, replace)
+		end
+		output
+	end
+
+	def build_pass_string(args)
+		output = "("
+		args.map { |arg| output = "#{output}\"#{arg}\", " }
+		output.gsub(/, $/,')')
+	end
 end

data/lib/trainbbcode/version.rb

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

data/spec/trainbbcode_spec.rb

@@ -1,5 +1,9 @@
 require 'lib/trainbbcode.rb'
 
+def upcaser(input)
+	input.upcase
+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>"
@@ -18,4 +22,16 @@ describe String, "#tbbc" do
 	it "Should allow custom tags to run and return <strong><i>BOLD italics</i></strong> for [bi]BOLD italics[/bi]" do
 		"[bi]BOLD italics[/bi]".tbbc(:custom_tags => [[/\[bi\](.*?)\[\/bi\]/,'<strong><i>\1</i></strong>',true]]).should == "<strong><i>BOLD italics</i></strong>"
 	end
+
+	it "Should allow custom tags to pass to callbacks" do
+		"[up]HeLlo WorLd[/up]".tbbc(:custom_tags => [[/\[up\](.*?)\[\/up\]/,"Callback: upcaser",true]]).should == "HELLO WORLD"
+	end
+
+	it "Should not fail when a callback is defined but not used" do
+		"[dw]HeLlo WorLd[/dw]".tbbc(:custom_tags => [[/\[up\](.*?)\[\/up\]/,"Callback: upcaser",true]]).should == "[dw]HeLlo WorLd[/dw]"
+	end
+
+	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

data/trainbbcode.gemspec

@@ -1,33 +1,21 @@
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "trainbbcode/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{trainbbcode}
-  s.version = "1.0.1"
-
-  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-10-06}
-  s.description = %q{Provides BBCode for Ruby.}
-  s.email = %q{adam@arcath.net}
-  s.extra_rdoc_files = ["README.rdoc", "lib/trainbbcode.rb", "lib/trainbbcode/application_helper.rb", "lib/trainbbcode/configure.rb", "lib/trainbbcode/css.rb", "lib/trainbbcode/parse.rb", "lib/trainbbcode/string.rb", "lib/trainbbcode/swear_filter.rb", "lib/trainbbcode/tags.rb"]
-  s.files = ["README.rdoc", "Rakefile", "init.rb", "lib/trainbbcode.rb", "lib/trainbbcode/application_helper.rb", "lib/trainbbcode/configure.rb", "lib/trainbbcode/css.rb", "lib/trainbbcode/parse.rb", "lib/trainbbcode/string.rb", "lib/trainbbcode/swear_filter.rb", "lib/trainbbcode/tags.rb", "spec/trainbbcode_spec.rb", "trainbbcode.gemspec", "Manifest"]
-  s.homepage = %q{http://www.arcath.net/}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Trainbbcode", "--main", "README.rdoc"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{trainbbcode}
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Provides BBCode for Ruby.}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<coderay>, [">= 0"])
-    else
-      s.add_dependency(%q<coderay>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<coderay>, [">= 0"])
-  end
+	s.name = "trainbbcode"
+	s.version = TBBC::VERSION
+	s.platform = Gem::Platform::RUBY
+	s.authors = ["Adam \"Arcath\" Laycock"]
+	s.email = ["gems@arcath.net"]
+	s.homepage = "http://www.arcath.net"
+	s.summary = "Provides BBCode for Ruby."
+	
+	s.add_development_dependency "rspec"
+	s.add_dependency "coderay"
+	
+	s.files         = `git ls-files`.split("\n")
+	s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+	s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+	s.require_paths = ["lib"]
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: trainbbcode
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  hash: 19
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Adam "Arcath" Laycock
@@ -9,36 +15,50 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-06 00:00:00 +01:00
+date: 2010-12-21 00:00:00 +00:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: coderay
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
-description: Provides BBCode for Ruby.
-email: adam@arcath.net
+  type: :runtime
+  version_requirements: *id002
+description: 
+email: 
+- gems@arcath.net
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.rdoc
-- lib/trainbbcode.rb
-- lib/trainbbcode/application_helper.rb
-- lib/trainbbcode/configure.rb
-- lib/trainbbcode/css.rb
-- lib/trainbbcode/parse.rb
-- lib/trainbbcode/string.rb
-- lib/trainbbcode/swear_filter.rb
-- lib/trainbbcode/tags.rb
+extra_rdoc_files: []
+
 files: 
+- .gitignore
+- Gemfile
+- Gemfile.lock
 - README.rdoc
 - Rakefile
 - init.rb
@@ -50,39 +70,40 @@ files:
 - lib/trainbbcode/string.rb
 - lib/trainbbcode/swear_filter.rb
 - lib/trainbbcode/tags.rb
+- lib/trainbbcode/version.rb
 - spec/trainbbcode_spec.rb
 - trainbbcode.gemspec
-- Manifest
 has_rdoc: true
-homepage: http://www.arcath.net/
+homepage: http://www.arcath.net
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- Trainbbcode
-- --main
-- README.rdoc
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "1.2"
-  version: 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
-rubyforge_project: trainbbcode
-rubygems_version: 1.3.5
+rubyforge_project: 
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Provides BBCode for Ruby.

data/Manifest

@@ -1,14 +0,0 @@
-README.rdoc
-Rakefile
-init.rb
-lib/trainbbcode.rb
-lib/trainbbcode/application_helper.rb
-lib/trainbbcode/configure.rb
-lib/trainbbcode/css.rb
-lib/trainbbcode/parse.rb
-lib/trainbbcode/string.rb
-lib/trainbbcode/swear_filter.rb
-lib/trainbbcode/tags.rb
-spec/trainbbcode_spec.rb
-trainbbcode.gemspec
-Manifest