From 4f2f4171c06022a8d4c8645e46e96801a73e9937 Mon Sep 17 00:00:00 2001
From: unknown <Dane@.(none)>
Date: Sun, 9 Jan 2011 18:31:45 -0500
Subject: [PATCH 1/3] -Added support for web2py style templates

  *added optional template_type argument to command     line  arguments and all relevant classes/functions; django     is always default

  *generalized identifiers; replaced 'django' with 'template'        in all relevant variables

  *added full range of tests for web2py

  *added optional template_type argument to hamlpy-    watcher, defaults to django

  *no django-based functionality was changed (except     tag_name split, see final bullet)

-Added support for inline CoffeeScript tags with :coffeescript; works same as :javascript

- Converted tag_name split to use '\w+' regex instead of plain ' ' so it won't break if extra spaces are inserted
---
 .project      | 17 +++++++++++++++++
 .pydevproject |  7 +++++++
 2 files changed, 24 insertions(+)
 create mode 100644 .project
 create mode 100644 .pydevproject

diff --git a/.project b/.project
new file mode 100644
index 0000000..fda81c6
--- /dev/null
+++ b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>HamlPy</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.python.pydev.PyDevBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.python.pydev.pythonNature</nature>
+	</natures>
+</projectDescription>
diff --git a/.pydevproject b/.pydevproject
new file mode 100644
index 0000000..dd7248e
--- /dev/null
+++ b/.pydevproject
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?eclipse-pydev version="1.0"?>
+
+<pydev_project>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
+</pydev_project>

From 0604eda124e2f7f6299bf2f334abc8f04d76533e Mon Sep 17 00:00:00 2001
From: unknown <Dane@.(none)>
Date: Sun, 9 Jan 2011 19:01:16 -0500
Subject: [PATCH 2/3] -Added support for web2py style templates

*added optional template_type argument to command line arguments and all relevant classes/functions; django is always default

*generalized identifiers; replaced 'django' with 'template' in all relevant variables

*added full range of tests for web2py

*added optional template_type argument to hamlpy- watcher, defaults to django

*no django-based functionality was changed (except tag_name split, see final bullet)

-Added support for inline CoffeeScript tags with :coffeescript; works same as :javascript

- Converted tag_name split to use 'w+' regex instead of plain ' ' so it won't break if extra spaces are inserted
---
 hamlpy/elements.py                            |  6 +-
 hamlpy/hamlpy.py                              | 19 +++-
 hamlpy/hamlpy_watcher.py                      | 10 +-
 hamlpy/nodes.py                               | 90 +++++++++++++-----
 hamlpy/test/hamlpy_test.py                    | 93 +++++++++++++++++++
 hamlpy/test/node_factory_test.py              |  4 +
 hamlpy/test/template_compare_test.py          | 14 ++-
 hamlpy/test/templates/nestedWeb2pyTags.hamlpy | 10 ++
 hamlpy/test/templates/nestedWeb2pyTags.html   | 16 ++++
 .../test/templates/selfClosingWeb2py.hamlpy   |  3 +
 hamlpy/test/templates/selfClosingWeb2py.html  |  5 +
 hamlpy/test/templates/web2pyCombo.hamlpy      | 13 +++
 hamlpy/test/templates/web2pyCombo.html        | 16 ++++
 hamlpy/test/test_elements.py                  |  8 +-
 14 files changed, 266 insertions(+), 41 deletions(-)
 create mode 100644 hamlpy/test/templates/nestedWeb2pyTags.hamlpy
 create mode 100644 hamlpy/test/templates/nestedWeb2pyTags.html
 create mode 100644 hamlpy/test/templates/selfClosingWeb2py.hamlpy
 create mode 100644 hamlpy/test/templates/selfClosingWeb2py.html
 create mode 100644 hamlpy/test/templates/web2pyCombo.hamlpy
 create mode 100644 hamlpy/test/templates/web2pyCombo.html

