ubbparser 0.1.3 → 0.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODA4MjgzN2VjNDlhMGE4OWIzOWE0MTJhMGJkNzRkNzgzZmM3OTIwOQ==
+    NjIzZDRkMzFhMTE1YzdjN2EzMzhhZjYwMzBkNDQzZWFjNGQ3OGU1Zg==
   data.tar.gz: !binary |-
-    NWFmZjJlMjFmMjZkMDA2NTljMGVlYjJmYjZkNGMzMmUyYWNkMWZjMA==
+    NmIyNzE0ZTA1NWZiNzliOTE2YWQ1ODQ3Zjk0ODI0OWIzZTRjM2Y2NQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NzI0OTZmMGEyZGIxNmE5Y2Y3ZTk0ZGQ2NjY1YTVhMTlkOGMzODhiYjNkNThj
-    ZTY0NjZhNWU5YjljNTc1MDhlOWY4Y2M2YmU4NWQ1NmQ2NGU4YjA2YTYxZmVl
-    YzlkOGI3ZTI3YWEwMzliYzE2OWJjNDg5NzExMDZkYmY1Zjg3OGM=
+    MjVjNWZlMDM1YTczMGE5ZWNmMGY2M2RiN2Y4ZTFlZDk0YjU3YTliMzZiNThk
+    ZjRhYTdkNzQyNzc2ZTgxNDE3YWYyMjg4M2JlZGQ2MzRkZDMyMmUyNjQyZWJk
+    MTZkYzY5NWQ1Y2Y1YzE2YzY2OTAyNDI5YWI1ZjYxNjIyZWIzNzU=
   data.tar.gz: !binary |-
-    NzFkZWU4OGI1OWFiZWNjMDZmMGUwODJmOWE2NDY1ODA1OWUxMGFmNDdlMGZm
-    YjVkMjE5ZGFjYmVlMzZjYjE1MjA0OGQyNzVkZTc2YjQyZDk2ODIxZTI1YWQx
-    NTdkMDA2Yzk5MmMzYjk1ZWUwYjRmNTlmYjgwYjRiM2U5ZDU2YmM=
+    ZjdmOTA2NzA5Y2MwM2MzNzk0MjJmMjI3Y2YzODJkN2I4Yjc3YmI4YTI3NTI3
+    YzY2NmNmZTI1MDM5NDRkNzMwZmI1Y2ZkZTk2MzQ2MmQ4ODZlMjUyYzRhOGU0
+    ZDhjMDJlYTRlODQ5OWE1MzNmNzE0NzVmZDc3ZGI3MTY4YTFlODM=

data/lib/ubbparser.rb

@@ -40,7 +40,7 @@ module UBBParser
 	# Converts a strings containing key-value-list into a hash. This function is mostly used by the parser itself.
 	# 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(/^=/, '')}
+		result = {:class_attrib_str => attrib_str.gsub(/^=/, '')}
 
 		attrib_str.insert(0, 'default') if (attrib_str[0] == '=')
 		attrib_str.scan(/((\S*)=("[^"]*"|'[^']*'|\S*))/) { |_, key, val|
@@ -108,6 +108,7 @@ module UBBParser
 					end
 					method_result = self.send(method_name, inner_text, attributes, parse_options).to_s
 					result << method_result
+					scnr.skip(/\n?/)
 				end
 			end
 		end
@@ -176,6 +177,13 @@ module UBBParser
 		"<div style='text-align: center'>#{self.parse(inner_text, parse_options)}</div>"
 	end
 
+	# Assures the inner_text is rendered below floating elements.
+	# :category: Render methods
+	def self.render_class(inner_text, attributes = {}, parse_options = {})
+		classes = attributes[:original_attrib_str].gsub(/'/, "\\'")
+		"<div class='#{classes}'>#{self.parse(inner_text, parse_options)}</div>"
+	end
+
 	# Assures the inner_text is rendered below floating elements.
 	# :category: Render methods
 	def self.render_clear(inner_text, attributes = {}, parse_options = {})
@@ -185,7 +193,8 @@ module UBBParser
 	# 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>"
+		color = attributes[:default].gsub(/'/, "\\'")
+		"<div style='color:#{color}'>#{self.parse(inner_text, parse_options)}</div>"
 	end
 
 	#	Ignores all the inner_text
@@ -240,71 +249,81 @@ module UBBParser
 	# By default the email address is protected against spoofing, using JavaScript. Use the email parse option to define html classes.
 	# :category: Render methods
 	def self.render_email(inner_text, attributes = {}, parse_options = {})
-		email = (attributes[:default] || inner_text)
-		css_class = parse_options[:class_email] || 'ubb-email'
-		if !self.is_email?(email)
-			result = "<span class='#{css_class} ubbparser-error'>UBB error: invalid email address #{email}</span>"
-		elsif parse_options.has_key?(:protect_email) && !parse_options[:protect_email]
-			result = "<a href='mailto:#{email}' class='#{css_class}'>#{inner_text}</a>"
-		else
-			username, domain = email.split('@', 2)
-			id = 'ubb-email-' + SecureRandom.hex(16)
-
-			# Some generic javascript so every browser can parse this (instantly), regardless of used framework
-			if inner_text == email
-				title = 'Protected email address'
-				js_title = 'email'
-			else
+		css_class = (parse_options[:class_email] || 'ubb-email').to_s.strip
+		inner_text = self.parse(inner_text, parse_options) if !attributes[:default].nil?
+  	email = (attributes[:default] || inner_text)
+  	if (!self.is_email?(email))
+    	result = "<span class='#{css_class} ubbparser-error'>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='#{css_class}'>#{inner_text}</a>"
+    else
+    	username, domain = email.split("@", 2)
+    	id = "ubb-email-" + SecureRandom.hex(16)
+
+    	# Some generic javascript so every browser can parse this (instantly), regardless of used framework
+    	if (inner_text == email)
+		    title = "Protected email address"
+		    js_title = "email"
+	    else
 				title = inner_text
 				js_title = "\"#{inner_text}\""
 			end
 			script = "<script type='text/javascript'>obj=document.getElementById(\"#{id}\");email=obj.getAttribute(\"data-username\")+\"@\"+obj.getAttribute(\"data-domain\");obj.href=\"mailto:\"+email;obj.innerHTML=#{js_title}</script>"
 			result = "<a id='#{id}' class='#{css_class}' href='#' data-username='#{username}' data-domain='#{domain}'>#{title}</a>#{script}"
 		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}" }
-		"<span style='font-family: #{font}'>#{self.parse(inner_text, parse_options)}</span>"
-	end
-
-# Renders the inner_text in a H1 heading.
-# :category: Render methods
+	# 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.
-# :category: Render methods
+	# 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
+	# 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
+	# Renders the inner_text in a H4 heading.
+	# :category: Render methods
+	def self.render_h3(inner_text, attributes = {}, parse_options = {})
+		"<h4>#{self.parse(inner_text, parse_options)}</h4>"
+	end
+
+	# Renders the inner_text in a H5 heading.
+	# :category: Render methods
+	def self.render_h3(inner_text, attributes = {}, parse_options = {})
+		"<h3>#{self.parse(inner_text, parse_options)}</h5>"
+	end
+
+	# Renders the inner_text in a H6 heading.
+	# :category: Render methods
+	def self.render_h3(inner_text, attributes = {}, parse_options = {})
+		"<h6>#{self.parse(inner_text, parse_options)}</h6>"
+	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
+	# 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
+	# 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 = {})
 		src = inner_text
 		src = 'http://' + src if (src.match(/^www\./))
@@ -315,15 +334,15 @@ module UBBParser
 		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
+	# 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
-#noinspection RubyClassVariableUsageInspection
+	# Renders an image. Use the :class_img parse option to define html classes.
+	# :category: Render methods
+	#noinspection RubyClassVariableUsageInspection
 	def self.render_img(inner_text, attributes = {}, parse_options = {})
 		url = inner_text
 		url = @@file_url_convert_method.call(url) unless @@file_url_convert_method.nil?
@@ -335,36 +354,36 @@ module UBBParser
 		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
+	# 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 = {})
 		attributes[:styles] = 'float: left; margin: 0px 10px 10px 0px'
 		attributes[:class] = parse_options[:class_img_left] || 'ubb-img-left'
 		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
+	# 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 = {})
 		attributes[:styles] = 'float: left; margin: 0px 0px 10px 10px'
 		attributes[:class] = parse_options[:class_img_right] || 'ubb-img-right'
 		render_img(inner_text, attributes, parse_options)
 	end
 
-# Renders the inner_text with a justified text alignment.
-# :category: Render methods
+	# 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
+	# Renders the inner_text with a left text alignment.
+	# :category: Render methods
 	def self.render_left(inner_text, attributes = {}, parse_options = {})
 		"<div style='text-align: left'>#{self.parse(inner_text, parse_options)}</div>"
 	end
 
-# Renders the inner_text as an ordered list. Each line represents a list item. Use the :class_list parse option to define html classes.
-# :category: Render methods
+	# Renders the inner_text as an ordered list. Each line represents a list item. Use the :class_list parse option to define html classes.
+	# :category: Render methods
 	def self.render_list(inner_text, attributes = {}, parse_options = {})
 		items = inner_text.split(/\n/)
 		items.delete_if { |item| item.strip == '' }
@@ -372,65 +391,66 @@ module UBBParser
 		return (items.empty?) ? '' : "<ol 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
+	# 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 = {})
 		css_class = parse_options[:class_p] || 'ubb-p'
 		"<p class='#{css_class}'>#{self.parse(inner_text, parse_options)}</p>"
 	end
 
-# Renders the inner_text with a right text alignment.
-# :category: Render methods
+	# 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
+	# 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
 	def self.render_style(inner_text, attributes = {}, parse_options = {})
 		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
+	# 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 = {})
 		css_class = parse_options[:class_table] || 'ubb-table'
 		"<table class='#{css_class}'>#{self.parse(inner_text.gsub(/(^\n+)|(\n+$)/, ''), parse_options)}</table>"
 	end
 
-# Converts the [td] to a <td>. Always use this in combination with [table] and [tr].
-# :category: Render methods
+	# Converts the [td] to a <td>. Always use this in combination with [table] and [tr].
+	# :category: Render methods
 	def self.render_td(inner_text, attributes = {}, parse_options = {})
 		"<td>#{self.parse(inner_text, parse_options)}</td>"
 	end
 
-# Converts the [th] to a <th>. Always use this in combination with [table] and [tr].
-# :category: Render methods
+	# 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
 
-# Converts the [tr] to a <tr>. Always use this in combination with [table] and [td] or [th].
-# :category: Render methods
+	# Converts the [tr] to a <tr>. Always use this in combination with [table] and [td] or [th].
+	# :category: Render methods
 	def self.render_tr(inner_text, attributes = {}, parse_options = {})
 		"<tr>#{self.parse(inner_text.gsub(/(^\n+)|(\n+$)/, ''), parse_options)}</tr>"
 	end
 
-# Renders the inner_text underline. Use this with caution, since underline text is associated with hyperlinks.
-# :category: Render methods
+	# Renders the inner_text underline. Use this with caution, since underline text is associated with hyperlinks.
+	# :category: Render methods
 	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]
-# Use the :class_url parse option to define html classes.
-# :category: Render methods
-#noinspection RubyClassVariableUsageInspection
+	# Renders a web addres. There are two options to define:
+	#   [url]www.osingasoftware.nl[/ur]
+	#   [url=www.osingasoftware.nl]Osinga Software[/url]
+	# Use the :class_url parse option to define html classes.
+	# :category: Render methods
+	#noinspection RubyClassVariableUsageInspection
 	def self.render_url(inner_text, attributes = {}, parse_options = {})
+		inner_text = self.parse(inner_text, parse_options) if !attributes[:default].nil?
 		url = (attributes[:default] || inner_text)
 		url = 'http://' + url if (url.match(/^www\./))
 		url = @@file_url_convert_method.call(url) unless @@file_url_convert_method.nil?
@@ -439,8 +459,8 @@ module UBBParser
 		return "<a href='#{url}' class='#{css_class}'>#{inner_text}</a>"
 	end
 
-# Renders a YouTube video using the video id or url in the inner_text.
-# :category: Render methods
+	# 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 = {})
 		attributes[:width] ||= 500
 		attributes[:height] ||= 281
@@ -450,8 +470,8 @@ module UBBParser
 		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
+	# 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 = {})
 		attributes[:width] ||= 560
 		attributes[:height] ||= 315
@@ -461,9 +481,9 @@ module UBBParser
 		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
+	# 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] = "#{attributes[:class]} #{parse_options[:class_zideo]}"
 		url = inner_text
@@ -478,8 +498,8 @@ module UBBParser
 		end
 	end
 
-# Renders a zideo.nl video using the video id or url in the inner_text.
-# :category: Render methods
+	# Renders a zideo.nl video using the video id or url in the inner_text.
+	# :category: Render methods
 	def self.render_zideo(inner_text, attributes = {}, parse_options = {})
 		attributes[:width] ||= 480
 		attributes[:height] ||= :auto

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ubbparser
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Taco Jan Osinga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies: []
 description: A simple and flexibel ubb parser.
 email: info@osingasoftware.nl