Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge recent changes from the master branch into element_parser branch #147

Open
wants to merge 73 commits into
base: element_parser
Choose a base branch
from
Open

Merge recent changes from the master branch into element_parser branch #147

wants to merge 73 commits into from

Commits on Sep 5, 2012

  1. Minor clarity change

    Barry Coughlan committed Sep 5, 2012
    Configuration menu
    Copy the full SHA
    fe287c8 View commit details
    Browse the repository at this point in the history

  2. roll version

    @jessemiller
    jessemiller committed Sep 5, 2012
    Configuration menu
    Copy the full SHA
    1c36d67 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2012

  1. Don't remove backslash at start of lines inside filter nodes

    Barry Coughlan committed Sep 13, 2012
    Configuration menu
    Copy the full SHA
    16be725 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2012

  1. Allow use of filters in inline variables

    Barry Coughlan committed Sep 27, 2012
    Configuration menu
    Copy the full SHA
    f93245f View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2012

  1. - Fix space after key in attribute syntax

    @richardasymmetric
    richardasymmetric committed Oct 9, 2012
    Configuration menu
    Copy the full SHA
    6520df0 View commit details
    Browse the repository at this point in the history

  2. - Fix the nuke whitespace template tests

    @richardasymmetric
    richardasymmetric committed Oct 9, 2012
    Configuration menu
    Copy the full SHA
    71aea50 View commit details
    Browse the repository at this point in the history

  3. - Add a test for whitespace after attribute key

    @richardasymmetric
    richardasymmetric committed Oct 9, 2012
    Configuration menu
    Copy the full SHA
    358b21e View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2012

  1. Merge pull request jessemiller#101 from Naddiseo/key_space_fix 

    Whitespace after key name in attribute syntax throws an exception
    Barry Coughlan committed Oct 14, 2012
    Configuration menu
    Copy the full SHA
    a5a377e View commit details
    Browse the repository at this point in the history

  2. Merge pull request jessemiller#100 from Naddiseo/nuke_whitespace_test… 

    …_fix

Fix for two failing tests
    Barry Coughlan committed Oct 14, 2012
    Configuration menu
    Copy the full SHA
    90be5af View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2012

  1. - Added options to hamlpy_watcher

    @richardasymmetric
    richardasymmetric committed Oct 19, 2012
    Configuration menu
    Copy the full SHA
    6fb7fe1 View commit details
    Browse the repository at this point in the history

  2. - Update readme

    @richardasymmetric
    richardasymmetric committed Oct 19, 2012
    Configuration menu
    Copy the full SHA
    cb42cd3 View commit details
    Browse the repository at this point in the history

  3. - Remove debugging print

    @richardasymmetric
    richardasymmetric committed Oct 19, 2012
    Configuration menu
    Copy the full SHA
    7128e03 View commit details
    Browse the repository at this point in the history

  4. - Allow custom self closing tags for templating languages like jinja … 

    …that use "macro" and "call"
    @richardasymmetric
    richardasymmetric committed Oct 19, 2012
    Configuration menu
    Copy the full SHA
    305115b View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2012

  1. Merge pull request jessemiller#102 from Naddiseo/watcher_options 

    Command line options for hamlpy-watcher
    Barry Coughlan committed Oct 22, 2012
    Configuration menu
    Copy the full SHA
    1007021 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2012

  1. - Add a new line after the closing conditional comment

    @richardasymmetric
    richardasymmetric committed Oct 25, 2012
    Configuration menu
    Copy the full SHA
    f6a788e View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2012

  1. Merge pull request jessemiller#104 from Naddiseo/newline_after_comment 

    Add a new line after the closing conditional comment
    Barry Coughlan committed Oct 27, 2012
    Configuration menu
    Copy the full SHA
    b750151 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2012

  1. Changed 'athelete' to 'athlete'.

    @caseycrites
    caseycrites committed Nov 2, 2012
    Configuration menu
    Copy the full SHA
    9427bb6 View commit details
    Browse the repository at this point in the history

  2. Merge pull request jessemiller#105 from caseycrites/fix_athlete_typo 

    Changed 'athelete' to 'athlete'.
    Barry Coughlan committed Nov 2, 2012
    Configuration menu
    Copy the full SHA
    d9cf774 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2012

  1. Add --attr-wrapper option to command line and HAMLPY_ATTR_WRAPPER set… 

    …ting to Django settings
    @avsd
    avsd committed Nov 12, 2012
    Configuration menu
    Copy the full SHA
    89e5212 View commit details
    Browse the repository at this point in the history

  2. Add --attr-wrapper option to watcher

    @avsd
    avsd committed Nov 12, 2012
    Configuration menu
    Copy the full SHA
    15bd2d4 View commit details
    Browse the repository at this point in the history

  3. Update docs about attr_wrapper

    @avsd
    avsd committed Nov 12, 2012
    Configuration menu
    Copy the full SHA
    2a153af View commit details
    Browse the repository at this point in the history

  4. Update docs about attr_wrapper in hamlpy command

    @avsd
    avsd committed Nov 12, 2012
    Configuration menu
    Copy the full SHA
    fc3f480 View commit details
    Browse the repository at this point in the history

  5. Merge pull request jessemiller#106 from chameleonpage/master 

    --attr-wrapper option for command line and HAMLPY_ATTR_WRAPPER setting for Django
    Barry Coughlan committed Nov 12, 2012
    Configuration menu
    Copy the full SHA
    451beb1 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2012

  1. added jinja2 extension

    @andreif
    andreif committed Nov 13, 2012
    Configuration menu
    Copy the full SHA
    a205faa View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2012

  1. Merge pull request jessemiller#108 from andreif/add-jinja2-extension 

    added jinja2 extension
    Barry Coughlan committed Nov 16, 2012
    Configuration menu
    Copy the full SHA
    39c1d47 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2012

  1. - Fix for watcher options that broke in pull request jessemiller#106

    @Naddiseo
    Naddiseo committed Dec 20, 2012
    Configuration menu
    Copy the full SHA
    0a5ed5f View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2012

  1. Merge pull request jessemiller#113 from Naddiseo/fix_pull_request_106 

    Fix for watcher options that broke in pull request jessemiller#106
    @jessemiller
    jessemiller committed Dec 21, 2012
    Configuration menu
    Copy the full SHA
    a37a974 View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2012

  1. Fix to jessemiller#114 HamlPyExtension filename extension check invalid.

    @a-krebs
    a-krebs committed Dec 26, 2012
    Configuration menu
    Copy the full SHA
    fa66d21 View commit details
    Browse the repository at this point in the history

  2. Added tests to support pull request jessemiller#115, which addresses … 

    …issue jessemiller#114.
    @a-krebs
    a-krebs committed Dec 26, 2012
    Configuration menu
    Copy the full SHA
    15b7c90 View commit details
    Browse the repository at this point in the history

Commits on Jan 1, 2013

  1. Merge pull request jessemiller#115 from a-krebs/master 

    Fix jessemiller#114 HamlPyExtension filename extension check invalid
    @jessemiller
    jessemiller committed Jan 1, 2013
    Configuration menu
    Copy the full SHA
    e56c81b View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2013

  1. Tests to demonstrate jessemiller#116.

    @a-krebs
    a-krebs committed Jan 4, 2013
    Configuration menu
    Copy the full SHA
    a3b5273 View commit details
    Browse the repository at this point in the history

  2. Fixed jessemiller#116

    @a-krebs
    a-krebs committed Jan 4, 2013
    Configuration menu
    Copy the full SHA
    e290f73 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2013

  1. fix parser source string to unicode

    @fizista
    fizista committed Jan 16, 2013
    Configuration menu
    Copy the full SHA
    a90c37a View commit details
    Browse the repository at this point in the history

  2. How to generate translation files.

    @fizista
    fizista committed Jan 16, 2013
    Configuration menu
    Copy the full SHA
    05ecfda View commit details
    Browse the repository at this point in the history

  3. fix readme

    Wojciech Banaś committed Jan 16, 2013
    Configuration menu
    Copy the full SHA
    2da3c9e View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2013

  1. Changed filters to use attr_wrapper instead of hard-coded apostrophe.

    Michał Bielawski committed Jan 18, 2013
    Configuration menu
    Copy the full SHA
    132dcae View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2013

  1. Escaping attr_wrapper instead of hard-coded apostrophe.

    Michał Bielawski committed Jan 25, 2013
    Configuration menu
    Copy the full SHA
    787ef4b View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2013

  1. - Added a Jinja compatibility option for the watcher.

    @richardasymmetric
    richardasymmetric committed Mar 4, 2013
    Configuration menu
    Copy the full SHA
    d1c055b View commit details
    Browse the repository at this point in the history

  2. - Small fix to watcher option "tag"

    @richardasymmetric
    richardasymmetric committed Mar 4, 2013
    Configuration menu
    Copy the full SHA
    c873dd4 View commit details
    Browse the repository at this point in the history

  3. - typo fix.

    @richardasymmetric
    richardasymmetric committed Mar 4, 2013
    Configuration menu
    Copy the full SHA
    954c81d View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2013

  1. Merge pull request jessemiller#117 from a-krebs/fix_116 

    Fix jessemiller#116
    @jessemiller
    jessemiller committed Mar 6, 2013
    Configuration menu
    Copy the full SHA
    09984be View commit details
    Browse the repository at this point in the history

  2. Merge branch 'fixes' of https://github.com/D3X/HamlPy into D3X-fixes

    @jessemiller
    jessemiller committed Mar 6, 2013
    Configuration menu
    Copy the full SHA
    8d10605 View commit details
    Browse the repository at this point in the history

  3. Add tests around javascript filter with attr set

    @jessemiller
    jessemiller committed Mar 6, 2013
    Configuration menu
    Copy the full SHA
    3859dc9 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'django_translations' of https://github.com/fizista/HamlPy… 

    … into fizista-django_translations
    @jessemiller
    jessemiller committed Mar 6, 2013
    Configuration menu
    Copy the full SHA
    ac3d6f5 View commit details
    Browse the repository at this point in the history

  5. Merge pull request jessemiller#129 from Naddiseo/fix_watcher_option_tags 

    - Small fix to watcher option "tag"
    @jessemiller
    jessemiller committed Mar 6, 2013
    Configuration menu
    Copy the full SHA
    6d95cc7 View commit details
    Browse the repository at this point in the history

  6. Added to test to confirm fixes issue jessemiller#125

    @jessemiller
    jessemiller committed Mar 6, 2013
    Configuration menu
    Copy the full SHA
    284faac View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' of github.com:jessemiller/HamlPy

    @jessemiller
    jessemiller committed Mar 6, 2013
    Configuration menu
    Copy the full SHA
    1204b3a View commit details
    Browse the repository at this point in the history

  8. - Added a basic testcase and output.

    @Naddiseo
    Naddiseo committed Mar 6, 2013
    Configuration menu
    Copy the full SHA
    d434fd4 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'jinja_compat' of https://github.com/Naddiseo/HamlPy int… 

    …o Naddiseo-jinja_compat

