1
0
Fork 0
mirror of https://github.com/haml/haml.git synced 2022-11-09 12:33:31 -05:00
Commit graph

31 commits

Author SHA1 Message Date
Nathan Weizenbaum
288cf74462 Merge branch 'master' into universal-interpolation
Conflicts:

	lib/haml/precompiler.rb
2009-02-22 00:17:38 -08:00
Nathan Weizenbaum
c3eef3f1f8 [Haml] Fix a bunch of 1.9.1 compatibility issues.
There's still one test failure that only appears for me when I run all the tests
and doesn't have a meaningful backtrace.
2009-02-07 02:33:58 -08:00
Juampi Rodriguez
148030c6d1 Fix a namespace conflict for Markdown filters. 2008-12-31 15:03:38 -08:00
Nathan Weizenbaum
6bd4a9cf2d Refactor Precompiler#push_script args to be a hash. 2008-12-11 14:52:50 -08:00
Nathan Weizenbaum
54a1098944 Make sure the :redcloth filter works. 2008-10-02 22:57:48 -07:00
Nathan Weizenbaum
046860e19c Make sure we require everything necessary for the :sass filter. 2008-10-02 22:55:47 -07:00
Chris Eppstein
7512dbe093 Make the Sass filter in haml files pass the Sass::Plugin options when initializing the sass engine. 2008-09-03 14:17:48 -07:00
Nathan Weizenbaum
d9fd622458 Make the :javascript filter respect the :attr_wrapper option. 2008-08-31 15:21:14 -07:00
Mislav Marohnić
429314d2b0 avoid some warnings thrown by the Ruby interpreter 2008-08-29 18:50:32 -07:00
Nathan Weizenbaum
c7948ffbad Add support for more bluecloth parsers, and get rid of some {red,blue}cloth-specific tests. 2008-08-29 16:18:24 -07:00
Mislav Marohnić
0fa3201cc9 BlueCloth vs. RedCloth: change Markdown filter to only use BlueCloth.
Remove tests that rely on 'redcloth' or Textile output.
This is necessary because the new RedCloth doesn't support Markdown anymore,
renders Textile with different whitespace setting,
and it's generally a bad practice to rely on output of 3rd party libraries that have their own tests.
2008-08-29 15:41:14 -07:00
Nathan Weizenbaum
912d5b7bef Get rid of the comment at the top of filters.rb, because it makes the RDoc screwy. 2008-08-03 13:42:56 -04:00
Nathan Weizenbaum
9016da55f5 Don't push all text in :ruby filters onto one line. 2008-07-15 23:35:08 -04:00
Nathan Weizenbaum
74a61e3562 Automatically register new filters when they're defined. 2008-05-23 01:16:24 -07:00
Yehuda Katz
5aefefee3d Add CDATA filter
Signed-off-by: Nathan Weizenbaum <nex342@gmail.com>
2008-05-23 01:02:19 -07:00
Nathan Weizenbaum
e2b61eb1e3 Make sure filter preserving works with variable interpolation. 2008-05-15 11:34:12 -07:00
Nathan Weizenbaum
8c92d2cb9b Automatically #find_and_preserve filters that use #render. 2008-05-13 11:23:11 -07:00
Nathan Weizenbaum
161140580f Automatically nuke inner whitespace for preserved tags. 2008-05-11 01:39:02 -07:00
Nathan Weizenbaum
d5ca228014 Add an :escaped filter for escaped plain text. 2008-05-10 22:37:49 -07:00
Nathan Weizenbaum
6cbd49d5f5 Get rid of Haml::HamlError.
It makes more sense to just raise Haml::Error.
2008-04-19 10:07:40 -07:00
Nathan Weizenbaum
84fdde13a5 Get rid of trailing whitespace. 2008-04-07 23:09:17 -07:00
Nathan Weizenbaum
d827f57815 Add a Javascript filter.
Based lightly on Les Hill's patch at http://pastie.org/156177.
2008-02-23 01:56:16 -08:00
Nathan Weizenbaum
a3388f9873 Evaluating the ERB filter in the template context as well. 2008-02-23 01:37:35 -08:00
Nathan Weizenbaum
491306ce52 Evaluate the :ruby filter in the document context. 2008-02-23 01:24:33 -08:00
Nathan Weizenbaum
bbdb5882fd Add an internal_compile wrapper around Haml::Filters::Base#compile.
This way, resolve_lazy_requires is always run.
2008-02-23 01:13:36 -08:00
Nathan Weizenbaum
547e86a4db Adding documentation for the new filter capabilities. 2008-02-22 23:50:17 -08:00
Nathan Weizenbaum
542d1233e2 Giving filters access to the Haml evaluation context.
Filters are now defined as modules.
These modules can either have a #render method,
which takes a source string and returns the rendered version;
or a #compile method, which takes the current Haml::Precompiler instance as well as a source string
and uses the precompiler to add code to the Haml buffer
that will result in the filter rendering.

Also allows #{}-interpolation for all pre-defined filters
(and any new filters using #render).

Inspiration came from Bob Aman's patch at http://pastie.caboo.se/100417
and Les Hill's patch at http://pastie.org/156177.
2008-02-22 23:50:16 -08:00
nex3
1c96889cef Much nicer Redcloth and Bluecloth filter structure, both code and tests. Many implementation ideas thanks to Mislav Marohnic, ugly test output pointed out by Jan Szumiec.
git-svn-id: svn://hamptoncatlin.com/haml/trunk@581 7063305b-7217-0410-af8c-cdc13e5119b9
2007-08-11 21:04:51 +00:00
nex3
b200bb4920 Deprecating ~.
git-svn-id: svn://hamptoncatlin.com/haml/trunk@353 7063305b-7217-0410-af8c-cdc13e5119b9
2007-02-06 08:08:32 +00:00
nex3
a94b40953a 100% Rcov! Woo-hoo! Yeah!
git-svn-id: svn://hamptoncatlin.com/haml/trunk@325 7063305b-7217-0410-af8c-cdc13e5119b9
2007-01-31 06:38:23 +00:00
nex3
2fa28d63e3 Filters: implemented!
git-svn-id: svn://hamptoncatlin.com/haml/trunk@291 7063305b-7217-0410-af8c-cdc13e5119b9
2007-01-19 17:03:47 +00:00