This repository has been archived by the owner on Aug 17, 2023. It is now read-only.
New doctypes, attribute ordering and attribute escaping #63
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rowanseymour
commented
Mar 13, 2017
|
|
||
| @property | ||
| def html(self): | ||
| return self.html4 or self.html5 |
There was a problem hiding this comment.
This pattern of using properties lets us follow the Ruby Haml code a bit more closely
rowanseymour
commented
Mar 13, 2017
| @@ -56,12 +56,12 @@ def read_element(stream): | |||
|
|
|||
| id_or_class = read_word(stream, DOM_OBJECT_EXTRA_CHARS) | |||
| if is_id: | |||
| ids.append(id_or_class) | |||
| _id = id_or_class | |||
There was a problem hiding this comment.
Only the last id value is supposed to be used (https://github.com/nyaruka/haml-spec/blob/django-hamlpy/tests.json#L172)
rowanseymour
commented
Mar 13, 2017
| parts = doctype.split() | ||
| if parts and parts[0] == "XML": | ||
| attr_wrapper = self.compiler.options['attr_wrapper'] | ||
| def get_header(self, doctype, options): |
There was a problem hiding this comment.
rowanseymour
commented
Mar 13, 2017
| <img src='/static/imgs/ibl_logo{{id}}.gif' alt='IBL Logo' /> | ||
| <br /> | ||
| <img src='/static/imgs/ibl_logo.gif' alt='IBL Logo{{id}}' /> | ||
| <img src='/static/imgs/ibl_logo{{id}}.gif' alt='IBL Logo'> |
There was a problem hiding this comment.
The default format is html5 - /> syntax only use for xhtml.
rowanseymour
commented
Mar 13, 2017
| @@ -107,7 +107,7 @@ def test_django_variables(self): | |||
|
|
|||
| # they can be escaped | |||
| self._test("%a{'b': '\\\\#{greeting} test', title: \"It can't be removed\"} blah", | |||
| "<a b='#{greeting} test' title='It can\\'t be removed'>blah</a>") | |||
| "<a b='#{greeting} test' title='It can't be removed'>blah</a>") | |||
There was a problem hiding this comment.
HTML special chars now escaped by default in attribute values
rowanseymour
commented
Mar 13, 2017
hamlpy/test/test_compiler.py
Outdated
| @@ -209,12 +209,51 @@ def test_invalid_filter(self): | |||
| self._test_error(":nosuchfilter\n", "No such filter: nosuchfilter") | |||
|
|
|||
| def test_doctypes(self): | |||
| self._test('!!!', '<!DOCTYPE html>', | |||
There was a problem hiding this comment.
These tests are copied from the Ruby project
rowanseymour
changed the title
rowanseymour
changed the title
nicpottier
approved these changes
Mar 13, 2017
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I implemented a test runner for https://github.com/nyaruka/haml-spec/tree/django-hamlpy and these are some fixes to bring us closer to consistency with their spec:
< />syntax if not using xhtml format%p#id1#id2should be justid2