fira 0.3.0 → 0.3.2

data/bin/fira.rb

@@ -1,9 +1,8 @@
 #!/usr/bin/env ruby
 
-ID_PATTERN = /(<.*)#([a-z_A-Z\-]+)(.*>.*<\/.*>)/
+ID_PATTERN = /(<[^\/]?.*)#([a-z_A-Z\-]+)/
 CLASS_PATTERN = /\.([a-z_A-Z\-]+)/
-TAG_PATTERN = /<.*>/
-OPEN_TAG_PATTERN = /(<.*>)(.*<\/.*>)/
+TAG_PATTERN = /<[^\/]?.*>/
 
 #begin parsing text
 def parse_text(contents)
@@ -19,7 +18,7 @@ end
 #scan for ids and replace with html id attributes
 def parse_ids(contents)
 
-	result = contents.gsub(ID_PATTERN, '\1 id="\2" \3')
+	result = contents.gsub(ID_PATTERN, '\1 id="\2"')
 end
 
 #scan for classes and create html class attributes
@@ -31,9 +30,8 @@ def parse_classes(contents)
 	tags = contents.scan(TAG_PATTERN)
 	tags.each do |tag|
 
-		open_tag = tag.scan(OPEN_TAG_PATTERN)
+		classes = tag.scan(CLASS_PATTERN)
 
-		classes = open_tag[0][0].scan(CLASS_PATTERN)
 
 		if ! classes.empty?
 		
@@ -50,14 +48,11 @@ def parse_classes(contents)
 			att = att.sub(/class=' /, "class='")
 			
 			#remove the fira class attributes
-			new_open_tag = open_tag[0][0].gsub(CLASS_PATTERN, "")
+			new_tag = tag.gsub(CLASS_PATTERN, "")
 
 			#save the html class attributes back into the tag
-			new_open_tag = new_open_tag.sub(/>/,att + "\\0")
-			
-			#replace the old opening tag with the new
-			new_tag = tag.gsub(OPEN_TAG_PATTERN, new_open_tag + '\2')
-			
+			new_tag = new_tag.sub(/>/,att + "\\0")
+							
 			#save the whole html tag back into the file
 			result = result.sub(tag, new_tag)
 		end
@@ -80,15 +75,11 @@ files.each do |fi|
 	File.open(fi, 'r+'){
 		|f|
 		contents = f.read
-
-		tag_pattern = /<.*>/
-		
-		result = parse_ids(contents)
 		
-		result = parse_classes(result, tag_pattern)
+		result = parse_text(contents)
 		
 		#make the new file's name
-		new_file = fi.sub(/(\.fi$|\.html.fi$)/, ".html")
+		new_file = fi.sub(/(\.fira$|\.html.fira$)/, ".html")
 		
 		File.open(new_file, "w") { |nf| nf.write(result)}
 	}

data/lib/fira/engine.rb

@@ -2,10 +2,9 @@ module Fira
 
 	class Engine
 
-		ID_PATTERN = /(<.*)#([a-z_A-Z\-]+)(.*>.*<\/.*>)/
+		ID_PATTERN = /(<[^\/]?.*)#([a-z_A-Z\-]+)/
 		CLASS_PATTERN = /\.([a-z_A-Z\-]+)/
-		TAG_PATTERN = /<.*>/
-		OPEN_TAG_PATTERN = /(<.*>)(.*<\/.*>)/
+		TAG_PATTERN = /<[^\/]?.*>/
 
 		#begin parsing text
 		def parse_text(contents)
@@ -21,7 +20,7 @@ module Fira
 		#scan for ids and replace with html id attributes
 		def parse_ids(contents)
 
-			result = contents.gsub(ID_PATTERN, '\1 id="\2" \3')
+			result = contents.gsub(ID_PATTERN, '\1 id="\2"')
 		end
 
 		#scan for classes and create html class attributes
@@ -33,38 +32,31 @@ module Fira
 			tags = contents.scan(TAG_PATTERN)
 			tags.each do |tag|
 
-				open_tag = tag.scan(OPEN_TAG_PATTERN)
+				classes = tag.scan(CLASS_PATTERN)
 
-				if ! open_tag.empty?
 
-					classes = open_tag[0][0].scan(CLASS_PATTERN)
-
-					if ! classes.empty?
+				if ! classes.empty?
+				
+					#build a class attribute
+					att = "class='"
+				
+					classes.each do |cl|
+						att += " #{cl[0]}"
+					end
+					
+					att += "'"
 					
-						#build a 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 fira class attributes
-						new_open_tag = open_tag[0][0].gsub(CLASS_PATTERN, "")
+					#remove the fira class attributes
+					new_tag = tag.gsub(CLASS_PATTERN, "")
 
-						#save the html class attributes back into the tag
-						new_open_tag = new_open_tag.sub(/>/,att + "\\0")
-						
-						#replace the old opening tag with the new
-						new_tag = tag.gsub(OPEN_TAG_PATTERN, new_open_tag + '\2')
-						
-						#save the whole html tag back into the file
-						result = result.sub(tag, new_tag)
-					end
+					#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)
 				end
 			end
 			

data/lib/fira/version.rb

@@ -1,3 +1,3 @@
 module Fira
-  VERSION = "0.3.0"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fira
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-25 00:00:00.000000000 Z
+date: 2013-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Smarter HTML