Conflicts:
	hamlpy/hamlpy_watcher.py
    @jessemiller
    jessemiller committed Mar 6, 2013
    Configuration menu
    Copy the full SHA
    1b08af8 View commit details
    Browse the repository at this point in the history

  10. remove unused test templates

    @jessemiller
    jessemiller committed Mar 6, 2013
    Configuration menu
    Copy the full SHA
    3f6b962 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2013

  1. Updated reference.md (:stylus, :coffeescript, :css) 

    Documented :stylus, :coffeescript; fixed documentation for :css
    @V-Alexeev
    V-Alexeev committed Mar 29, 2013
    Configuration menu
    Copy the full SHA
    bd5c044 View commit details
    Browse the repository at this point in the history

  2. Merge pull request jessemiller#130 from V-Alexeev/patch-1 

    Updated reference.md (:stylus, :coffeescript, :css)
    @jessemiller
    jessemiller committed Mar 29, 2013
    Configuration menu
    Copy the full SHA
    1bbb479 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2013

  1. Remove strict dependencies on django, pygments, markdown, jinja2 

    * addresses Issue jessemiller#132
* include dependent functionality only if the required package
  is available
* duplicate TemplateDoesNotExist() if django is not present
* add `NotAvailableError` for nodes which depend on non-present
  packages
* move pygments_filter test into template tests
* fix test for Pygments version 1.6
    @danring
    danring committed May 9, 2013
    Configuration menu
    Copy the full SHA
    adc1840 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2013

  1. Output local time instead of gmttime in hamlpy_watcher when in verbos… 

    …e mode
    @JobJob
    JobJob committed May 10, 2013
    Configuration menu
    Copy the full SHA
    52ec4d3 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2013

  1. Merge pull request jessemiller#134 from JobJob/master 

    	 Output local time instead of gmttime in hamlpy_watcher when in verbose mode
    @jessemiller
    jessemiller committed May 11, 2013
    Configuration menu
    Copy the full SHA
    f813582 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2013

  1. allow attributes to have any letter at all (not just ascii)

    @nsh-ableton
    nsh-ableton committed May 29, 2013
    Configuration menu
    Copy the full SHA
    32cd4d0 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2013

  1. Merge pull request jessemiller#133 from danring/master 

    Remove strict dependencies on django, pygments, markdown, jinja2
    @jessemiller
    jessemiller committed Jun 5, 2013
    Configuration menu
    Copy the full SHA
    6db210f View commit details
    Browse the repository at this point in the history

  2. Merge pull request jessemiller#135 from AbletonAG/permit_more_valid_a… 

    …ttributes

Allow attributes to contain any letter at all (not just ascii)
    @jessemiller
    jessemiller committed Jun 5, 2013
    Configuration menu
    Copy the full SHA
    1dbce73 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2013

  1. make the test of non-ascii filenames actually pass, by marking string… 

    …s as unicode
    @nsh-ableton
    nsh-ableton committed Jun 10, 2013
    Configuration menu
    Copy the full SHA
    eb2e665 View commit details
    Browse the repository at this point in the history

  2. Merge pull request jessemiller#137 from jessemiller/actually_fix_test 

    make the test of non-ascii filenames actually pass, by marking strings as unicode
I missed the note about how to run the unit tests when submitting this patch, and it turns out the test actually failed. Just needed to mark the appropriate strings as unicode to get it to work.
    @noelbush-xx
    noelbush-xx committed Jun 10, 2013
    Configuration menu
    Copy the full SHA
    8b72bd0 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2013

  1. Markdown filter: put back in trailing spaces to handle implicit <br>

    @boscoh
    boscoh committed Jun 14, 2013
    Configuration menu
    Copy the full SHA
    92021ae View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2013

  1. Fixed the markdown unit test

    @boscoh
    boscoh committed Jun 17, 2013
    Configuration menu
    Copy the full SHA
    beda2a0 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2013

  1. newline ambiguity resolved in reading raw_haml

    @boscoh
    boscoh committed Jun 21, 2013
    Configuration menu
    Copy the full SHA
    f6a56cb View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2013

  1. - Added missing Jinja2 tag raw

    Richard Eames committed Jun 24, 2013
    Configuration menu
    Copy the full SHA
    7f702b7 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2013

  1. Update reference.md

    @tsouvarev
    tsouvarev committed Jul 12, 2013
    Configuration menu
    Copy the full SHA
    b364bd2 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2013

  1. Merge pull request jessemiller#138 from boscoh/markdown_br_fix 

    Fix Markdown br bug
Thanks to @boscoh for the following:
In the `:markdown` filter, the markdown for implicit `<br>` tag is broken.

The reason is that markdown recognises a line with  `<br>` by two trailing spaces.

However, trailing spaces are stripped when `PlaintextNode.haml` is read.

To fix: when the text is reconstructed to send to the Markdown filter, instead of using the `PlaintextNode.haml` field, `PlaintextNode.raw_haml.lstrip()` is used, which keeps the trailing spaces.
    @noelbush-xx
    noelbush-xx committed Jul 29, 2013
    Configuration menu
    Copy the full SHA
    fe3ba8b View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2013

  1. Modified templatize to ignore non-haml files

    @cordery
    cordery committed Aug 23, 2013
    1 Configuration menu
    Copy the full SHA
    fd3c93d View commit details
    Browse the repository at this point in the history

  2. Modified templatize to ignore non-haml files (fix)

    @cordery
    cordery committed Aug 23, 2013
    Configuration menu
    Copy the full SHA
    62bc8cb View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2013

  1. Merge pull request jessemiller#141 from tsouvarev/patch-1 

    Update reference.md
    @jessemiller
    jessemiller committed Aug 28, 2013
    Configuration menu
    Copy the full SHA
    f6d66fb View commit details
    Browse the repository at this point in the history

  2. Merge pull request jessemiller#139 from Naddiseo/patch-1 

    - Added missing Jinja2 tag `raw`
    @jessemiller
    jessemiller committed Aug 28, 2013
    Configuration menu
    Copy the full SHA
    ab51afb View commit details
    Browse the repository at this point in the history

  3. Merge pull request jessemiller#144 from cordery/master 

    Fix to templatize decorator so it only hamlpy parses files with valid haml extensions see Issue jessemiller#96
    @jessemiller
    jessemiller committed Aug 28, 2013
    Configuration menu
    Copy the full SHA
    acb79e1 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2013

  1. merge master branch with element_parser

    @a1s
    a1s committed Sep 3, 2013
    Configuration menu
    Copy the full SHA
    6939896 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2013

  1. Support trailing comma in attribute dictionaries

    @a1s
    a1s committed Sep 4, 2013
    Configuration menu
    Copy the full SHA
    7da6f02 View commit details
    Browse the repository at this point in the history