fira 0.3.6 → 0.4.0

data/bin/fira.rb

@@ -1,67 +1,56 @@
 #!/usr/bin/env ruby
 
-ID_PATTERN = /(<[^\/]?.*)#([a-z_A-Z\-]+)/
-CLASS_PATTERN = /\.([a-z_A-Z\-]+)/
-TAG_PATTERN = /<[^\/]?.*>/
+ID_REGEX = /([^'"]*)#([a-z_A-Z\-]+)(.*)/
+CLASS_REGEX = / \.([a-z_A-Z\-]+)/
 
-#begin parsing text
-def parse_text(contents)
-	
-	#find id's
-	result = parse_ids(contents)
-	
-	#find classes
-	output = parse_classes(result)
-		
-end
+def parse_text(text)
+	output = ""
+	tokenizer = HTML::Tokenizer.new(text)
+	while token = tokenizer.next
+		if token[0] == "<" and token[token.length - 1] == ">" and token[1] != "/"
+			#if it's an opening tag, analyze it
 
-#scan for ids and replace with html id attributes
-def parse_ids(contents)
-
-	result = contents.gsub(ID_PATTERN, '\1 id="\2"')
-end
+			#find and replace fira ID attributes
+			result = token.sub(ID_REGEX, '\1 id="\2" \3')
 
-#scan for classes and create html class attributes
-def parse_classes(contents)
+			#find fira class attributes
+			classes = result.scan(CLASS_REGEX)
 
-	result = contents
-	
-	#scan for classes
-	tags = contents.scan(TAG_PATTERN)
-	tags.each do |tag|
-
-		classes = tag.scan(CLASS_PATTERN)
+			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, "")
 
-		if ! classes.empty?
-		
-			#build a class attribute
-			att = "class='"
-		
-			classes.each do |cl|
-				att += " #{cl[0]}"
+				output += final_result
+			else
+				output += result
 			end
-			
-			att += "'"
-			
-			#remove the space before the first class
-			att = att.sub(/class=' /, "class='")
-			
-			#remove the fira class attributes
-			new_tag = tag.gsub(CLASS_PATTERN, "")
 
-			#save the html class attributes back into the tag
-			new_tag = new_tag.sub(/>/,att + "\\0")
-							
-			#save the whole html tag back into the file
-			result = result.sub(tag, new_tag)
+		else
+			output += token
 		end
 	end
-	
-	return result
+
+	return output
 end
 
 
+
 #####################
 # START HERE
 #####################

data/lib/fira/engine.rb

@@ -2,67 +2,56 @@ module Fira
 
 	class Engine
 
-		ID_PATTERN = /(<[^\/]?.*)#([a-z_A-Z\-]+)(.*>.*<\/.*>)/
-		CLASS_PATTERN = /\.([a-z_A-Z\-]+)/
-		TAG_PATTERN = /<\/?\w+\s+[^>]*>/
 
-		#begin parsing text
-		def parse_text(contents)
-			
-			#find id's
-			result = parse_ids(contents)
-			
-			#find classes
-			output = parse_classes(result)
-				
-		end
-
-		#scan for ids and replace with html id attributes
-		def parse_ids(contents)
-
-			result = contents.gsub(ID_PATTERN, '\1 id="\2" \3')
-		end
-
-		#scan for classes and create html class attributes
-		def parse_classes(contents)
+		ID_REGEX = /([^'"]*)#([a-z_A-Z\-]+)(.*)/
+		CLASS_REGEX = / \.([a-z_A-Z\-]+)/
 
-			result = contents
-			
-			#scan for classes
-			tags = contents.scan(TAG_PATTERN)
-			tags.each do |tag|
+		def parse_text(text)
+			output = ""
+			tokenizer = HTML::Tokenizer.new(text)
+			while token = tokenizer.next
+				if token[0] == "<" and token[token.length - 1] == ">" and token[1] != "/"
+					#if it's an opening tag, analyze it
 
-				classes = tag.scan(CLASS_PATTERN)
+					#find and replace fira ID attributes
+					result = token.sub(ID_REGEX, '\1 id="\2" \3')
 
+					#find fira class attributes
+					classes = result.scan(CLASS_REGEX)
 
-				if ! classes.empty?
-				
-					#build a class attribute
-					att = "class='"
-				
-					classes.each do |cl|
-						att += " #{cl[0]}"
-					end
+					if ! classes.empty?
 					
-					att += "'"
+						#build an HTML class attribute
+						att = 'class="'
 					
-					#remove the space before the first class
-					att = att.sub(/class=' /, "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, "")
+
+						output += final_result
+					else
+						output += result
+					end
 
-					#remove the fira class attributes
-					#first one
-					new_tag = tag.sub(CLASS_PATTERN, att)
-					
-					#the rest of the fira class attributes
-					new_tag = new_tag.gsub(CLASS_PATTERN, "")
-									
-					#save the whole html tag back into the file
-					result = result.sub(tag, new_tag)
+				else
+					output += token
 				end
 			end
-			
-			return result
+
+			return output
 		end
 		
+		
 	end
 end

data/lib/fira/version.rb

@@ -1,3 +1,3 @@
 module Fira
-  VERSION = "0.3.6"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fira
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport