fira 0.1.0 → 0.2.0

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/README.md

@@ -20,15 +20,15 @@ Or install it yourself as:
 
 ## Usage
 
-To use Fira, rename HTML files to .html.fi and rails will automatically handle them.
+To use Fira, rename HTML files to .html.fi and rails will automatically handle them. It will even evaluate embedded ruby code using Erubis. (note: Erubis runs after Fira)
 
 ##Examples
 
 ###Id's
-<div #my_id &rt;
+<div #my_id >
 
 ###Classes
-<div .multiple .classes &rt;
+<div .multiple .classes >
 
 ## Contributing
 

data/Rakefile

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

data/bin/fira.rb

@@ -1,23 +1,40 @@
 #!/usr/bin/env ruby
 
+ID_PATTERN = /(<.*)#([a-z_A-Z\-]+)(.*>.*<\/.*>)/
+CLASS_PATTERN = /\.([a-z_A-Z\-]+)/
+TAG_PATTERN = /<.*>/
+OPEN_TAG_PATTERN = /(<.*>)(.*<\/.*>)/
+
+#begin parsing text
+def parse_text(contents)
+	
+	#find id's
+	result = parse_ids(contents)
+	
+	#find classes
+	output = parse_classes(result)
+		
+end
+
 #scan for ids and replace with html id attributes
 def parse_ids(contents)
-	id_pattern = /(#)([a-z_A-Z\-]+)/
-	result = contents.gsub(id_pattern, 'id="\2"')
+
+	result = contents.gsub(ID_PATTERN, '\1 id="\2" \3')
 end
 
 #scan for classes and create html class attributes
-def parse_classes(contents, tag_pattern)
-	class_pattern = /\.([a-z_A-Z\-]+)/
-	
+def parse_classes(contents)
+
 	result = contents
 	
 	#scan for classes
-	tags = contents.scan(tag_pattern)
+	tags = contents.scan(TAG_PATTERN)
 	tags.each do |tag|
-		
-		classes = tag.scan(class_pattern)
-		
+
+		open_tag = tag.scan(OPEN_TAG_PATTERN)
+
+		classes = open_tag[0][0].scan(CLASS_PATTERN)
+
 		if ! classes.empty?
 		
 			#build a class attribute
@@ -32,12 +49,15 @@ def parse_classes(contents, tag_pattern)
 			#remove the space before the first class
 			att = att.sub(/class=' /, "class='")
 			
-			#remove the eml class attributes
-			new_tag = tag.gsub(class_pattern, "")
-			
-			#save the html class attributes back into the tag
-			new_tag = new_tag.sub(/>/,att + "\\0")
+			#remove the fira class attributes
+			new_open_tag = open_tag[0][0].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
@@ -68,7 +88,7 @@ files.each do |fi|
 		result = parse_classes(result, tag_pattern)
 		
 		#make the new file's name
-		new_file = fi.sub(/\.fi$/, ".html")
+		new_file = fi.sub(/(\.fi$|\.html.fi$)/, ".html")
 		
 		File.open(new_file, "w") { |nf| nf.write(result)}
 	}

data/lib/fira.rb

@@ -2,10 +2,9 @@ require "fira/version"
 
 module Fira
 
-  def self.render(template)
-  	text = template.source
+  def self.render(source)
     @engine = Fira::Engine.new
-    output = @engine.parse_text(text)
+    output = @engine.parse_text(source)
     return output
   end
 

data/lib/fira/engine.rb

@@ -35,33 +35,36 @@ module Fira
 
 				open_tag = tag.scan(OPEN_TAG_PATTERN)
 
-				classes = open_tag[0][0].scan(CLASS_PATTERN)
+				if ! open_tag.empty?
 
-				if ! classes.empty?
-				
-					#build a class attribute
-					att = "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, "")
+					classes = open_tag[0][0].scan(CLASS_PATTERN)
 
-					#save the html class attributes back into the tag
-					new_open_tag = new_open_tag.sub(/>/,att + "\\0")
+					if ! classes.empty?
 					
-					#replace the old opening tag with the new
-					new_tag = tag.gsub(OPEN_TAG_PATTERN, new_open_tag + '\2')
+						#build a class attribute
+						att = "class='"
 					
-					#save the whole html tag back into the file
-					result = result.sub(tag, new_tag)
+						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, "")
+
+						#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
 				end
 			end
 			

data/lib/fira/helpers.rb

@@ -1,4 +1,5 @@
 require 'action_view/template'
+require 'erubis'
 
 module Fira
 
@@ -17,67 +18,14 @@ module Fira
       end
 
       def call(template)
-        output = ''
-        add_preamble(output)
-        txt = Fira::render(template)
-        add_text(output, txt)
-        add_postamble(output)
 
-        return output
-      end
-
-      #The next several methods are taken from the Erubis Template Handler erb.erb in action_view
-      def add_preamble(src)
-        src << "@output_buffer = output_buffer || ActionView::OutputBuffer.new;"
-      end
-
-      def add_text(src, text)
-        return if text.empty?
-        src << "@output_buffer.safe_concat('" << escape_text(text) << "');"
-      end
-
-      BLOCK_EXPR = /\s+(do|\{)(\s*\|[^|]*\|)?\s*\Z/
+        results = Fira::render(template.source)
 
-      def add_expr_literal(src, code)
-        if code =~ BLOCK_EXPR
-          src << '@output_buffer.append= ' << code
-        else
-          src << '@output_buffer.append= (' << code << ');'
-        end
+        input = ActionView::Template::new(results, template.identifier, template.handler, {:format => template.formats[0]})
+        output = ActionView::Template::Handlers::ERB::call(input)
       end
 
-      def add_expr_escaped(src, code)
-        if code =~ BLOCK_EXPR
-          src << "@output_buffer.safe_append= " << code
-        else
-          src << "@output_buffer.safe_concat((" << code << ").to_s);"
-        end
-      end
-
-      def add_postamble(src)
-        src << '@output_buffer.to_s'
-      end
-
-      def escape_text(text)
-        text.gsub(/['\\]/, '\\\\\&')   # "'" => "\\'",   '\\' => '\\\\'
-      end
   end
   handler_klass = Fira::FiraHandler
   ActionView::Template::register_default_template_handler :fi, handler_klass
-end
-# module ActionView
-#   module TemplateHandlers
-#     class FiraHandler < TemplateHandler
-      
-#       def initialize(template)
-#         @template = template
-#       end
-
-#       def render(contents, local_assigns = {})
-#         return Fira::render(contents)
-#       end
-#     end
-#   end
-#   handler_klass = TemplateHandlers::FiraHandler
-#   Template.register_default_template_handler :fi, handler_klass
-# end
+end

data/lib/fira/version.rb

@@ -1,3 +1,3 @@
 module Fira
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fira
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-22 00:00:00.000000000 Z
+date: 2013-01-23 00:00:00.000000000 Z
 dependencies: []
 description: Adds improvements to HTML syntax for id and class attributes
 email: