mirror of
https://github.com/haml/haml.git
synced 2022-11-09 12:33:31 -05:00
Finally getting a good bit of stability to the hauss!
git-svn-id: svn://hamptoncatlin.com/haml/trunk@6 7063305b-7217-0410-af8c-cdc13e5119b9
This commit is contained in:
parent
20bc1c314d
commit
60b2298346
1 changed files with 44 additions and 14 deletions
58
lib/haml.rb
58
lib/haml.rb
|
@ -14,6 +14,10 @@ module HAML
|
||||||
def render(template = "", locals = {})
|
def render(template = "", locals = {})
|
||||||
@result = ""
|
@result = ""
|
||||||
@to_close_queue = []
|
@to_close_queue = []
|
||||||
|
|
||||||
|
locals.each do |variable_name, value|
|
||||||
|
@base.instance_eval "@" + variable_name.to_s + " = value"
|
||||||
|
end
|
||||||
|
|
||||||
#main loop handling line reading
|
#main loop handling line reading
|
||||||
#and interpretation
|
#and interpretation
|
||||||
|
@ -22,8 +26,9 @@ module HAML
|
||||||
@result << %|<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\n|
|
@result << %|<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\n|
|
||||||
else
|
else
|
||||||
count, line = count_levels(line)
|
count, line = count_levels(line)
|
||||||
|
#puts count.to_s + "::" + line
|
||||||
if count <= @to_close_queue.size && @to_close_queue.size > 0
|
if count <= @to_close_queue.size && @to_close_queue.size > 0
|
||||||
close_tag
|
(@to_close_queue.size - count).times { close_tag }
|
||||||
end
|
end
|
||||||
case line.first
|
case line.first
|
||||||
when '.', '#'
|
when '.', '#'
|
||||||
|
@ -55,11 +60,22 @@ module HAML
|
||||||
end
|
end
|
||||||
|
|
||||||
def open_tag(name, attributes = {})
|
def open_tag(name, attributes = {})
|
||||||
attribute_array = attributes.collect do |attr_name, val|
|
add "<#{name.to_s}#{build_attributes(attributes)}>"
|
||||||
attr_name.to_s + "='" + val + "'"
|
@to_close_queue.push(name)
|
||||||
end
|
end
|
||||||
add "<#{name.to_s}#{attribute_array.empty? ? "" : " "}#{attribute_array.join(" ")}>"
|
|
||||||
@to_close_queue.push(name)
|
def one_line_tag(name, value, attributes = {})
|
||||||
|
add "<#{name.to_s}#{build_attributes(attributes)}>#{value}</#{name.to_s}>"
|
||||||
|
end
|
||||||
|
|
||||||
|
#used to create single line tags... aka <hello />
|
||||||
|
def atomic_tag(name, attributes = {})
|
||||||
|
add "<#{name.to_s}#{build_attributes(attributes)} />"
|
||||||
|
end
|
||||||
|
|
||||||
|
def build_attributes(attributes = {})
|
||||||
|
return "" if attributes.empty?
|
||||||
|
" " + (attributes.collect { |attr_name, val| attr_name.to_s + "='" + val + "'" }).join(" ")
|
||||||
end
|
end
|
||||||
|
|
||||||
def close_tag
|
def close_tag
|
||||||
|
@ -75,15 +91,29 @@ module HAML
|
||||||
end
|
end
|
||||||
|
|
||||||
def render_tag(line)
|
def render_tag(line)
|
||||||
line.scan(/[%]([-_a-z1-9]+)([-_a-z.\#]*)([=]?)([^\n]*)/).each do |tag_name, attributes, action, value|
|
line.scan(/[%]([-_a-z1-9]+)([-_a-z\.\#]*)([=\/]?)([^\n]*)/).each do |tag_name, attributes, action, value|
|
||||||
val = template_eval(value)
|
val = template_eval(value)
|
||||||
attribute_hash = parse_attributes(attributes)
|
attribute_hash = parse_attributes(attributes)
|
||||||
attribute_hash.merge!(val) && val = nil if val.class == Hash
|
if val.class == Hash
|
||||||
open_tag(tag_name, attribute_hash)
|
attribute_hash.merge!(val) && val = nil
|
||||||
|
elsif !val.nil?
|
||||||
if(action == '=')
|
val = val.to_s
|
||||||
add(val)
|
end
|
||||||
close_tag
|
|
||||||
|
#check to see if we're a one liner
|
||||||
|
if(action == "\/")
|
||||||
|
atomic_tag(tag_name, attribute_hash)
|
||||||
|
else
|
||||||
|
if(!val.nil? && ((val.length < 50) || val.scan(/\n/).empty?))
|
||||||
|
one_line_tag(tag_name, val, attribute_hash)
|
||||||
|
else
|
||||||
|
open_tag(tag_name, attribute_hash)
|
||||||
|
|
||||||
|
if(action == '=')
|
||||||
|
add(val)
|
||||||
|
close_tag
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -106,7 +136,7 @@ module HAML
|
||||||
end
|
end
|
||||||
|
|
||||||
def count_levels(line)
|
def count_levels(line)
|
||||||
[line.index(/[^ ]/), line.strip]
|
[line.index(/[^ ]/)/2, line.strip]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue