Feature/interpolation

pyjade/compiler.py

@@ -184,7 +184,10 @@ def visitTag(self,tag):
                     raise Exception('%s is self closing and should not have content.' % name)
                 closed = True
 
-        self.buffer('<%s' % name)
+        if tag.buffer:
+            self.buffer('<' + self.interpolate(name))
+        else:
+            self.buffer('<%s' % name)
         self.visitAttributes(tag.attrs)
         self.buffer('/>' if not self.terse and closed else '>')
 
@@ -200,7 +203,10 @@ def visitTag(self,tag):
             if self.pp and not name in self.inlineTags and not textOnly:
                 self.buffer('\n' + '  ' * (self.indents-1))
 
-            self.buffer('</%s>' % name)
+            if tag.buffer:
+                self.buffer('</' + self.interpolate(name) + '>')
+            else:
+                self.buffer('</%s>' % name)
         self.indents -= 1
 
     def visitFilter(self,filter):

pyjade/ext/html.py

@@ -64,6 +64,8 @@ def _mixin(self, args):
                 arg_values = self._do_eval(args)
             else:
                 arg_values = []
+            if not isinstance(arg_values, (list, tuple)):
+                arg_values = [arg_values]
             local_context = dict(zip(arg_names, arg_values))
             with local_context_manager(self, local_context):
                 self.visitBlock(mixin.block)

pyjade/lexer.py

@@ -56,7 +56,7 @@ def replace_string_brackets(splitted_string):
 class Lexer(object):
     RE_INPUT = re.compile(r'\r\n|\r')
     RE_COMMENT = re.compile(r'^ *\/\/(-)?([^\n]*)')
-    RE_TAG = re.compile(r'^(\w[-:\w]*)')
+    RE_TAG = re.compile(r'^(\w[-:\w]*|#\{.*?\})')
     RE_DOT_BLOCK_START = re.compile(r'^\.\n')
     RE_FILTER = re.compile(r'^:(\w+)')
     RE_DOCTYPE = re.compile(r'^(?:!!!|doctype) *([^\n]+)?')

pyjade/nodes.py

@@ -105,14 +105,15 @@ def __init__(self,str):
 		self.str = str.replace('\\','\\\\')
 
 class Tag(Node):
-	def __init__(self,name, block=None, inline=False):
+	def __init__(self,name, block=None, inline=False, buffer=False):
 		self.name = name
 		self.textOnly = False
 		self.code = None
 		self.text = None
 		self._attrs = []
 		self.inline = inline
 		self.block = block or Block()
+		self.buffer = buffer
 
 	@classmethod
 	def static(self, string, only_remove=False):

pyjade/parser.py

@@ -284,7 +284,7 @@ def parseTag(self):
                                 (self.filename, self.line()))
 
         tok = self.advance()
-        tag = nodes.Tag(tok.val)
+        tag = nodes.Tag(tok.val, buffer=tok.val[0] == '#')
         tag.inline_level = tok.inline_level
         dot = None
 

pyjade/testsuite/cases/interpolation.html

@@ -0,0 +1,2 @@
+<p href="blah" id="junk1" class="doggy">Hello World</p>
+<div href="blah" id="junk2" class="doggy">Hello World</div>

pyjade/testsuite/cases/interpolation.jade

@@ -0,0 +1,8 @@
+mixin something(element,id)
+  #{element}(href='blah',id='junk#{id}').doggy Hello World
+
+mixin something2(id)
+  +something('div',id)
+
++something('p',1)
++something2(2)