From 5b36d03d24b84256db903d768524d59f9f852df6 Mon Sep 17 00:00:00 2001
From: Rowan Seymour <rowanseymour@gmail.com>
Date: Wed, 2 Nov 2016 15:02:16 +0200
Subject: [PATCH 1/5] Makes ={...} syntax optional and reworks node classes to
 make it easier to access options in different classes

---
 hamlpy/hamlpy.py                 |  23 ++++--
 hamlpy/nodes.py                  | 134 ++++++++++++++++++-------------
 hamlpy/template/loaders.py       |  11 ++-
 hamlpy/test/test_compiler.py     |   8 +-
 hamlpy/test/test_hamlnode.py     |  51 ++++++------
 hamlpy/test/test_loader.py       |   8 +-
 hamlpy/test/test_node_factory.py |  39 +++++----
 readme.md                        |   2 +
 8 files changed, 163 insertions(+), 113 deletions(-)

diff --git a/hamlpy/hamlpy.py b/hamlpy/hamlpy.py
index f358a8b..d1dab41 100755
--- a/hamlpy/hamlpy.py
+++ b/hamlpy/hamlpy.py
@@ -7,26 +7,32 @@
 
 VALID_EXTENSIONS=['haml', 'hamlpy']
 
-class Compiler:
+DEFAULT_OPTIONS = {
+    'attr_wrapper': '\'',                    # how to render attribute values, e.g. foo='bar'
+    'inline_variable_prefixes': ['#', '='],  # support both #{...} and ={...}
+    'debug_tree': False
+}
+
 
+class Compiler:
     def __init__(self, options_dict=None):
-        options_dict = options_dict or {}
-        self.debug_tree = options_dict.pop('debug_tree', False)
-        self.options_dict = options_dict
+        self.options = DEFAULT_OPTIONS.copy()
+        if options_dict:
+            self.options.update(options_dict)
 
     def process(self, raw_text):
         split_text = raw_text.split('\n')
         return self.process_lines(split_text)
 
     def process_lines(self, haml_lines):
-        root = RootNode(**self.options_dict)
+        root = RootNode(self.options)
         line_iter = iter(haml_lines)
 
         haml_node=None
         for line_number, line in enumerate(line_iter):
             node_lines = line
 
-            if not root.parent_of(HamlNode(line)).inside_filter_node():
+            if not root.parent_of(HamlNode(line, self.options)).inside_filter_node():
                 if line.count('{') - line.count('}') == 1:
                     start_multiline=line_number # For exception handling
 
@@ -41,15 +47,16 @@ def process_lines(self, haml_lines):
             if haml_node is not None and len(node_lines.strip()) == 0:
                 haml_node.newlines += 1
             else:
-                haml_node = create_node(node_lines)
+                haml_node = create_node(node_lines, self.options)
                 if haml_node:
                     root.add_node(haml_node)
 
-        if self.options_dict and self.options_dict.get('debug_tree'):
+        if self.options['debug_tree']:
             return root.debug_tree()
         else:
             return root.render()
 
+
 def convert_files():
     import codecs
 
diff --git a/hamlpy/nodes.py b/hamlpy/nodes.py
index e799b76..e778a62 100644
--- a/hamlpy/nodes.py
+++ b/hamlpy/nodes.py
@@ -40,9 +40,6 @@ class NotAvailableError(Exception):
 VARIABLE = '='
 TAG = '-'
 
-INLINE_VARIABLE = re.compile(r'(?<!\\)([#=]\{\s*(.+?)\s*\})')
-ESCAPED_INLINE_VARIABLE = re.compile(r'\\([#=]\{\s*(.+?)\s*\})')
-
 COFFEESCRIPT_FILTERS = [':coffeescript', ':coffee']
 JAVASCRIPT_FILTER = ':javascript'
 CSS_FILTER = ':css'
@@ -57,71 +54,94 @@ class NotAvailableError(Exception):
 
 HAML_ESCAPE = '\\'
 
-def create_node(haml_line):
+
+_inline_variable_regexes = None
+
+
+def get_inline_variable_regex(options):
+    """
+    Generates regular expressions for inline variables and escaped inline variables, based on compiler options
+    """
+    global _inline_variable_regexes
+
+    if not _inline_variable_regexes:
+        prefixes = ''.join(options['inline_variable_prefixes'])
+        _inline_variable_regexes = (
+            re.compile(r'(?<!\\)([' + prefixes + r']\{\s*(.+?)\s*\})'),
+            re.compile(r'\\([' + prefixes + r']\{\s*(.+?)\s*\})')
+        )
+    return _inline_variable_regexes
+
+
+def create_node(haml_line, options):
     stripped_line = haml_line.strip()
 
     if len(stripped_line) == 0:
         return None
 
-    if re.match(INLINE_VARIABLE, stripped_line) or re.match(ESCAPED_INLINE_VARIABLE, stripped_line):
-        return PlaintextNode(haml_line)
+    inline_var_regex, escaped_var_regex = get_inline_variable_regex(options)
+
+    if re.match(inline_var_regex, stripped_line) or re.match(escaped_var_regex, stripped_line):
+        return PlaintextNode(haml_line, options)
 
     if stripped_line[0] == HAML_ESCAPE:
-        return PlaintextNode(haml_line)
+        return PlaintextNode(haml_line, options)
 
     if stripped_line.startswith(DOCTYPE):
-        return DoctypeNode(haml_line)
+        return DoctypeNode(haml_line, options)
 
     if stripped_line[0] in ELEMENT_CHARACTERS:
-        return ElementNode(haml_line)
+        return ElementNode(haml_line, options)
 
     if stripped_line[0:len(CONDITIONAL_COMMENT)] == CONDITIONAL_COMMENT:
-        return ConditionalCommentNode(haml_line)
+        return ConditionalCommentNode(haml_line, options)
 
     if stripped_line[0] == HTML_COMMENT:
-        return CommentNode(haml_line)
+        return CommentNode(haml_line, options)
 
     for comment_prefix in HAML_COMMENTS:
         if stripped_line.startswith(comment_prefix):
-            return HamlCommentNode(haml_line)
+            return HamlCommentNode(haml_line, options)
 
     if stripped_line[0] == VARIABLE:
-        return VariableNode(haml_line)
+        return VariableNode(haml_line, options)
 
     if stripped_line[0] == TAG:
-        return TagNode(haml_line)
+        return TagNode(haml_line, options)
 
     if stripped_line == JAVASCRIPT_FILTER:
-        return JavascriptFilterNode(haml_line)
+        return JavascriptFilterNode(haml_line, options)
 
     if stripped_line in COFFEESCRIPT_FILTERS:
-        return CoffeeScriptFilterNode(haml_line)
+        return CoffeeScriptFilterNode(haml_line, options)
 
     if stripped_line == CSS_FILTER:
-        return CssFilterNode(haml_line)
+        return CssFilterNode(haml_line, options)
 
     if stripped_line == STYLUS_FILTER:
-        return StylusFilterNode(haml_line)
+        return StylusFilterNode(haml_line, options)
 
     if stripped_line == PLAIN_FILTER:
-        return PlainFilterNode(haml_line)
+        return PlainFilterNode(haml_line, options)
 
     if stripped_line == PYTHON_FILTER:
-        return PythonFilterNode(haml_line)
+        return PythonFilterNode(haml_line, options)
 
     if stripped_line == CDATA_FILTER:
-        return CDataFilterNode(haml_line)
+        return CDataFilterNode(haml_line, options)
 
     if stripped_line == PYGMENTS_FILTER:
-        return PygmentsFilterNode(haml_line)
+        return PygmentsFilterNode(haml_line, options)
 
     if stripped_line == MARKDOWN_FILTER:
-        return MarkdownFilterNode(haml_line)
+        return MarkdownFilterNode(haml_line, options)
 
-    return PlaintextNode(haml_line)
+    return PlaintextNode(haml_line, options)
 
 class TreeNode(object):
-    ''' Generic parent/child tree class'''
+    """
+    Generic parent/child tree class
+    """
     def __init__(self):
         self.parent = None
         self.children = []
@@ -141,8 +161,11 @@ def add_child(self, child):
         self.children.append(child)
 
 class RootNode(TreeNode):
-    def __init__(self, attr_wrapper="'"):
-        TreeNode.__init__(self)
+    def __init__(self, options):
+        super(RootNode, self).__init__()
+
+        self.options = options
+
         self.indentation = -2
         # Number of empty lines to render after node
         self.newlines = 0
@@ -153,14 +176,6 @@ def __init__(self, attr_wrapper="'"):
         # Indicates that a node does not render anything (for whitespace removal)
         self.empty_node = False
 
-        # Options
-        self.attr_wrapper = attr_wrapper
-
-    def add_child(self, child):
-        '''Add child node, and copy all options to it'''
-        super(RootNode, self).add_child(child)
-        child.attr_wrapper = self.attr_wrapper
-
     def render(self):
         # Render (sets self.before and self.after)
         self._render_children()
@@ -231,16 +246,20 @@ def __repr__(self):
         return '(%s)' % (self.__class__)
 
 class HamlNode(RootNode):
-    def __init__(self, haml):
-        RootNode.__init__(self)
+    def __init__(self, haml, options):
+        super(HamlNode, self).__init__(options)
+
+        RootNode.__init__(self, options)
         self.haml = haml.strip()
         self.raw_haml = haml
         self.indentation = (len(haml) - len(haml.lstrip()))
         self.spaces = ''.join(haml[0] for i in range(self.indentation))
 
     def replace_inline_variables(self, content):
-        content = re.sub(INLINE_VARIABLE, r'{{ \2 }}', content)
-        content = re.sub(ESCAPED_INLINE_VARIABLE, r'\1', content)
+        inline_var_regex, escaped_var_regex = get_inline_variable_regex(self.options)
+
+        content = re.sub(inline_var_regex, r'{{ \2 }}', content)
+        content = re.sub(escaped_var_regex, r'\1', content)
         return content
 
     def __repr__(self):
@@ -263,12 +282,13 @@ def _render(self):
 
 class ElementNode(HamlNode):
     '''Node which represents a HTML tag'''
-    def __init__(self, haml):
-        HamlNode.__init__(self, haml)
+    def __init__(self, haml, options):
+        super(ElementNode, self).__init__(haml, options)
+
         self.django_variable = False
 
     def _render(self):
-        self.element = Element(self.haml, self.attr_wrapper)
+        self.element = Element(self.haml, self.options['attr_wrapper'])
         self.django_variable = self.element.django_variable
         self.before = self._render_before(self.element)
         self.after = self._render_after(self.element)
@@ -389,10 +409,11 @@ def _render(self):
 
         parts = doctype.split()
         if parts and parts[0] == "XML":
+            attr_wrapper = self.options['attr_wrapper']
             encoding = parts[1] if len(parts) > 1 else 'utf-8'
             self.before = "<?xml version=%s1.0%s encoding=%s%s%s ?>" % (
-                self.attr_wrapper, self.attr_wrapper,
-                self.attr_wrapper, encoding, self.attr_wrapper,
+                attr_wrapper, attr_wrapper,
+                attr_wrapper, encoding, attr_wrapper,
             )
         else:
             types = {
@@ -416,8 +437,9 @@ def _post_render(self):
         pass
 
 class VariableNode(ElementNode):
-    def __init__(self, haml):
-        ElementNode.__init__(self, haml)
+    def __init__(self, haml, options):
+        super(VariableNode, self).__init__(haml, options)
+
         self.django_variable = True
 
     def _render(self):
@@ -453,8 +475,9 @@ class TagNode(HamlNode):
                    'for':'empty',
                    'with':'with'}
 
-    def __init__(self, haml):
-        HamlNode.__init__(self, haml)
+    def __init__(self, haml, options):
+        super(TagNode, self).__init__(haml, options)
+
         self.tag_statement = self.haml.lstrip(TAG).strip()
         self.tag_name = self.tag_statement.split(' ')[0]
 
@@ -476,7 +499,6 @@ def _render(self):
     def should_contain(self, node):
         return isinstance(node, TagNode) and node.tag_name in self.may_contain.get(self.tag_name, '')
 
-
 class FilterNode(HamlNode):
     def add_node(self, node):
         self.add_child(node)
@@ -500,10 +522,10 @@ def _post_render(self):
         # Don't post-render children of filter nodes as we don't want them to be interpreted as HAML
         pass
 
-
 class PlainFilterNode(FilterNode):
-    def __init__(self, haml):
-        FilterNode.__init__(self, haml)
+    def __init__(self, haml, options):
+        super(PlainFilterNode, self).__init__(haml, options)
+
         self.empty_node = True
 
     def _render(self):
@@ -539,7 +561,7 @@ def _render(self):
 class JavascriptFilterNode(FilterNode):
     def _render(self):
         self.before = '<script type=%(attr_wrapper)stext/javascript%(attr_wrapper)s>\n// <![CDATA[%(new_lines)s' % {
-            'attr_wrapper': self.attr_wrapper,
+            'attr_wrapper': self.options['attr_wrapper'],
             'new_lines': self.render_newlines(),
         }
         self.after = '// ]]>\n</script>\n'
@@ -548,7 +570,7 @@ def _render(self):
 class CoffeeScriptFilterNode(FilterNode):
     def _render(self):
         self.before = '<script type=%(attr_wrapper)stext/coffeescript%(attr_wrapper)s>\n#<![CDATA[%(new_lines)s' % {
-            'attr_wrapper': self.attr_wrapper,
+            'attr_wrapper': self.options['attr_wrapper'],
             'new_lines': self.render_newlines(),
         }
         self.after = '#]]>\n</script>\n'
@@ -557,7 +579,7 @@ def _render(self):
 class CssFilterNode(FilterNode):
     def _render(self):
         self.before = '<style type=%(attr_wrapper)stext/css%(attr_wrapper)s>\n/*<![CDATA[*/%(new_lines)s' % {
-            'attr_wrapper': self.attr_wrapper,
+            'attr_wrapper': self.options['attr_wrapper'],
             'new_lines': self.render_newlines(),
         }
         self.after = '/*]]>*/\n</style>\n'
@@ -566,7 +588,7 @@ def _render(self):
 class StylusFilterNode(FilterNode):
     def _render(self):
         self.before = '<style type=%(attr_wrapper)stext/stylus%(attr_wrapper)s>\n/*<![CDATA[*/%(new_lines)s' % {
-            'attr_wrapper': self.attr_wrapper,
+            'attr_wrapper': self.options['attr_wrapper'],
             'new_lines': self.render_newlines(),
         }
         self.after = '/*]]>*/\n</style>\n'
diff --git a/hamlpy/template/loaders.py b/hamlpy/template/loaders.py
index 6a393e4..6e8213e 100644
--- a/hamlpy/template/loaders.py
+++ b/hamlpy/template/loaders.py
@@ -10,10 +10,13 @@
 from hamlpy.template.utils import get_django_template_loaders
 
 # Get options from Django settings
-options_dict = {}
+options = {}
 
 if hasattr(settings, 'HAMLPY_ATTR_WRAPPER'):
-    options_dict.update(attr_wrapper=settings.HAMLPY_ATTR_WRAPPER)
+    options.update(attr_wrapper=settings.HAMLPY_ATTR_WRAPPER)
+
+if hasattr(settings, 'HAMLPY_INLINE_VARIABLE_PREFIXES'):
+    options.update(inline_variable_prefixes=settings.HAMLPY_INLINE_VARIABLE_PREFIXES)
 
 
 def get_haml_loader(loader):
@@ -26,7 +29,7 @@ def get_contents(self, origin):
             extension = _extension.lstrip('.')
 
             if extension in hamlpy.VALID_EXTENSIONS:
-                compiler = hamlpy.Compiler(options_dict=options_dict)
+                compiler = hamlpy.Compiler(options_dict=options)
                 return compiler.process(contents)
 
             return contents
@@ -45,7 +48,7 @@ def load_template_source(self, template_name, *args, **kwargs):
                 except TemplateDoesNotExist:
                     pass
                 else:
-                    hamlParser = hamlpy.Compiler(options_dict=options_dict)
+                    hamlParser = hamlpy.Compiler(options_dict=options)
                     html = hamlParser.process(haml_source)
 
                     return html, template_path
diff --git a/hamlpy/test/test_compiler.py b/hamlpy/test/test_compiler.py
index 0513e16..0194507 100755
--- a/hamlpy/test/test_compiler.py
+++ b/hamlpy/test/test_compiler.py
@@ -3,7 +3,7 @@
 
 import unittest
 
-from hamlpy import hamlpy
+from hamlpy import hamlpy, nodes
 
 
 class CompilerTest(unittest.TestCase):
@@ -101,6 +101,10 @@ def test_django_variables(self):
         self._test("\\={name}, how are you?", "={name}, how are you?")
         self._test("\\#{name}, how are you?", "#{name}, how are you?")
 
+        # can disable use of ={...} syntax
+        options = {'inline_variable_prefixes': ['#']}
+        self._test("Dear ={title} #{name} href={{ var }}", "Dear ={title} {{ name }} href={{ var }}", options)
+
     def test_django_tags(self):
         # if/else
         self._test('- if something\n   %p hello\n- else\n   %p goodbye',
@@ -162,6 +166,8 @@ def test_attr_wrapper(self):
 </script>''', options={'attr_wrapper': '"'})
 
     def _test(self, haml, expected_html, options=None):
+        nodes._inline_variable_regexes = None  # clear cached regexes
+
         parser = hamlpy.Compiler(options)
         result = parser.process(haml)
 
diff --git a/hamlpy/test/test_hamlnode.py b/hamlpy/test/test_hamlnode.py
index 594daed..813080f 100644
--- a/hamlpy/test/test_hamlnode.py
+++ b/hamlpy/test/test_hamlnode.py
@@ -3,50 +3,51 @@
 import unittest
 
 from hamlpy import nodes
+from hamlpy import hamlpy
 
 
 class ElementNodeTest(unittest.TestCase):
     def test_calculates_indentation_properly(self):
-        no_indentation = nodes.ElementNode('%div')
+        no_indentation = nodes.ElementNode('%div', hamlpy.DEFAULT_OPTIONS)
         self.assertEqual(0, no_indentation.indentation)
         
-        three_indentation = nodes.ElementNode('   %div')
+        three_indentation = nodes.ElementNode('   %div', hamlpy.DEFAULT_OPTIONS)
         self.assertEqual(3, three_indentation.indentation)
         
-        six_indentation = nodes.ElementNode('      %div')
+        six_indentation = nodes.ElementNode('      %div', hamlpy.DEFAULT_OPTIONS)
         self.assertEqual(6, six_indentation.indentation)
 
     def test_indents_tabs_properly(self):
-        no_indentation = nodes.ElementNode('%div')
+        no_indentation = nodes.ElementNode('%div', hamlpy.DEFAULT_OPTIONS)
         self.assertEqual('', no_indentation.spaces)
 
-        one_tab = nodes.HamlNode('	%div')
+        one_tab = nodes.HamlNode('	%div', hamlpy.DEFAULT_OPTIONS)
         self.assertEqual('\t', one_tab.spaces)
 
-        one_space = nodes.HamlNode(' %div')
+        one_space = nodes.HamlNode(' %div', hamlpy.DEFAULT_OPTIONS)
         self.assertEqual(' ', one_space.spaces)
 
-        three_tabs = nodes.HamlNode('			%div')
+        three_tabs = nodes.HamlNode('			%div', hamlpy.DEFAULT_OPTIONS)
         self.assertEqual('\t\t\t', three_tabs.spaces)
 
-        tab_space = nodes.HamlNode('	 %div')
+        tab_space = nodes.HamlNode('	 %div', hamlpy.DEFAULT_OPTIONS)
         self.assertEqual('\t\t', tab_space.spaces)
 
-        space_tab = nodes.HamlNode(' 	%div')
+        space_tab = nodes.HamlNode(' 	%div', hamlpy.DEFAULT_OPTIONS)
         self.assertEqual('  ', space_tab.spaces)
 
     def test_lines_are_always_stripped_of_whitespace(self):
-        some_space = nodes.ElementNode('   %div')
+        some_space = nodes.ElementNode('   %div', hamlpy.DEFAULT_OPTIONS)
         self.assertEqual('%div', some_space.haml)
         
-        lots_of_space = nodes.ElementNode('      %div    ')
+        lots_of_space = nodes.ElementNode('      %div    ', hamlpy.DEFAULT_OPTIONS)
         self.assertEqual('%div', lots_of_space.haml)
     
     def test_inserts_nodes_into_proper_tree_depth(self):
-        no_indentation_node = nodes.ElementNode('%div')
-        one_indentation_node = nodes.ElementNode(' %div')
-        two_indentation_node = nodes.ElementNode('  %div')
-        another_one_indentation_node = nodes.ElementNode(' %div')
+        no_indentation_node = nodes.ElementNode('%div', hamlpy.DEFAULT_OPTIONS)
+        one_indentation_node = nodes.ElementNode(' %div', hamlpy.DEFAULT_OPTIONS)
+        two_indentation_node = nodes.ElementNode('  %div', hamlpy.DEFAULT_OPTIONS)
+        another_one_indentation_node = nodes.ElementNode(' %div', hamlpy.DEFAULT_OPTIONS)
         
         no_indentation_node.add_node(one_indentation_node)
         no_indentation_node.add_node(two_indentation_node)
@@ -57,10 +58,10 @@ def test_inserts_nodes_into_proper_tree_depth(self):
         self.assertEqual(another_one_indentation_node, no_indentation_node.children[1])
     
     def test_adds_multiple_nodes_to_one(self):
-        start = nodes.ElementNode('%div')
-        one = nodes.ElementNode('  %div')
-        two = nodes.ElementNode('  %div')
-        three = nodes.ElementNode('  %div')
+        start = nodes.ElementNode('%div', hamlpy.DEFAULT_OPTIONS)
+        one = nodes.ElementNode('  %div', hamlpy.DEFAULT_OPTIONS)
+        two = nodes.ElementNode('  %div', hamlpy.DEFAULT_OPTIONS)
+        three = nodes.ElementNode('  %div', hamlpy.DEFAULT_OPTIONS)
         
         start.add_node(one)
         start.add_node(two)
@@ -69,13 +70,13 @@ def test_adds_multiple_nodes_to_one(self):
         self.assertEqual(3, len(start.children))
 
     def test_node_parent_function(self):
-        root = nodes.ElementNode('%div.a')
+        root = nodes.ElementNode('%div.a', hamlpy.DEFAULT_OPTIONS)
         elements = [
-            {'node': nodes.ElementNode('  %div.b'), 'expected_parent': 'root'},
-            {'node': nodes.ElementNode('  %div.c'), 'expected_parent': 'root'},
-            {'node': nodes.ElementNode('    %div.d'), 'expected_parent': 'elements[1]["node"]'},
-            {'node': nodes.ElementNode('      %div.e'), 'expected_parent': 'elements[2]["node"]'},
-            {'node': nodes.ElementNode('  %div.f'), 'expected_parent': 'root'},
+            {'node': nodes.ElementNode('  %div.b', hamlpy.DEFAULT_OPTIONS), 'expected_parent': 'root'},
+            {'node': nodes.ElementNode('  %div.c', hamlpy.DEFAULT_OPTIONS), 'expected_parent': 'root'},
+            {'node': nodes.ElementNode('    %div.d', hamlpy.DEFAULT_OPTIONS), 'expected_parent': 'elements[1]["node"]'},
+            {'node': nodes.ElementNode('      %div.e', hamlpy.DEFAULT_OPTIONS), 'expected_parent': 'elements[2]["node"]'},
+            {'node': nodes.ElementNode('  %div.f', hamlpy.DEFAULT_OPTIONS), 'expected_parent': 'root'},
         ]
 
         for el in elements:
diff --git a/hamlpy/test/test_loader.py b/hamlpy/test/test_loader.py
index 32ac4b0..0d85c41 100644
--- a/hamlpy/test/test_loader.py
+++ b/hamlpy/test/test_loader.py
@@ -47,12 +47,16 @@ def test_compiler_settings(self, mock_compiler_class):
         mock_compiler_class.assert_called_once_with(options_dict={})
         mock_compiler_class.reset_mock()
 
-        with override_settings(HAMLPY_ATTR_WRAPPER='"'):
+        with override_settings(HAMLPY_ATTR_WRAPPER='"', HAMLPY_INLINE_VARIABLE_PREFIXES=['#']):
             reload_module(hamlpy.template.loaders)
 
             rendered = render_to_string('simple.hamlpy')
 
-            mock_compiler_class.assert_called_once_with(options_dict={'attr_wrapper': '"'})
+            mock_compiler_class.assert_called_once_with(options_dict={
+                'attr_wrapper': '"',
+                'inline_variable_prefixes': ['#']
+            })
+
             assert '"someClass"' in rendered
 
     def test_template_rendering(self):
diff --git a/hamlpy/test/test_node_factory.py b/hamlpy/test/test_node_factory.py
index e551f86..5bc1a26 100644
--- a/hamlpy/test/test_node_factory.py
+++ b/hamlpy/test/test_node_factory.py
@@ -3,68 +3,73 @@
 import unittest
 
 from hamlpy import nodes
+from hamlpy import hamlpy
 
 
 class NodeFactoryTest(unittest.TestCase):
     
     def test_creates_element_node_with_percent(self):
-        node = nodes.create_node('%div')
+        node = self._create_node('%div')
         assert isinstance(node, nodes.ElementNode)
         
-        node = nodes.create_node('   %html')
+        node = self._create_node('   %html')
         assert isinstance(node, nodes.ElementNode)
         
     def test_creates_element_node_with_dot(self):
-        node = nodes.create_node('.className')
+        node = self._create_node('.className')
         assert isinstance(node, nodes.ElementNode)
         
-        node = nodes.create_node('   .className')
+        node = self._create_node('   .className')
         assert isinstance(node, nodes.ElementNode)
         
     def test_creates_element_node_with_hash(self):
-        node = nodes.create_node('#idName')
+        node = self._create_node('#idName')
         assert isinstance(node, nodes.ElementNode)
         
-        node = nodes.create_node('   #idName')
+        node = self._create_node('   #idName')
         assert isinstance(node, nodes.ElementNode)
     
     def test_creates_html_comment_node_with_front_slash(self):
-        node = nodes.create_node('/ some Comment')
+        node = self._create_node('/ some Comment')
         assert isinstance(node, nodes.CommentNode)
 
-        node = nodes.create_node('     / some Comment')
+        node = self._create_node('     / some Comment')
         assert isinstance(node, nodes.CommentNode)
         
     def test_random_text_returns_haml_node(self):
-        node = nodes.create_node('just some random text')
+        node = self._create_node('just some random text')
         assert isinstance(node, nodes.HamlNode)
         
-        node = nodes.create_node('   more random text')
+        node = self._create_node('   more random text')
         assert isinstance(node, nodes.HamlNode)
     
     def test_correct_symbol_creates_haml_comment(self):
-        node = nodes.create_node('-# This is a haml comment')
+        node = self._create_node('-# This is a haml comment')
         assert isinstance(node, nodes.HamlCommentNode)
         
     def test_equals_symbol_creates_variable_node(self):
-        node = nodes.create_node('= some.variable')
+        node = self._create_node('= some.variable')
         assert isinstance(node, nodes.VariableNode)
     
     def test_dash_symbol_creates_tag_node(self):
-        node = nodes.create_node('- for something in somethings')
+        node = self._create_node('- for something in somethings')
         assert isinstance(node, nodes.TagNode)
     
     def test_backslash_symbol_creates_tag_node(self):
-        node = nodes.create_node('\\= some.variable')
+        node = self._create_node('\\= some.variable')
         assert isinstance(node, nodes.HamlNode)
         
-        node = nodes.create_node('    \\= some.variable')
+        node = self._create_node('    \\= some.variable')
         assert isinstance(node, nodes.HamlNode)
     
     def test_python_creates_python_node(self):
-        node = nodes.create_node(':python')
+        node = self._create_node(':python')
         assert isinstance(node, nodes.PythonFilterNode)
     
     def test_slash_with_if_creates_a_conditional_comment_node(self):
-        node = nodes.create_node('/[if IE 5]')
+        node = self._create_node('/[if IE 5]')
         assert isinstance(node, nodes.ConditionalCommentNode)
+
+    @staticmethod
+    def _create_node(line):
+        return nodes.create_node(line, hamlpy.DEFAULT_OPTIONS)
diff --git a/readme.md b/readme.md
index 8b244e4..a146417 100644
--- a/readme.md
+++ b/readme.md
@@ -115,6 +115,8 @@ TEMPLATE_LOADERS = (
 Following values in Django settings affect haml processing:
 
   * `HAMLPY_ATTR_WRAPPER` -- The character that should wrap element attributes. This defaults to ' (an apostrophe).
+  * `HAMLPY_INLINE_VARIABLE_PREFIXES` -- Prefixes for inline variables. This defaults to \['#', '='\] which means both
+    `#{...}` and `={...}` syntax can bed used.
 
 ### Option 2: Watcher
 

From c846a49ea1a9305ce8ffbe5762c0a1a67037e1a2 Mon Sep 17 00:00:00 2001
From: Rowan Seymour <rowanseymour@gmail.com>
Date: Fri, 11 Nov 2016 16:37:41 +0100
Subject: [PATCH 2/5] Fix typo in readme

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index a146417..bc22b2a 100644
--- a/readme.md
+++ b/readme.md
@@ -116,7 +116,7 @@ Following values in Django settings affect haml processing:
 
   * `HAMLPY_ATTR_WRAPPER` -- The character that should wrap element attributes. This defaults to ' (an apostrophe).
   * `HAMLPY_INLINE_VARIABLE_PREFIXES` -- Prefixes for inline variables. This defaults to \['#', '='\] which means both
-    `#{...}` and `={...}` syntax can bed used.
+    `#{...}` and `={...}` syntax can be used.
 
 ### Option 2: Watcher
 

From c840a75b53fd3c95c7d41126e5ea8adcaf62710a Mon Sep 17 00:00:00 2001
From: Rowan Seymour <rowanseymour@gmail.com>
Date: Wed, 16 Nov 2016 09:29:33 +0200
Subject: [PATCH 3/5] Change HAMLPY_INLINE_VARIABLE_PREFIXES setting to
 HAMLPY_DJANGO_INLINE_STYLE

---
 hamlpy/hamlpy.py             |  4 ++--
 hamlpy/nodes.py              |  3 ++-
 hamlpy/template/loaders.py   |  4 ++--
 hamlpy/test/test_compiler.py |  2 +-
 hamlpy/test/test_loader.py   |  4 ++--
 readme.md                    |  6 +++---
 reference.md                 | 13 +++++++------
 7 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/hamlpy/hamlpy.py b/hamlpy/hamlpy.py
index cede3b1..dd92f25 100755
--- a/hamlpy/hamlpy.py
+++ b/hamlpy/hamlpy.py
@@ -9,8 +9,8 @@
 
 
 DEFAULT_OPTIONS = {
-    'attr_wrapper': '\'',                    # how to render attribute values, e.g. foo='bar'
-    'inline_variable_prefixes': ['#', '='],  # support both #{...} and ={...}
+    'attr_wrapper': '\'',         # how to render attribute values, e.g. foo='bar'
+    'django_inline_style': True,  # support both #{...} and ={...}
     'debug_tree': False
 }
 
diff --git a/hamlpy/nodes.py b/hamlpy/nodes.py
index e8755ce..116fe34 100644
--- a/hamlpy/nodes.py
+++ b/hamlpy/nodes.py
@@ -65,7 +65,8 @@ def get_inline_variable_regex(options):
     global _inline_variable_regexes
 
     if not _inline_variable_regexes:
-        prefixes = ''.join(options['inline_variable_prefixes'])
+        prefixes = ['=', '#'] if options['django_inline_style'] else ['#']
+        prefixes = ''.join(prefixes)
         _inline_variable_regexes = (
             re.compile(r'(?<!\\)([' + prefixes + r']\{\s*(.+?)\s*\})'),
             re.compile(r'\\([' + prefixes + r']\{\s*(.+?)\s*\})')
diff --git a/hamlpy/template/loaders.py b/hamlpy/template/loaders.py
index 6e8213e..c7d16e4 100644
--- a/hamlpy/template/loaders.py
+++ b/hamlpy/template/loaders.py
@@ -15,8 +15,8 @@
 if hasattr(settings, 'HAMLPY_ATTR_WRAPPER'):
     options.update(attr_wrapper=settings.HAMLPY_ATTR_WRAPPER)
 
-if hasattr(settings, 'HAMLPY_INLINE_VARIABLE_PREFIXES'):
-    options.update(inline_variable_prefixes=settings.HAMLPY_INLINE_VARIABLE_PREFIXES)
+if hasattr(settings, 'HAMLPY_DJANGO_INLINE_STYLE'):
+    options.update(django_inline_style=settings.HAMLPY_DJANGO_INLINE_STYLE)
 
 
 def get_haml_loader(loader):
diff --git a/hamlpy/test/test_compiler.py b/hamlpy/test/test_compiler.py
index b1c0cb4..11f4886 100755
--- a/hamlpy/test/test_compiler.py
+++ b/hamlpy/test/test_compiler.py
@@ -105,7 +105,7 @@ def test_django_variables(self):
         self._test("\\#{name}, how are you?", "#{name}, how are you?")
 
         # can disable use of ={...} syntax
-        options = {'inline_variable_prefixes': ['#']}
+        options = {'django_inline_style': False}
         self._test("Dear ={title} #{name} href={{ var }}", "Dear ={title} {{ name }} href={{ var }}", options)
 
     def test_django_tags(self):
diff --git a/hamlpy/test/test_loader.py b/hamlpy/test/test_loader.py
index 0d85c41..e9c1682 100644
--- a/hamlpy/test/test_loader.py
+++ b/hamlpy/test/test_loader.py
@@ -47,14 +47,14 @@ def test_compiler_settings(self, mock_compiler_class):
         mock_compiler_class.assert_called_once_with(options_dict={})
         mock_compiler_class.reset_mock()
 
-        with override_settings(HAMLPY_ATTR_WRAPPER='"', HAMLPY_INLINE_VARIABLE_PREFIXES=['#']):
+        with override_settings(HAMLPY_ATTR_WRAPPER='"', HAMLPY_DJANGO_INLINE_STYLE=False):
             reload_module(hamlpy.template.loaders)
 
             rendered = render_to_string('simple.hamlpy')
 
             mock_compiler_class.assert_called_once_with(options_dict={
                 'attr_wrapper': '"',
-                'inline_variable_prefixes': ['#']
+                'django_inline_style': False
             })
 
             assert '"someClass"' in rendered
diff --git a/readme.md b/readme.md
index bc22b2a..f782617 100644
--- a/readme.md
+++ b/readme.md
@@ -114,9 +114,9 @@ TEMPLATE_LOADERS = (
 
 Following values in Django settings affect haml processing:
 
-  * `HAMLPY_ATTR_WRAPPER` -- The character that should wrap element attributes. This defaults to ' (an apostrophe).
-  * `HAMLPY_INLINE_VARIABLE_PREFIXES` -- Prefixes for inline variables. This defaults to \['#', '='\] which means both
-    `#{...}` and `={...}` syntax can be used.
+  * `HAMLPY_ATTR_WRAPPER` -- The character that should wrap element attributes. Defaults to `'` (an apostrophe).
+  * `HAMLPY_DJANGO_INLINE_STYLE` -- Whether to support `={...}` syntax for inline variables in addition to `#{...}`. 
+     Defaults to `True`.
 
 ### Option 2: Watcher
 
diff --git a/reference.md b/reference.md
index ed03865..7f19b08 100644
--- a/reference.md
+++ b/reference.md
@@ -386,12 +386,12 @@ is compiled to:
 </h2>
 ```
 
-### Inline Django Variables: ={...}
+### Inline Django Variables: #{...}
 
 You can also use inline variables by surrounding the variable name with curly braces. For example:
 
 ```haml
-Hello ={name}, how are you today?
+Hello #{name}, how are you today?
 ```
 
 is compiled to
@@ -403,7 +403,7 @@ Hello {{ name }}, how are you today?
 Inline variables can also be used in an element's attribute values. For example:
 
 ```haml
-%a{'title':'Hello ={name}, how are you?'} Hello
+%a{'title':'Hello #{name}, how are you?'} Hello
 ```
 
 is compiled to:
@@ -415,16 +415,17 @@ is compiled to:
 Inline variables can be escaped by placing a `\` before them. For example:
 
 ```haml
-Hello \={name}
+Hello \#{name}
 ```
 
 is compiled to
 
 ```htmldjango
-Hello ={name}
+Hello #{name}
 ```
 
-The Ruby style (`#{...}` rather than `={...}`) is also supported and the two can be used interchangeably.
+Django style (`={...}` rather than `#{...}`) syntax is optionally supported. If you are using the template loader
+then ensure `HAMLPY_DJANGO_INLINE_STYLE` is `True`, and the two syntaxes can then be used interchangeably.
 
 
 

From 0c82bcbe25dd20096b3e9029b3ff4c7c1cd6a8ce Mon Sep 17 00:00:00 2001
From: Rowan Seymour <rowanseymour@gmail.com>
Date: Wed, 16 Nov 2016 10:39:21 +0200
Subject: [PATCH 4/5] Add django-inline as option to watcher program

---
 hamlpy/hamlpy_watcher.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/hamlpy/hamlpy_watcher.py b/hamlpy/hamlpy_watcher.py
index 98f63ac..d3fd28c 100644
--- a/hamlpy/hamlpy_watcher.py
+++ b/hamlpy/hamlpy_watcher.py
@@ -49,6 +49,8 @@ def __call__(self, parser, namespace, values, option_string = None):
 arg_parser.add_argument('output_dir', help = 'Destination folder', type = str, nargs = '?')
 arg_parser.add_argument('--tag', help = 'Add self closing tag. eg. --tag macro:endmacro', type = str, nargs = 1, action = StoreNameValueTagPair)
 arg_parser.add_argument('--attr-wrapper', dest = 'attr_wrapper', type = str, choices = ('"', "'"), default = "'", action = 'store', help = "The character that should wrap element attributes. This defaults to ' (an apostrophe).")
+arg_parser.add_argument('--django-inline', dest='django_inline', type=bool, default=True, action='store',
+                        help="Whether to support ={...} syntax for inline variables in addition to #{...}")
 arg_parser.add_argument('--jinja', help = 'Makes the necessary changes to be used with Jinja2', default = False, action = 'store_true')
 
 def watched_extension(extension):
@@ -85,6 +87,9 @@ def watch_folder():
     
     if args.attr_wrapper:
         compiler_args['attr_wrapper'] = args.attr_wrapper
+
+    if args.django_inline:
+        compiler_args['django_inline_style'] = args.django_inline
     
     if args.jinja:
         for k in ('ifchanged', 'ifequal', 'ifnotequal', 'autoescape', 'blocktrans',
@@ -135,6 +140,7 @@ def _watch_folder(folder, destination, compiler_args):
 def _compiled_path(destination, filename):
     return os.path.join(destination, filename[:filename.rfind('.')] + Options.OUTPUT_EXT)
 
+
 def compile_file(fullpath, outfile_name, compiler_args):
     """Calls HamlPy compiler."""
     if Options.VERBOSE:

From bb5aaf4f1d9c062bd0ad283efbffc31c60ef92f1 Mon Sep 17 00:00:00 2001
From: Rowan Seymour <rowanseymour@gmail.com>
Date: Wed, 16 Nov 2016 10:39:42 +0200
Subject: [PATCH 5/5] Improve reference wording about inline variables

---
 reference.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/reference.md b/reference.md
index 7f19b08..8262830 100644
--- a/reference.md
+++ b/reference.md
@@ -388,7 +388,7 @@ is compiled to:
 
 ### Inline Django Variables: #{...}
 
-You can also use inline variables by surrounding the variable name with curly braces. For example:
+You can also use inline variables using the `#{...}` syntax. For example:
 
 ```haml
 Hello #{name}, how are you today?
@@ -418,13 +418,13 @@ Inline variables can be escaped by placing a `\` before them. For example:
 Hello \#{name}
 ```
 
-is compiled to
+is compiled to:
 
 ```htmldjango
 Hello #{name}
 ```
 
-Django style (`={...}` rather than `#{...}`) syntax is optionally supported. If you are using the template loader
+Django style `={...}` syntax is also optionally supported. If you are using the template loader
 then ensure `HAMLPY_DJANGO_INLINE_STYLE` is `True`, and the two syntaxes can then be used interchangeably.