fira 0.5.1 → 0.5.2

data/README.md

@@ -4,7 +4,7 @@
 
 Fira adds ease-of-use functionality to HTML files. 
 
-Instead of typing id="foo" or class="foo bar", you can simply type #foo or .foo .bar in HTML tags (in the normal place where you put id or class attributes)
+Instead of typing `id="foo"` or `class="foo bar"`, you can simply type `#foo` or `.foo .bar` in HTML tags (in the normal place where you put id or class attributes)
 
 ## Installation
 
@@ -29,10 +29,20 @@ Once in your Gemfile, Fira will be the default template_engine for <code>rails g
 ##Examples
 
 ###Id's
-&lt;div #my_id &gt; becomes &lt;div id="my_id" &gt;
+
+    <div #my_id >
+
+becomes
+
+    <div id="my_id" >
 
 ###Classes
-&lt;div .multiple .classes &gt; becomes &lt;div class='multiple classes' &gt;
+
+    <div .multiple .classes >
+
+becomes
+
+    <div class='multiple classes' >
 
 ## Contributing
 

data/lib/fira/engine.rb

@@ -8,14 +8,16 @@ module Fira
 		ID_REGEX = / #([^0-9][a-z_A-Z0-9_\-]+)/
 		CLASS_REGEX = / \.([^0-9][a-z_A-Z0-9_\-]+)/
 		QUOTE_REGEX = /\S+=["']?(?:.(?!["']?\s+(?:\S+)=|[>"']))+.["']?/
+		TAG_OPEN_REGEX = /<[^\/%]\w* /
 		TAG_END_REGEX = /([\/]?>)/
 
 		def parse_text(text)
 			output = ""
 			tokenizer = HTML::Tokenizer.new(text)
 			while token = tokenizer.next
+
 				#if it's an opening tag, analyze it
-				if token[0] == "<" and token[token.length - 1] == ">" and token[1] != "/"
+				if is_opening_tag?(token)
 
 					#remove any quotes
 					quotes = token.scan(QUOTE_REGEX)
@@ -28,22 +30,22 @@ module Fira
 					classes = result.scan(CLASS_REGEX)
 
 					if ! classes.empty?
-					
+
 						#build an HTML class attribute
 						att = 'class="'
-					
+
 						classes.each do |cl|
 							att += " #{cl[0]}"
 						end
-						
+
 						att += '"'
-						
+
 						#remove the space before the first class
 						att = att.sub(/class=" /, ' class="')
 
 						#remove the first fira class attribute
 						new_tag = result.sub(CLASS_REGEX, att)
-						
+
 						#remove the rest of the fira class attributes
 						final_result = new_tag.gsub(CLASS_REGEX, "")
 
@@ -53,7 +55,7 @@ module Fira
 						#add back in the quotes
 						final = insert_quotes(quotes, result)
 					end
-						
+
 					output += final
 
 				else
@@ -70,7 +72,12 @@ module Fira
 			quotes = _quotes.join(" ")
 			tag.sub(TAG_END_REGEX, space + quotes + '\1')
 		end
-		
-		
+
+		def is_opening_tag?(text)
+			val = text =~ TAG_OPEN_REGEX
+			val ? true : false
+		end
+
+
 	end
 end

data/lib/fira/version.rb

@@ -1,3 +1,3 @@
 module Fira
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fira
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-17 00:00:00.000000000 Z
+date: 2013-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport