fira 0.4.1 → 0.5.1

data/Rakefile

@@ -1 +1,12 @@
 require "bundler/gem_tasks"
+require 'rake/testtask'
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new('spec')
+
+Rake::TestTask.new do |t|
+ t.libs << 'test'
+end
+
+desc "Run tests"
+task :default => :spec

data/fira.gemspec

@@ -20,4 +20,6 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
+
+  gem.add_development_dependency "rspec"
 end

data/lib/fira/engine.rb

@@ -1,20 +1,28 @@
+require 'action_controller'
+
 module Fira
 
 	class Engine
 
 
-		ID_REGEX = / #([a-z_A-Z\-]+)/
-		CLASS_REGEX = / \.([a-z_A-Z\-]+)/
+		ID_REGEX = / #([^0-9][a-z_A-Z0-9_\-]+)/
+		CLASS_REGEX = / \.([^0-9][a-z_A-Z0-9_\-]+)/
+		QUOTE_REGEX = /\S+=["']?(?:.(?!["']?\s+(?:\S+)=|[>"']))+.["']?/
+		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 it's an opening tag, analyze it
+
+					#remove any quotes
+					quotes = token.scan(QUOTE_REGEX)
+					no_quotes = token.gsub(QUOTE_REGEX, '')
 
 					#find and replace fira ID attributes
-					result = token.sub(ID_REGEX, ' id="\1"')
+					result = no_quotes.sub(ID_REGEX, ' id="\1"')
 
 					#find fira class attributes
 					classes = result.scan(CLASS_REGEX)
@@ -39,10 +47,14 @@ module Fira
 						#remove the rest of the fira class attributes
 						final_result = new_tag.gsub(CLASS_REGEX, "")
 
-						output += final_result
+						#add back in the quotes
+						final = insert_quotes(quotes, final_result)
 					else
-						output += result
+						#add back in the quotes
+						final = insert_quotes(quotes, result)
 					end
+						
+					output += final
 
 				else
 					output += token
@@ -51,6 +63,13 @@ module Fira
 
 			return output
 		end
+
+		def insert_quotes(_quotes, tag)
+			space = ''
+			space = ' ' if _quotes.length > 0
+			quotes = _quotes.join(" ")
+			tag.sub(TAG_END_REGEX, space + quotes + '\1')
+		end
 		
 		
 	end

data/lib/fira/helpers.rb

@@ -1,4 +1,5 @@
-require 'action_view/template'
+require 'active_support'
+require 'action_view'
 require 'erubis'
 
 module Fira

data/lib/fira/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fira
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-02 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -77,6 +77,22 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '4.1'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Adds improvements to HTML syntax for id and class attributes
 email:
 - cameronsutter0@gmail.com
@@ -128,8 +144,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Smarter HTML
 test_files: []
+has_rdoc: