fira 0.4.0 → 0.4.1

data/.gitattributes

@@ -0,0 +1,22 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+*.sln    merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain

data/.gitignore

@@ -1,17 +1,17 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in fira.gemspec
-gemspec
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in fira.gemspec
+gemspec

data/LICENSE.txt

@@ -1,22 +1,22 @@
-Copyright (c) 2013 Cameron Sutter
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+Copyright (c) 2013 Cameron Sutter
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1 +1 @@
-require "bundler/gem_tasks"
+require "bundler/gem_tasks"

data/bin/fira.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-ID_REGEX = /([^'"]*)#([a-z_A-Z\-]+)(.*)/
+ID_REGEX = / #([a-z_A-Z\-]+)/
 CLASS_REGEX = / \.([a-z_A-Z\-]+)/
 
 def parse_text(text)
@@ -10,8 +10,8 @@ def parse_text(text)
 		if token[0] == "<" and token[token.length - 1] == ">" and token[1] != "/"
 			#if it's an opening tag, analyze it
 
-			#find and replace fira ID attributes
-			result = token.sub(ID_REGEX, '\1 id="\2" \3')
+			#find and replace fira ID attribute
+			result = token.sub(ID_REGEX, ' id="\1"')
 
 			#find fira class attributes
 			classes = result.scan(CLASS_REGEX)

data/lib/fira/engine.rb

@@ -3,7 +3,7 @@ module Fira
 	class Engine
 
 
-		ID_REGEX = /([^'"]*)#([a-z_A-Z\-]+)(.*)/
+		ID_REGEX = / #([a-z_A-Z\-]+)/
 		CLASS_REGEX = / \.([a-z_A-Z\-]+)/
 
 		def parse_text(text)
@@ -14,7 +14,7 @@ module Fira
 					#if it's an opening tag, analyze it
 
 					#find and replace fira ID attributes
-					result = token.sub(ID_REGEX, '\1 id="\2" \3')
+					result = token.sub(ID_REGEX, ' id="\1"')
 
 					#find fira class attributes
 					classes = result.scan(CLASS_REGEX)

data/lib/fira/version.rb

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

data/lib/generators/fira/controller/templates/view.html.fira

@@ -1,2 +1,2 @@
-<h1><%= class_name %>#<%= @action %></h1>
-<p>Find me in <%= @path %></p>
+<h1><%= class_name %>#<%= @action %></h1>
+<p>Find me in <%= @path %></p>

data/lib/generators/fira/mailer/templates/view.text.fira

@@ -1,3 +1,3 @@
-<%= class_name %>#<%= @action %>
-
-<%%= @greeting %>, find me in app/views/<%= @path %>
+<%= class_name %>#<%= @action %>
+
+<%%= @greeting %>, find me in app/views/<%= @path %>

data/lib/generators/fira/scaffold/templates/edit.html.fira

@@ -1,6 +1,6 @@
-<h1>Editing <%= singular_table_name %></h1>
-
-<%%= render 'form' %>
-
-<%%= link_to 'Show', @<%= singular_table_name %> %> |
-<%%= link_to 'Back', <%= index_helper %>_path %>
+<h1>Editing <%= singular_table_name %></h1>
+
+<%%= render 'form' %>
+
+<%%= link_to 'Show', @<%= singular_table_name %> %> |
+<%%= link_to 'Back', <%= index_helper %>_path %>

data/lib/generators/fira/scaffold/templates/index.html.fira

@@ -1,27 +1,27 @@
-<h1>Listing <%= plural_table_name %></h1>
-
-<table>
-  <tr>
-<% attributes.each do |attribute| -%>
-    <th><%= attribute.human_name %></th>
-<% end -%>
-    <th></th>
-    <th></th>
-    <th></th>
-  </tr>
-
-<%% @<%= plural_table_name %>.each do |<%= singular_table_name %>| %>
-  <tr>
-<% attributes.each do |attribute| -%>
-    <td><%%= <%= singular_table_name %>.<%= attribute.name %> %></td>
-<% end -%>
-    <td><%%= link_to 'Show', <%= singular_table_name %> %></td>
-    <td><%%= link_to 'Edit', edit_<%= singular_table_name %>_path(<%= singular_table_name %>) %></td>
-    <td><%%= link_to 'Destroy', <%= singular_table_name %>, <%= key_value :method, ":delete" %>, <%= key_value :data, "{ #{key_value :confirm, "'Are you sure?'"} }" %> %></td>
-  </tr>
-<%% end %>
-</table>
-
-<br />
-
-<%%= link_to 'New <%= human_name %>', new_<%= singular_table_name %>_path %>
+<h1>Listing <%= plural_table_name %></h1>
+
+<table>
+  <tr>
+<% attributes.each do |attribute| -%>
+    <th><%= attribute.human_name %></th>
+<% end -%>
+    <th></th>
+    <th></th>
+    <th></th>
+  </tr>
+
+<%% @<%= plural_table_name %>.each do |<%= singular_table_name %>| %>
+  <tr>
+<% attributes.each do |attribute| -%>
+    <td><%%= <%= singular_table_name %>.<%= attribute.name %> %></td>
+<% end -%>
+    <td><%%= link_to 'Show', <%= singular_table_name %> %></td>
+    <td><%%= link_to 'Edit', edit_<%= singular_table_name %>_path(<%= singular_table_name %>) %></td>
+    <td><%%= link_to 'Destroy', <%= singular_table_name %>, <%= key_value :method, ":delete" %>, <%= key_value :data, "{ #{key_value :confirm, "'Are you sure?'"} }" %> %></td>
+  </tr>
+<%% end %>
+</table>
+
+<br />
+
+<%%= link_to 'New <%= human_name %>', new_<%= singular_table_name %>_path %>

data/lib/generators/fira/scaffold/templates/new.html.fira

@@ -1,5 +1,5 @@
-<h1>New <%= singular_table_name %></h1>
-
-<%%= render 'form' %>
-
-<%%= link_to 'Back', <%= index_helper %>_path %>
+<h1>New <%= singular_table_name %></h1>
+
+<%%= render 'form' %>
+
+<%%= link_to 'Back', <%= index_helper %>_path %>

data/lib/generators/fira/scaffold/templates/show.html.fira

@@ -1,12 +1,12 @@
-<p id="notice"><%%= notice %></p>
-
-<% attributes.each do |attribute| -%>
-<p>
-  <b><%= attribute.human_name %>:</b>
-  <%%= @<%= singular_table_name %>.<%= attribute.name %> %>
-</p>
-
-<% end -%>
-
-<%%= link_to 'Edit', edit_<%= singular_table_name %>_path(@<%= singular_table_name %>) %> |
-<%%= link_to 'Back', <%= index_helper %>_path %>
+<p id="notice"><%%= notice %></p>
+
+<% attributes.each do |attribute| -%>
+<p>
+  <b><%= attribute.human_name %>:</b>
+  <%%= @<%= singular_table_name %>.<%= attribute.name %> %>
+</p>
+
+<% end -%>
+
+<%%= link_to 'Edit', edit_<%= singular_table_name %>_path(@<%= singular_table_name %>) %> |
+<%%= link_to 'Back', <%= index_helper %>_path %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fira
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
+date: 2013-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -85,6 +85,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitattributes
 - .gitignore
 - Gemfile
 - LICENSE.txt