ubbparser 0.0.6 → 0.0.7

data/lib/ubbparser.rb

@@ -30,14 +30,14 @@ module UBBParser
   # Attributes are given to the render methods as a hash.
 	def self.attrib_str_to_hash(attrib_str)
 		result = {:original_attrib_str => attrib_str.gsub(/^=/, "")}
-		
+
 		attrib_str.insert(0, "default") if (attrib_str[0] == "=")
 		attrib_str.scan(/((\S*)=(\"[^\"]*\"|\'[^\']*\'|\S*))/) { | all, key, val |
 			result[(key.gsub(/-/, "_").to_sym rescue key)] = val.gsub(/^[\"\']/, "").gsub(/[\"\']$/, "")
 		}
 		return result
 	end
-	
+
   # Converts a hash into a string with key-values. You can use one of the following options:
   # [:allowed_keys]   An array of keys that are only allowed
   # [:denied_keys]    An array of keys that are denied
@@ -61,25 +61,25 @@ module UBBParser
   def self.parse(text, parse_options = {})
   	result = ""
   	scnr = StringScanner.new(text)
-  	parse_options.each { | k, v | v.to_s.gsub(/-/, "_").gsub(/[^\w]+/, "") if (k.to_s.start_with?("class_")); v } 
+  	parse_options.each { | k, v | v.to_s.gsub(/-/, "_").gsub(/[^\w]+/, "") if (k.to_s.start_with?("class_")); v }
 		while (!scnr.eos?)
 			untagged_text = CGI.escapeHTML(scnr.scan(/[^\[]*/))
-			
+
 			# convert newlines to breaks
 			untagged_text.gsub!(/\n/, "<br />") if (!parse_options.include?(:convert_newlines) || parse_options[:convert_newlines])
-			
+
 			# check for untagged url's
 			uri_pattern = /(((http|https|ftp)\:\/\/)|(www))[a-zA-Z0-9\-\.]+\.[a-zA-Z]{2,4}(:[a-zA-Z0-9]*)?\/?([a-zA-Z0-9\-\._\?\,\'\/\\\+&amp;%\$#\=~])*[^\.\,\)\(\s]*/
 			untagged_text.gsub!(uri_pattern) { | url, | render_url(url, {}, parse_options) }
-			
+
 			# check for untagged emails
 			email_pattern = /(([a-zA-Z0-9_\-\.\+]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?))/
 			untagged_text.gsub!(email_pattern) { | email, | render_email(email, {}, parse_options) }
-			
+
 			result << untagged_text
-							
+
 			# check for the upcoming ubb tag and process it (if valid tag)
-			if (scnr.match?(/\[/)) 
+			if (scnr.match?(/\[/))
 				scnr.skip(/\[/)
 				code = scnr.scan(/[\w-]*/)
 				method_name = ("render_" + code.to_s.gsub(/-/, "_")).to_sym
@@ -102,27 +102,27 @@ module UBBParser
 		end
 		return result
   end
-  
+
 	# Returns true if the given value matches the given regular expression.
   # :category: Validation methods
   def self.matches_regexp?(value, regexp)
     return !value.to_s.match(regexp).nil?
   end
-  
+
 	# Returns true if the given value is a valid email address
   # :category: Validation methods
   def self.is_email?(value)
     return false if !value.is_a?(String)
     return self.matches_regexp?(value, /^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9_][-a-z0-9_]*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z][a-z])|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?$/i)
   end
-  
+
 	# Returns true if the given value is a valid url
   # :category: Validation methods
   def self.is_url?(value)
     return self.matches_regexp?(value, /^(http|https)\:\/\/([a-zA-Z0-9\.\-]+(\:[a-zA-Z0-9\.&amp;%\$\-]+)*@)*((25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9])\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[0-9])|localhost|([a-zA-Z0-9\-]+\.)*[a-zA-Z0-9\-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(\:[0-9]+)*(\/($|[a-zA-Z0-9\.\,\?\'\\\+&amp;%\$#\=~_\-]+))*$/)
   end
-  
-  
+
+
 
 	# Converts the [anchor=myname]...[/anchor] tag into <a name='myname'>...</a>. Use the :class_anchor parse option to define html classes.
   # :category: Render methods
@@ -131,7 +131,7 @@ module UBBParser
 		name.inner_text.gsub!(/\\|'/) { |c| "\\#{c}" }
   	"<a name='#{name}' class='#{parse_options[:class_anchor].to_s.strip}'>#{self.parse(inner_text, parse_options)}</a>"
 	end
-	
+
 	# Converts the url in the inner_text into a webplayer, playing the audio file.
   # :category: Render methods
 	def self.render_audio(inner_text, attributes = {}, parse_options = {})
@@ -143,13 +143,13 @@ module UBBParser
 	def self.render_b(inner_text, attributes = {}, parse_options = {})
   	"<strong>#{self.parse(inner_text, parse_options)}</strong>"
 	end
-	
+
   # Converts [br] into a <br />.
   # :category: Render methods
 	def self.render_br(inner_text, attributes = {}, parse_options = {})
   	"<br />#{self.parse(inner_text, parse_options)}"
 	end
-	
+
 	# Converts all lines in the inner_text as a bullet list. Each line represents one list item. Empty lines are ignored. Use the :class_bullet parse option to define html classes.
   # :category: Render methods
 	def self.render_bullets(inner_text, attributes = {}, parse_options = {})
@@ -158,37 +158,37 @@ module UBBParser
 		items.map! { | item | "<li>" + self.parse(item, parse_options) + "</li>" }
 		return (items.empty?) ? "" : "<ul class='#{parse_options[:class_bullets].to_s.strip}'>" + items.join("") + "</ul>"
 	end
-	
+
 	# Centers the inner_text.
   # :category: Render methods
 	def self.render_center(inner_text, attributes = {}, parse_options = {})
   	"<div style='text-align: center'>#{self.parse(inner_text, parse_options)}</div>"
 	end
-	
-	# Assures the inner_text is rendered below floating elements. 
+
+	# Assures the inner_text is rendered below floating elements.
   # :category: Render methods
 	def self.render_clear(inner_text, attributes = {}, parse_options = {})
   	"<div style='clear: both'></div>"
 	end
-	
+
 	# Changes the font color of the inner_text
   # :category: Render methods
 	def self.render_color(inner_text, attributes = {}, parse_options = {})
   	"<div style='color:#{attributes[:default]}'>#{self.parse(inner_text, parse_options)}</div>"
 	end
-	
+
 	#	Ignores all the inner_text
   # :category: Render methods
 	def self.render_comment(inner_text, attributes = {}, parse_options = {})
 		""
 	end
-	
+
 	# Places the inner_text in a fixed font type. Also adds the classes prettify and linenums for styling purposes. Use the :class_code parse option to define html classes.
   # :category: Render methods
 	def self.render_code(inner_text, attributes = {}, parse_options = {})
 		"<pre class='#{parse_options[:class_code].to_s.strip}'>#{inner_text}</pre>"
 	end
-	
+
 	# Renders csv-data into a html table. You can use the following attributes:
 	# [:has_header]  The first row should be rendered as header cells (using th).
   # :category: Render methods
@@ -216,7 +216,7 @@ module UBBParser
 		end
 		return result
 	end
-	
+
 	# Renders an email address. There are two options to define:
 	#    [email]info@osingasoftware.nl[/email]
 	#    [email=info@osingasoftware.nl]Osinga Software[/email]
@@ -226,7 +226,7 @@ module UBBParser
   	email = (attributes[:default] || inner_text)
   	if (!self.is_email?(email))
   	  parse_options[:class_email] = parse_options[:class_email].to_s + " ubbparser-error"
-    	result = "<span class='#{parse_options[:class_email].to_s.strip}'>UBB error: invalid email address #{email}</span>" 
+    	result = "<span class='#{parse_options[:class_email].to_s.strip}'>UBB error: invalid email address #{email}</span>"
     elsif ((parse_options.has_key?(:protect_email) && !parse_options[:protect_email]) || (attributes[:protected] == "false"))
     	result = "<a href='mailto:#{email}' class='#{parse_options[:class_email].to_s.strip}'>#{inner_text}</a>"
     else
@@ -240,45 +240,45 @@ module UBBParser
     end
   	return result
 	end
-	
+
 	# Renders the inner_text in the specified list. The list should contain CSS style font-families, i.e.:
 	#   [font=Arial, Helvetica, Sans]...[/font]
   # :category: Render methods
 	def self.render_font(inner_text, attributes = {}, parse_options = {})
-		font = attributes[:original_attrib_str].gsub!(/\\|'/) { |c| "\\#{c}" }		
+		font = attributes[:original_attrib_str].gsub!(/\\|'/) { |c| "\\#{c}" }
 		"<span style='font-family: #{font}'>#{self.parse(inner_text, parse_options)}</span>"
 	end
 
-  # Renders the inner_text in a H1 heading.	
+  # Renders the inner_text in a H1 heading.
   # :category: Render methods
 	def self.render_h1(inner_text, attributes = {}, parse_options = {})
 		"<h1>#{self.parse(inner_text, parse_options)}</h1>"
 	end
-	
-  # Renders the inner_text in a H2 heading.	
+
+  # Renders the inner_text in a H2 heading.
   # :category: Render methods
 	def self.render_h2(inner_text, attributes = {}, parse_options = {})
 		"<h2>#{self.parse(inner_text, parse_options)}</h2>"
 	end
-	
+
   # Renders the inner_text in a H3 heading.
   # :category: Render methods
 	def self.render_h3(inner_text, attributes = {}, parse_options = {})
 		"<h3>#{self.parse(inner_text, parse_options)}</h3>"
 	end
-	
+
   # Renders a horizontal ruler.
   # :category: Render methods
 	def self.render_hr(inner_text, attributes = {}, parse_options = {})
 		"<hr />#{self.parse(inner_text, parse_options)}"
 	end
-	
+
   # Renders the inner_text in italic.
   # :category: Render methods
 	def self.render_i(inner_text, attributes = {}, parse_options = {})
   	"<em>#{self.parse(inner_text, parse_options)}</em>"
 	end
-	
+
   # Renders an iframe. Use the inner_text as source. Use the :class_iframe parse option to define html classes.
   # :category: Render methods
 	def self.render_iframe(inner_text, attributes = {}, parse_options = {})
@@ -290,13 +290,13 @@ module UBBParser
   	attrib_str = self.hash_to_attrib_str(attributes, :allowed_keys => [:src, :class, :frameborder, :marginwidth, :marginheight, :width, :height])
   	return "<iframe #{attrib_str}></iframe>"
 	end
-	
+
 	# Doesn't render the ubb code in the inner_text. It does strip all html-tags from the inner_text
   # :category: Render methods
 	def self.render_ignore(inner_text, attributes = {}, parse_options = {})
 		inner_text
 	end
-	
+
 	# Renders an image. Use the :class_img parse option to define html classes.
   # :category: Render methods
 	def self.render_img(inner_text, attributes = {}, parse_options = {})
@@ -308,7 +308,7 @@ module UBBParser
 		attrib_str = self.hash_to_attrib_str(attributes, :allowed_keys => [:src, :alt, :styles, :class])
 		return "<img #{attrib_str} />"
 	end
-	
+
 	# Renders an image, floated on the left side of the text frame. Use the :class_img_left parse option to define html classes.
   # :category: Render methods
 	def self.render_img_left(inner_text, attributes = {}, parse_options = {})
@@ -317,7 +317,7 @@ module UBBParser
 	  attributes[:skip_class] = true
 		render_img(inner_text, attributes, parse_options)
 	end
-	
+
 	# Renders an image, floated on the right side of the text frame. Use the :class_img_right parse option to define html classes.
   # :category: Render methods
 	def self.render_img_right(inner_text, attributes = {}, parse_options = {})
@@ -326,13 +326,13 @@ module UBBParser
 	  attributes[:skip_class] = true
 		render_img(inner_text, attributes, parse_options)
 	end
-	
+
 	# Renders the inner_text with a justified text alignment.
   # :category: Render methods
 	def self.render_justify(inner_text, attributes = {}, parse_options = {})
 		"<div style='text-align: justify'>#{self.parse(inner_text, parse_options)}</div>"
 	end
-	
+
 	# Renders the inner_text with a left text alignment.
   # :category: Render methods
 	def self.render_left(inner_text, attributes = {}, parse_options = {})
@@ -347,19 +347,19 @@ module UBBParser
 		items.map! { | item | "<li>" + self.parse(item, parse_options) + "</li>" }
 		return (items.empty?) ? "" : "<ul class='#{parse_options[:class_list].to_s.strip}'>" + items.join("") + "</ol>"
 	end
-	
+
 	# Renders the inner_text as a paragraph. Use the :class_p parse option to define html classes.
   # :category: Render methods
 	def self.render_p(inner_text, attributes = {}, parse_options = {})
 		"<p class='#{parse_options[:class_p].to_s.strip}'>#{self.parse(inner_text, parse_options)}</p>"
 	end
-	
+
 	# Renders the inner_text with a right text alignment.
   # :category: Render methods
 	def self.render_right(inner_text, attributes = {}, parse_options = {})
 		"<div style='text-align: right'>#{self.parse(inner_text, parse_options)}</div>"
 	end
-	
+
 	# Renders the inner_text in a <div> block with inline CSS styles, i.e.:
 	#    [style color: red; border: 1px solid green]...[/style]
   # :category: Render methods
@@ -367,7 +367,7 @@ module UBBParser
 		styles = attributes[:original_attrib_str].gsub(/'/, "\'")
 		"<div style='#{styles}'>#{self.parse(inner_text, parse_options)}</div>"
 	end
-	
+
 	# Converts the [table] to a <table>. Always use this in combination with [tr] and [td] or [th]. Use the :class_table parse option to define html classes.
   # :category: Render methods
 	def self.render_table(inner_text, attributes = {}, parse_options = {})
@@ -383,7 +383,7 @@ module UBBParser
 	# Converts the [th] to a <th>. Always use this in combination with [table] and [tr].
   # :category: Render methods
 	def self.render_th(inner_text, attributes = {}, parse_options = {})
-	 
+
 		"<th>#{self.parse(inner_text, parse_options)}</th>"
 	end
 
@@ -398,7 +398,7 @@ module UBBParser
 	def self.render_u(inner_text, attributes = {}, parse_options = {})
   	"<u>#{self.parse(inner_text, parse_options)}</u>"
 	end
-	
+
 	# Renders a web addres. There are two options to define:
 	#   [url]www.osingasoftware.nl[/ur]
 	#   [url=www.osingasoftware.nl]Osinga Software[/url]
@@ -410,7 +410,7 @@ module UBBParser
   	url.gsub!(/\\|'/) { |c| "\\#{c}" }
   	return "<a href='#{url}' class='#{parse_options[:class_url].to_s.strip}'>#{inner_text}</a>"
 	end
-	
+
   # Renders a YouTube video using the video id or url in the inner_text.
   # :category: Render methods
 	def self.render_vimeo(inner_text, attributes = {}, parse_options = {})
@@ -419,10 +419,10 @@ module UBBParser
 		attributes[:class] = parse_options[:class_vimeo]
 	  attributes[:skip_class] = true
 		videoid = (inner_text.scan(/[0-9]{5,}/).to_a)[0].to_s
-		src = "http://player.vimeo.com/video/#{videoid}"		
+		src = "http://player.vimeo.com/video/#{videoid}"
 		return render_iframe(src, attributes, parse_options)
 	end
-	
+
   # Renders a YouTube video using the video id or url in the inner_text.
   # :category: Render methods
 	def self.render_youtube(inner_text, attributes = {}, parse_options = {})
@@ -434,14 +434,14 @@ module UBBParser
 		src = "http://www.youtube.com/embed/#{videoid}"
 		return render_iframe(src, attributes, parse_options)
 	end
-	
+
   # Renders a Youtube, Vimeo or Zideo video using the video id or url in the inner_text.
   # It automatically determines which video renderer should be used based on the given url.
   # :category: Render methods
 	def self.render_video(inner_text, attributes = {}, parse_options = {})
-		attributes[:class] += " " + parse_options[:class_zideo]
+		attributes[:class] = "#{attributes[:class]} #{parse_options[:class_zideo]}"
 		url = inner_text
-		if (!url.match(/zideo\.nl/).nil?)
+		if !url.match(/zideo\.nl/).nil?
 			return self.render_zideo(inner_text, attributes, parse_options)
 		elsif (!url.match(/[0-9]{5,}/).nil?) || (!url.match(/vimeo/).nil?)
 			return self.render_vimeo(inner_text, attributes, parse_options)
@@ -462,6 +462,6 @@ module UBBParser
 		videoid = !inner_text.match(/^\w+$/).nil? ? inner_text : (inner_text.scan(/playzideo\/(\w+)/).to_a)[1].to_s
 		src = "http://www.zideo.nl/zideomediaplayer.php?" + inner_text
 		return render_iframe(src, attributes, parse_options)
-	end    
-  
+	end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ubbparser
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-16 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies: []
 description: A simple and flexibel ubb parser.
 email: info@osingasoftware.nl
@@ -38,7 +38,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: UBB Parser