fira 0.5.2 → 0.5.3

data/lib/fira/engine.rb

@@ -8,7 +8,7 @@ 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_OPEN_REGEX = /<[^\/%!]\w* /
 		TAG_END_REGEX = /([\/]?>)/
 
 		def parse_text(text)
@@ -75,7 +75,7 @@ module Fira
 
 		def is_opening_tag?(text)
 			val = text =~ TAG_OPEN_REGEX
-			val ? true : false
+			val.nil? || val > 0 ? false : true
 		end
 
 

data/lib/fira/version.rb

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

data/spec/fira_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+describe Fira do
+  context 'HTML' do
+
+    it 'simple' do
+      result = Fira.render simple
+      result.should == res_simple
+    end
+
+    it 'multi line' do
+      result = Fira.render multi_line
+      result.should == res_multi_line
+    end
+
+    it 'nested single line' do
+      result = Fira.render nested_single_line
+      result.should == res_nested_single_line
+    end
+
+    it 'nested multi line' do
+      result = Fira.render nested_multi_line
+      result.should == res_nested_multi_line
+    end
+
+    it 'two classes' do
+      result = Fira.render two_classes
+      result.should == res_two_classes
+    end
+
+    it 'inside text' do
+      result = Fira.render inside_text
+      result.should == res_inside_text
+    end
+
+    it 'inside quotes' do
+      result = Fira.render inside_quotes
+      result.should == res_inside_quotes
+    end
+
+    it 'comments' do
+      result = Fira.render html_comments
+      result.should == res_html_comments
+    end
+  end
+
+  context 'ERB' do
+    it 'simple erb' do
+      result = Fira.render erb
+      result.should == res_erb
+    end
+
+    it 'erb in-tag' do
+      result = Fira.render erb_in_tag
+      result.should == res_erb_in_tag
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,183 @@
+require 'rspec'
+require 'fira'
+
+RSpec.configure do |config|
+  config.color_enabled = true
+  config.formatter     = 'documentation'
+end
+
+def simple
+  <<-FIRA
+    <p #id .class3>some text</p>
+  FIRA
+end
+
+def res_simple
+  <<-FIRA
+    <p id="id" class="class3">some text</p>
+  FIRA
+end
+
+def multi_line
+  <<-FIRA
+    <p #id .class3>
+      some text
+    </p>
+  FIRA
+end
+
+def res_multi_line
+  <<-FIRA
+    <p id="id" class="class3">
+      some text
+    </p>
+  FIRA
+end
+
+def nested_single_line
+  <<-FIRA
+    <p #id .class3><span #span .one>some text</span>
+      some text
+    </p>
+  FIRA
+end
+
+def res_nested_single_line
+  <<-FIRA
+    <p id="id" class="class3"><span id="span" class="one">some text</span>
+      some text
+    </p>
+  FIRA
+end
+
+def two_classes
+    <<-FIRA
+    <p #id .class3 .class4>
+      some text
+    </p>
+  FIRA
+end
+
+def res_two_classes
+    <<-FIRA
+    <p id="id" class="class3 class4">
+      some text
+    </p>
+  FIRA
+end
+
+def nested_multi_line
+  <<-FIRA
+    <p #id .class3>
+      <span #span8 .one>some text</span>
+      some text
+      <input type='text' #user value='user' .orange />
+    </p>
+  FIRA
+end
+
+def res_nested_multi_line
+  <<-FIRA
+    <p id="id" class="class3">
+      <span id="span8" class="one">some text</span>
+      some text
+      <input  id="user"  class="orange"  type='text' value='user'/>
+    </p>
+  FIRA
+end
+
+def inside_text
+  <<-FIRA
+    <p #id .class3>#span .one some text
+      #span .one some text
+      <span>.one #span some text</span>
+    </p>
+  FIRA
+end
+
+def res_inside_text
+  <<-FIRA
+    <p id="id" class="class3">#span .one some text
+      #span .one some text
+      <span>.one #span some text</span>
+    </p>
+  FIRA
+end
+
+def inside_quotes
+  <<-FIRA
+    <p rel="something .steve and #an id" #id .class3>
+      some text
+    </p>
+  FIRA
+end
+
+def res_inside_quotes
+  <<-FIRA
+    <p  id="id" class="class3" rel="something .steve and #an id">
+      some text
+    </p>
+  FIRA
+end
+
+def html_comments
+  <<-FIRA
+    <div class="span12">
+      <h1><%= @applicant.first_name + " " + @applicant.last_name %>, you are applying for: </h1>
+      <h3><span .main-color><%= @position.name %></span> @ <%= @position.client.name %></h3>
+  <!--  <div .user-info>
+        <h2><a href="/dashboard"><%= @applicant.first_name + " " + @applicant.last_name %></a></h2>
+        <button type="button" .button .edit-profile>Edit</button>
+      </div> -->
+    </div>
+  FIRA
+end
+
+def res_html_comments
+  <<-FIRA
+    <div  class="span12">
+      <h1><%= @applicant.first_name + " " + @applicant.last_name %>, you are applying for: </h1>
+      <h3><span class="main-color"><%= @position.name %></span> @ <%= @position.client.name %></h3>
+  <!--  <div .user-info>
+        <h2><a href="/dashboard"><%= @applicant.first_name + " " + @applicant.last_name %></a></h2>
+        <button type="button" .button .edit-profile>Edit</button>
+      </div> -->
+    </div>
+  FIRA
+end
+
+def erb
+  <<-FIRA
+    <span #my-id><% something.id %></span>
+    <p #id .class3 >
+      some text
+    </p>
+  FIRA
+end
+
+def res_erb
+  <<-FIRA
+    <span id="my-id"><% something.id %></span>
+    <p id="id" class="class3" >
+      some text
+    </p>
+  FIRA
+end
+
+def erb_in_tag
+  <<-FIRA
+    <span #my-id class="<%= something.id %>" ></span>
+    <p #id .class3 >
+      some text
+    </p>
+  FIRA
+end
+
+def res_erb_in_tag
+  <<-FIRA
+    <span id="my-id"  class="<%= something.id %>" ></span>
+    <p id="id" class="class3" >
+      some text
+    </p>
+  FIRA
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fira
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-23 00:00:00.000000000 Z
+date: 2013-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -124,6 +124,8 @@ files:
 - lib/generators/fira/scaffold/templates/index.html.fira
 - lib/generators/fira/scaffold/templates/new.html.fira
 - lib/generators/fira/scaffold/templates/show.html.fira
+- spec/fira_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/cameronsutter/fira
 licenses: []
 post_install_message: 
@@ -148,5 +150,7 @@ rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Smarter HTML
-test_files: []
+test_files:
+- spec/fira_spec.rb
+- spec/spec_helper.rb
 has_rdoc: