fira 0.5.3 → 0.6.0

data/lib/fira/engine.rb

@@ -26,44 +26,45 @@ module Fira
 					#find and replace fira ID attributes
 					result = no_quotes.sub(ID_REGEX, ' id="\1"')
 
-					#find fira class attributes
-					classes = result.scan(CLASS_REGEX)
+					#find and replace fira class attributes
+					result = parse_classes(result)
 
-					if ! classes.empty?
+					#add back in the quotes
+					output += insert_quotes(quotes, result)
 
-						#build an HTML class attribute
-						att = 'class="'
+					#find and replace fira data attributes
+					output = output.gsub("\$", "data-")
 
-						classes.each do |cl|
-							att += " #{cl[0]}"
-						end
+				else
+					output += token
+				end
+			end
 
-						att += '"'
+			return output
+		end
 
-						#remove the space before the first class
-						att = att.sub(/class=" /, ' class="')
+		def parse_classes(text)
+			#find fira class attributes
+			classes = text.scan(CLASS_REGEX)
 
-						#remove the first fira class attribute
-						new_tag = result.sub(CLASS_REGEX, att)
+			if classes.empty?
+				return text
+			end
 
-						#remove the rest of the fira class attributes
-						final_result = new_tag.gsub(CLASS_REGEX, "")
+			#build an HTML class attribute
+			att = 'class="'
 
-						#add back in the quotes
-						final = insert_quotes(quotes, final_result)
-					else
-						#add back in the quotes
-						final = insert_quotes(quotes, result)
-					end
+			classes.each do |cl|
+				att += " #{cl[0]}"
+				text = text.sub(" ." + cl[0], "")
+			end
 
-					output += final
+			att += '"'
 
-				else
-					output += token
-				end
-			end
+			#remove the space before the first class
+			att = att.sub(/class=" /, ' class="')
 
-			return output
+			text.sub(TAG_END_REGEX, att + '\1')
 		end
 
 		def insert_quotes(_quotes, tag)

data/lib/fira/version.rb

@@ -1,3 +1,3 @@
 module Fira
-  VERSION = "0.5.3"
+  VERSION = "0.6.0"
 end

data/spec/fira_spec.rb

@@ -42,6 +42,13 @@ describe Fira do
       result = Fira.render html_comments
       result.should == res_html_comments
     end
+
+    context 'Data tags' do
+      it 'simple data tags' do
+        result = Fira.render data_attribute_simple
+        result.should == res_data_attribute_simple
+      end
+    end
   end
 
   context 'ERB' do
@@ -55,4 +62,5 @@ describe Fira do
       result.should == res_erb_in_tag
     end
   end
+
 end

data/spec/spec_helper.rb

@@ -81,7 +81,7 @@ def res_nested_multi_line
     <p id="id" class="class3">
       <span id="span8" class="one">some text</span>
       some text
-      <input  id="user"  class="orange"  type='text' value='user'/>
+      <input  id="user"   class="orange" type='text' value='user'/>
     </p>
   FIRA
 end
@@ -158,7 +158,7 @@ end
 def res_erb
   <<-FIRA
     <span id="my-id"><% something.id %></span>
-    <p id="id" class="class3" >
+    <p id="id"  class="class3">
       some text
     </p>
   FIRA
@@ -176,8 +176,20 @@ end
 def res_erb_in_tag
   <<-FIRA
     <span id="my-id"  class="<%= something.id %>" ></span>
-    <p id="id" class="class3" >
+    <p id="id"  class="class3">
       some text
     </p>
   FIRA
+end
+
+def data_attribute_simple
+  <<-FIRA
+    <span $convo-id="72" ></span>
+  FIRA
+end
+
+def res_data_attribute_simple
+  <<-FIRA
+    <span   data-convo-id="72"></span>
+  FIRA
 end

metadata

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