diff --git a/hamlpy/elements.py b/hamlpy/elements.py
index d54521f..227bf8c 100644
--- a/hamlpy/elements.py
+++ b/hamlpy/elements.py
@@ -10,7 +10,7 @@ class Element(object):
     ID = '#'
     CLASS = '.'
 
-    HAML_REGEX = re.compile(r"(?P<tag>%\w+)?(?P<id>#\w*)?(?P<class>\.[\w\.-]*)*(?P<attributes>\{.*\})?(?P<selfclose>/)?(?P<django>=)?(?P<inline>[^\w\.#\{].*)?")
+    HAML_REGEX = re.compile(r"(?P<tag>%\w+)?(?P<id>#\w*)?(?P<class>\.[\w\.-]*)*(?P<attributes>\{.*\})?(?P<selfclose>/)?(?P<template>=)?(?P<inline>[^\w\.#\{].*)?")
     
     def __init__(self, haml):
         self.haml = haml
@@ -19,7 +19,7 @@ def __init__(self, haml):
         self.classes = None
         self.attributes = ''
         self.self_close = False
-        self.django_variable = False
+        self.template_variable = False
         self.inline_content = ''
         self._parse_haml()
         
@@ -31,7 +31,7 @@ def _parse_haml(self):
         self.id = self._parse_id(split_tags.get('id'))
         self.classes = ('%s %s' % (split_tags.get('class').lstrip(self.CLASS).replace('.', ' '), self._parse_class_from_attributes_dict())).strip()
         self.self_close = split_tags.get('selfclose') or self.tag in self.self_closing_tags
-        self.django_variable = split_tags.get('django') != ''
+        self.template_variable = split_tags.get('template') != ''
         self.inline_content = split_tags.get('inline').strip()
 
     def _parse_class_from_attributes_dict(self):
diff --git a/hamlpy/hamlpy.py b/hamlpy/hamlpy.py
index b10769d..c400167 100755
--- a/hamlpy/hamlpy.py
+++ b/hamlpy/hamlpy.py
@@ -2,7 +2,10 @@
 from nodes import RootNode, create_node
 
 class Compiler:
-
+    
+    def __init__(self,template_type='django'):
+        self.template_type = template_type
+    
     def process(self, raw_text):
         split_text = raw_text.strip().split('\n')
         return self.process_lines(split_text)
@@ -10,7 +13,7 @@ def process(self, raw_text):
     def process_lines(self, haml_lines):
         root = RootNode()
         for line in haml_lines:
-            haml_node = create_node(line)
+            haml_node = create_node(line, self.template_type)
             root.add_node(haml_node)
         return root.render()
 
@@ -18,18 +21,24 @@ def convert_files():
     import sys
     import codecs
     
+    template_type = 'django' #defaults to django; also supports web2py 
+    
     if len(sys.argv) < 2:
         print "Specify the input file as the first argument."
     else: 
         infile = sys.argv[1]
         haml_lines = codecs.open(infile, 'r', encoding='utf-8').read().splitlines()
-
-        compiler = Compiler()
+        
+        if len(sys.argv) == 4: template_type = sys.argv[3]
+        
+        compiler = Compiler(template_type)
         output = compiler.process_lines(haml_lines)
         
-        if len(sys.argv) == 3:
+        if len(sys.argv) >= 3:
             outfile = codecs.open(sys.argv[2], 'w', encoding='utf-8')
             outfile.write(output)
+            
+            
         else:
             print output
     
diff --git a/hamlpy/hamlpy_watcher.py b/hamlpy/hamlpy_watcher.py
index f35bd22..4f9d511 100644
--- a/hamlpy/hamlpy_watcher.py
+++ b/hamlpy/hamlpy_watcher.py
@@ -27,7 +27,8 @@ def watched_extension(extension):
 
 def watch_folder():
     """Main entry point. Expects exactly one argument (the watch folder)."""
-    if len(sys.argv) == 2:
+    """Added additional argument for template_type after adding web2py template compatibility -Dane"""
+    if len(sys.argv) >= 2:
         folder = os.path.realpath(sys.argv[1])
         print "Watching %s at refresh interval %s seconds" % (folder,CHECK_INTERVAL)
         while True:
@@ -39,7 +40,7 @@ def watch_folder():
                 sys.exit(0)
                 pass
     else:
-        print "Usage: haml-watcher.py <watch_folder>"
+        print "Usage: haml-watcher.py <watch_folder> <template_type [optional, supports django(default), web2py]>"
 
 def _watch_folder(folder):
     """Compares "modified" timestamps against the "compiled" dict, calls compiler
@@ -66,7 +67,10 @@ def compile_file(fullpath, outfile_name):
     if DEBUG:
         print "Compiling %s -> %s" % (fullpath, outfile_name)
     haml_lines = codecs.open(fullpath, 'r', encoding='utf-8').read().splitlines()
-    compiler = Compiler()
+    
+    template_type = sys.argv[2] if len(sys.argv) == 3 else 'django'
+    
+    compiler = Compiler(template_type)
     output = compiler.process_lines(haml_lines)
     outfile = codecs.open(outfile_name, 'w', encoding='utf-8')
     outfile.write(output)
diff --git a/hamlpy/nodes.py b/hamlpy/nodes.py
index ae88cab..e98d17e 100644
--- a/hamlpy/nodes.py
+++ b/hamlpy/nodes.py
@@ -12,20 +12,21 @@
 VARIABLE = '='
 TAG = '-'
 
+COFFEESCRIPT_FILTER = ':coffescript'
 JAVASCRIPT_FILTER = ':javascript'
 CSS_FILTER = ':css'
 PLAIN_FILTER = ':plain'
 
 ELEMENT_CHARACTERS = (ELEMENT, ID, CLASS)
 
-def create_node(haml_line):
+def create_node(haml_line, template_type='django'):
     stripped_line = haml_line.strip()
     
     if not stripped_line:
         return None
     
     if stripped_line[0] in ELEMENT_CHARACTERS:
-        return ElementNode(haml_line)
+        return ElementNode(haml_line, template_type)
     
     if stripped_line[0] == HTML_COMMENT:
         return CommentNode(haml_line)
@@ -34,14 +35,17 @@ def create_node(haml_line):
         return HamlCommentNode(haml_line)
     
     if stripped_line[0] == VARIABLE:
-        return VariableNode(haml_line)
+        return VariableNode(haml_line, template_type)
     
     if stripped_line[0] == TAG:
-        return TagNode(haml_line)
+        return TagNode(haml_line, template_type)
     
     if stripped_line == JAVASCRIPT_FILTER:
         return JavascriptFilterNode(haml_line)
     
+    if stripped_line == COFFEESCRIPT_FILTER:
+        return CoffeeScriptFilterNode(haml_line)
+        
     if stripped_line == CSS_FILTER:
         return CssFilterNode(haml_line)
     
@@ -100,16 +104,20 @@ def render(self):
 
 class ElementNode(HamlNode):
     
-    def __init__(self, haml):
+    web2py_omit_equals = ['extend', 'include', 'super']
+    web2py_assignment = '\w+\s*=\s*.+'
+    
+    def __init__(self, haml, template_type='django'):
         HamlNode.__init__(self, haml)
-        self.django_variable = False
+        self.template_variable = False
+        self.template_type = template_type
     
     def render(self):
         return self._render_tag()
     
     def _render_tag(self):
         element = Element(self.haml)
-        self.django_variable = element.django_variable
+        self.template_variable = element.template_variable
         return self._generate_html(element)
         
     def _generate_html(self, element):        
@@ -139,9 +147,23 @@ def _render_tag_content(self, current_tag_content):
             current_tag_content = '\n' + self.render_internal_nodes() + self.spaces
         if current_tag_content == None:
             current_tag_content = ''
-        if self.django_variable:
-            current_tag_content = "{{ " + current_tag_content.strip() + " }}"
-        current_tag_content = re.sub(r'#\{([a-zA-Z0-9\.\_]+)\}', r'{{ \1 }}', current_tag_content)
+        if self.template_variable:
+            if self.template_type == 'django':
+                current_tag_content = "{{ " + current_tag_content.strip() + " }}"
+            elif self.template_type == 'web2py':
+                w2p_content = current_tag_content.strip()
+                w2p_prepend = '' if (re.search(self.web2py_assignment, w2p_content) or re.split('\W+',w2p_content)[0] in self.web2py_omit_equals) else '='
+                current_tag_content = "{{ " + w2p_prepend + w2p_content  + " }}"
+        
+        if self.template_type == 'django':
+            sub_re = r'#\{([a-zA-Z0-9\.\_]+)\}'
+            var_sub = r'{{ \1 }}'
+        elif self.template_type == 'web2py': 
+            sub_re = r'#\{([a-zA-Z0-9\.\_]+(\(\))?)\}'
+            var_sub = r'{{ =\1 }}' 
+                
+        current_tag_content = re.sub(sub_re, var_sub, current_tag_content)
+        
         return current_tag_content
 
 
@@ -170,9 +192,9 @@ def render(self):
 
 
 class VariableNode(ElementNode):
-    def __init__(self, haml):
-        ElementNode.__init__(self, haml)
-        self.django_variable = True
+    def __init__(self, haml, template_type='django'):
+        ElementNode.__init__(self, haml, template_type)
+        self.template_variable = True
     
     def render(self):
         tag_content = self.haml.lstrip(VARIABLE)
@@ -180,31 +202,45 @@ def render(self):
 
 
 class TagNode(HamlNode):
-    self_closing = {'for':'endfor',
+    django_self_closing = {'for':'endfor',
                     'if':'endif',
                     'block':'endblock',
                     'filter':'endfilter',
                     'autoescape':'endautoescape',
                     }
-    may_contain = {'if':'else', 'for':'empty'}
+    web2py_self_closing = {'block':'end'}
+    web2py_ignore = ['elif:', 'else:', 'finally:', 'except.+:']
+    django_may_contain = {'if':'else', 'for':'empty'}
     
-    def __init__(self, haml):
+    def __init__(self, haml, template_type='django'):
         HamlNode.__init__(self, haml)
         self.tag_statement = self.haml.lstrip(TAG).strip()
-        self.tag_name = self.tag_statement.split(' ')[0]
+        self.tag_name = re.split('\W+', self.tag_statement)[0]
+        self.template_type= template_type
         
-        if (self.tag_name in self.self_closing.values()):
-            raise TypeError("Do not close your Django tags manually.  It will be done for you.")
+        if (self.tag_name in self.django_self_closing.values() + self.web2py_self_closing.values()):
+            raise TypeError("Do not close your template tags manually.  It will be done for you.")
     
     def render(self):
         internal = self.render_internal_nodes()
-        output = "%s{%% %s %%}\n%s" % (self.spaces, self.tag_statement, internal)
-        if (self.tag_name in self.self_closing.keys()):
-            output += '%s{%% %s %%}' % (self.spaces, self.self_closing[self.tag_name])
+        if self.template_type == 'django':
+            output = "%s{%% %s %%}\n%s" % (self.spaces, self.tag_statement, internal)
+            if (self.tag_name in self.django_self_closing.keys()):
+                output += '%s{%% %s %%}' % (self.spaces, self.django_self_closing[self.tag_name])
+        elif self.template_type == 'web2py':
+            output = "%s{{ %s }}\n%s" % (self.spaces, self.tag_statement, internal)
+            close_str = ''
+            
+            if self.tag_name in self.web2py_self_closing:
+               close_str = self.web2py_self_closing[self.tag_name] 
+            elif self.tag_statement[-1:] == ':' and not len([s for s in self.web2py_ignore if re.search(s, self.tag_statement)]):
+               close_str = 'pass'  
+                    
+            if close_str: output += "%s{{ %s }}" % (self.spaces, close_str)    
         return output
     
     def should_contain(self, node):
-        return isinstance(node,TagNode) and self.may_contain.get(self.tag_name,'') == node.tag_name
+        return isinstance(node,TagNode) and self.django_may_contain.get(self.tag_name,'') == node.tag_name
 
 
 class FilterNode(HamlNode):
@@ -226,7 +262,13 @@ def render(self):
         output += "".join([node.raw_haml for node in self.internal_nodes])
         output += '// ]]>\n</script>'
         return output
-        
+
+class CoffeeScriptFilterNode(FilterNode):
+    def render(self):
+        output = '<script type=\'text/coffeescript\'>\n// <![CDATA[\n'
+        output += "".join([node.raw_haml for node in self.internal_nodes])
+        output += '// ]]>\n</script>'
+        return output
         
 class CssFilterNode(FilterNode):
     def render(self):
diff --git a/hamlpy/test/hamlpy_test.py b/hamlpy/test/hamlpy_test.py
index 8db1992..c17b547 100644
--- a/hamlpy/test/hamlpy_test.py
+++ b/hamlpy/test/hamlpy_test.py
@@ -55,6 +55,20 @@ def test_django_variables_on_tag_render_properly(self):
         hamlParser = hamlpy.Compiler()
         result = hamlParser.process(haml)
         eq_(html, result.replace('\n', ''))
+        
+    def test_web2py_variables_on_tag_render_properly(self):
+        haml = '%div= story.tease'
+        html = '<div>{{ =story.tease }}</div>'
+        hamlParser = hamlpy.Compiler('web2py')
+        result = hamlParser.process(haml)
+        eq_(html, result.replace('\n', ''))
+    
+    def test_web2py_variables_fncall_on_tag_render_properly(self):
+        haml = '%div= story.get_absolute_url()'
+        html = '<div>{{ =story.get_absolute_url() }}</div>'
+        hamlParser = hamlpy.Compiler('web2py')
+        result = hamlParser.process(haml)
+        eq_(html, result.replace('\n', ''))
     
     def test_stand_alone_django_variables_render(self):
         haml = '= story.tease'
@@ -62,6 +76,20 @@ def test_stand_alone_django_variables_render(self):
         hamlParser = hamlpy.Compiler()
         result = hamlParser.process(haml)
         eq_(html, result.replace('\n', ''))
+        
+    def test_stand_alone_web2py_variables_render(self):
+        haml = '= story.tease'
+        html = '{{ =story.tease }}'
+        hamlParser = hamlpy.Compiler('web2py')
+        result = hamlParser.process(haml)
+        eq_(html, result.replace('\n', ''))
+        
+    def test_stand_alone_web2py_variables_fncall_render(self):
+        haml = '= story.tease()'
+        html = '{{ =story.tease() }}'
+        hamlParser = hamlpy.Compiler('web2py')
+        result = hamlParser.process(haml)
+        eq_(html, result.replace('\n', ''))
     
     def test_stand_alone_django_tags_render(self):
         haml = '- extends "something.html"'
@@ -70,12 +98,33 @@ def test_stand_alone_django_tags_render(self):
         result = hamlParser.process(haml)
         eq_(html, result.replace('\n', ''))
         
+    def test_stand_alone_web2py_tags_render(self):
+        haml = '- extend "something.html"'
+        html = '{{ extend "something.html" }}'
+        hamlParser = hamlpy.Compiler('web2py')
+        result = hamlParser.process(haml)
+        eq_(html, result.replace('\n', ''))
+        
+    def test_block_web2py_tags_render(self):
+        haml = '- block test\n %p hello'
+        html = '{{ block test }}\n <p>hello</p>\n{{ end }}\n'
+        hamlParser = hamlpy.Compiler('web2py')
+        result = hamlParser.process(haml)
+        eq_(html, result)
+        
     def test_if_else_django_tags_render(self):
         haml = '- if something\n   %p hello\n- else\n   %p goodbye'
         html = '{% if something %}\n   <p>hello</p>\n{% else %}\n   <p>goodbye</p>\n\n{% endif %}\n'
         hamlParser = hamlpy.Compiler()
         result = hamlParser.process(haml)
         eq_(html, result)
+        
+    def test_if_else_web2py_tags_render(self):
+        haml = '- if something:\n   %p hello\n- else:\n   %p goodbye'
+        html = '{{ if something: }}\n   <p>hello</p>\n{{ else: }}\n   <p>goodbye</p>\n\n{{ pass }}\n'
+        hamlParser = hamlpy.Compiler('web2py')
+        result = hamlParser.process(haml)
+        eq_(html, result)
     
     @raises(TypeError)   
     def test_throws_exception_when_trying_to_close_django(self):
@@ -83,6 +132,12 @@ def test_throws_exception_when_trying_to_close_django(self):
         hamlParser = hamlpy.Compiler()
         result = hamlParser.process(haml)
     
+    @raises(TypeError)    
+    def test_throws_exception_when_trying_to_close_web2py(self):
+        haml = '- end'
+        hamlParser = hamlpy.Compiler('web2py')
+        result = hamlParser.process(haml)
+    
     def test_handles_dash_in_class_name_properly(self):
         haml = '.header.span-24.last'
         html = "<div class='header span-24 last'></div>\n"
@@ -103,6 +158,13 @@ def test_inline_variables_are_parsed_correctly(self):
         hamlParser = hamlpy.Compiler()
         result = hamlParser.process(haml)
         eq_(html, result)
+        
+    def test_inline_variables_are_parsed_correctly_web2py(self):
+        haml = "%h1 Hello, #{name}, how are you?"
+        html = "<h1>Hello, {{ =name }}, how are you?</h1>\n"
+        hamlParser = hamlpy.Compiler('web2py')
+        result = hamlParser.process(haml)
+        eq_(html, result)
 
     def test_inline_variables_with_special_characters_are_parsed_correctly(self):
         haml = "%h1 Hello, #{person.name}, how are you?"
@@ -111,5 +173,36 @@ def test_inline_variables_with_special_characters_are_parsed_correctly(self):
         result = hamlParser.process(haml)
         eq_(html, result)
         
+    def test_inline_variables_with_special_characters_are_parsed_correctly_web2py(self):
+        haml = "%h1 Hello, #{person.name}, how are you?"
+        html = "<h1>Hello, {{ =person.name }}, how are you?</h1>\n"
+        hamlParser = hamlpy.Compiler('web2py')
+        result = hamlParser.process(haml)
+        eq_(html, result)
+        
+    def test_inline_fncall_parsed_correctly_web2py(self):
+        haml = "%h1 Hello, #{person.get_name()}, how are you?"
+        html = "<h1>Hello, {{ =person.get_name() }}, how are you?</h1>\n"
+        hamlParser = hamlpy.Compiler('web2py')
+        result = hamlParser.process(haml)
+        eq_(html, result)   
+    
+    def test_tag_attr_inline_fncall_parsed_correctly_web2py(self):
+        haml = "%h1 Hello, #{person.get_name()}, how are you?"
+        html = "<h1>Hello, {{ =person.get_name() }}, how are you?</h1>\n"
+        hamlParser = hamlpy.Compiler('web2py')
+        result = hamlParser.process(haml)
+        eq_(html, result)    
+    
+        
+    def test_web2py_assignment(self):
+        haml = "- test = 'test'"
+        html = "{{ test = 'test' }}"
+        hamlParser = hamlpy.Compiler('web2py')
+        result = hamlParser.process(haml)
+        eq_(html, result.replace('\n', ''))
+        
+        
+        
 if __name__ == '__main__':
     unittest.main()
\ No newline at end of file
diff --git a/hamlpy/test/node_factory_test.py b/hamlpy/test/node_factory_test.py
index 555477e..462a90f 100644
--- a/hamlpy/test/node_factory_test.py
+++ b/hamlpy/test/node_factory_test.py
@@ -48,3 +48,7 @@ def test_equals_symbol_creates_variable_node(self):
     def test_dash_symbol_creates_tag_node(self):
         node = nodes.create_node('- for something in somethings')
         assert isinstance(node, nodes.TagNode)
+        
+    def test_dash_symbol_creates_tag_node_web2py(self):
+        node = nodes.create_node('- for something in somethings:', 'web2py')
+        assert isinstance(node, nodes.TagNode)
diff --git a/hamlpy/test/template_compare_test.py b/hamlpy/test/template_compare_test.py
index 4fa463a..b121275 100644
--- a/hamlpy/test/template_compare_test.py
+++ b/hamlpy/test/template_compare_test.py
@@ -32,15 +32,25 @@ def test_self_closing_django(self):
     def test_nested_django_tags(self):
         self._compare_test_files('nestedDjangoTags')
         
+    def test_web2py_combination_of_tags(self):
+        self._compare_test_files('web2pyCombo', 'web2py')
+        
+    def test_self_closing_web2py(self):
+        self._compare_test_files('selfClosingWeb2py', 'web2py')
+        
+    def test_nested_web2py_tags(self):
+        self._compare_test_files('nestedWeb2pyTags', 'web2py')
+        
     def test_filters(self):
         self._compare_test_files('filters')
         
-    def _compare_test_files(self, name):
+    def _compare_test_files(self, name, template_type='django'):
         haml_lines = codecs.open('templates/'+name+'.hamlpy', encoding='utf-8').readlines()
         html = open('templates/'+name+'.html').read()
         
-        haml_compiler = hamlpy.Compiler()
+        haml_compiler = hamlpy.Compiler(template_type)
         parsed = haml_compiler.process_lines(haml_lines)
+            
         eq_(parsed, html)
         
 if __name__ == '__main__':
diff --git a/hamlpy/test/templates/nestedWeb2pyTags.hamlpy b/hamlpy/test/templates/nestedWeb2pyTags.hamlpy
new file mode 100644
index 0000000..2a3ffed
--- /dev/null
+++ b/hamlpy/test/templates/nestedWeb2pyTags.hamlpy
@@ -0,0 +1,10 @@
+%ul
+  - for story in story_list:
+    %li= story.text
+    - if story.author_list:
+      - for author in story.author_list:
+        .author= author
+    - else:
+      .author Anonymous
+  - if not len(story_list):
+    .error No stories found
\ No newline at end of file
diff --git a/hamlpy/test/templates/nestedWeb2pyTags.html b/hamlpy/test/templates/nestedWeb2pyTags.html
new file mode 100644
index 0000000..9336548
--- /dev/null
+++ b/hamlpy/test/templates/nestedWeb2pyTags.html
@@ -0,0 +1,16 @@
+<ul>
+  {{ for story in story_list: }}
+    <li>{{ =story.text }}</li>
+    {{ if story.author_list: }}
+      {{ for author in story.author_list: }}
+        <div class='author'>{{ =author }}</div>
+      {{ pass }}
+    {{ else: }}
+      <div class='author'>Anonymous</div>
+
+    {{ pass }}
+  {{ pass }}
+  {{ if not len(story_list): }}
+    <div class='error'>No stories found</div>
+  {{ pass }}
+</ul>
diff --git a/hamlpy/test/templates/selfClosingWeb2py.hamlpy b/hamlpy/test/templates/selfClosingWeb2py.hamlpy
new file mode 100644
index 0000000..95475f1
--- /dev/null
+++ b/hamlpy/test/templates/selfClosingWeb2py.hamlpy
@@ -0,0 +1,3 @@
+%ul
+  - for story in story_list:
+    %li= story.text
diff --git a/hamlpy/test/templates/selfClosingWeb2py.html b/hamlpy/test/templates/selfClosingWeb2py.html
new file mode 100644
index 0000000..6506f10
--- /dev/null
+++ b/hamlpy/test/templates/selfClosingWeb2py.html
@@ -0,0 +1,5 @@
+<ul>
+  {{ for story in story_list: }}
+    <li>{{ =story.text }}</li>
+  {{ pass }}
+</ul>
diff --git a/hamlpy/test/templates/web2pyCombo.hamlpy b/hamlpy/test/templates/web2pyCombo.hamlpy
new file mode 100644
index 0000000..c5f0ef1
--- /dev/null
+++ b/hamlpy/test/templates/web2pyCombo.hamlpy
@@ -0,0 +1,13 @@
+- extend "base_generic.html"
+
+- block title
+  = section.title
+
+- block content
+  %h1= section.title
+
+  - for story in story_list:
+    %h2
+      %a{'href':'{{ =story.get_absolute_url() }}'}
+        = story.headline.upper()
+    %p= ' '.join(story.tease.split(' ')[:100])
diff --git a/hamlpy/test/templates/web2pyCombo.html b/hamlpy/test/templates/web2pyCombo.html
new file mode 100644
index 0000000..b782515
--- /dev/null
+++ b/hamlpy/test/templates/web2pyCombo.html
@@ -0,0 +1,16 @@
+{{ extend "base_generic.html" }}
+
+{{ block title }}
+  {{ =section.title }}
+{{ end }}
+{{ block content }}
+  <h1>{{ =section.title }}</h1>
+  {{ for story in story_list: }}
+    <h2>
+      <a href='{{ =story.get_absolute_url() }}'>
+        {{ =story.headline.upper() }}
+      </a>
+    </h2>
+    <p>{{ =' '.join(story.tease.split(' ')[:100]) }}</p>
+  {{ pass }}
+{{ end }}
diff --git a/hamlpy/test/test_elements.py b/hamlpy/test/test_elements.py
index 3c749a7..eb9e98f 100644
--- a/hamlpy/test/test_elements.py
+++ b/hamlpy/test/test_elements.py
@@ -72,13 +72,13 @@ def test_can_close_a_non_self_closing_tag(self):
             sut = Element("%div/")
             assert sut.self_close
             
-        def test_properly_detects_django_tag(self):
+        def test_properly_detects_template_tag(self):
             sut = Element("%div= $someVariable")
-            assert sut.django_variable
+            assert sut.template_variable
             
-        def test_knows_when_its_not_django_tag(self):
+        def test_knows_when_its_not_template_tag(self):
             sut = Element("%div Some Text")
-            assert sut.django_variable == False
+            assert sut.template_variable == False
             
         def test_grabs_inline_tag_content(self):
             sut = Element("%div Some Text")

From bbd41ef1c200ea3fec63878b50dc0d7caa74caa6 Mon Sep 17 00:00:00 2001
From: unknown <Dane@.(none)>
Date: Sun, 9 Jan 2011 19:08:20 -0500
Subject: [PATCH 3/3]  Cleaning up some project files... new to git, sorry

---
 .project      | 17 -----------------
 .pydevproject |  7 -------
 2 files changed, 24 deletions(-)
 delete mode 100644 .project
 delete mode 100644 .pydevproject

diff --git a/.project b/.project
deleted file mode 100644
index fda81c6..0000000
--- a/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>HamlPy</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.python.pydev.PyDevBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.python.pydev.pythonNature</nature>
-	</natures>
-</projectDescription>
diff --git a/.pydevproject b/.pydevproject
deleted file mode 100644
index dd7248e..0000000
--- a/.pydevproject
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?eclipse-pydev version="1.0"?>
-
-<pydev_project>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
-</pydev_project>