Commit Graph

187 Commits

Author SHA1 Message Date
Simon Eskildsen
0dac6fe88a Change to absolute path in localization test 2013-08-30 12:31:57 -04:00
Simon Eskildsen
f37a984fd7 Add sketch of I18n error translation 2013-08-30 12:31:57 -04:00
Tristan Hume
86ba2f4174 Fix error message 1.8 compatibility 2013-08-22 13:23:44 -04:00
Tristan Hume
77db92de54 Better testing of warn mode. 2013-08-22 12:55:54 -04:00
Tristan Hume
b0cba5298a Fix warnings and make tags a proper syntax tree. 2013-08-22 12:44:23 -04:00
Tristan Hume
93fcd5687c Broken warnings implementation. 2013-08-22 12:12:35 -04:00
Tristan Hume
14a17520de Merge branch 'master' into recursive-parsing 2013-08-22 10:39:08 -04:00
Tristan Hume
0beb4a4793 Add handy context to strict parser error messages. 2013-08-19 15:45:05 -04:00
Tristan Hume
047900d0dd Proper warning support 2013-08-19 15:14:26 -04:00
Tristan Hume
eb68a751ac Hopefully fix CI by improving multi-suite runner. 2013-08-16 15:15:15 -04:00
Florian Weingarten
ed4b61bfd3 Fix broken map test and add sort test 2013-08-08 11:53:52 -04:00
Florian Weingarten
8f978ecd1a Make sort filter work on Enumerable drops 2013-08-08 11:47:26 -04:00
Tristan Hume
ace12e29da Hopefully fix CI on Rubinius 2013-08-02 13:37:56 -04:00
Florian Weingarten
f98949117d Fix .include? method on Enumerable drops, used by "contains" conditions 2013-08-02 10:23:10 -04:00
Florian Weingarten
c92efd3ab9 Update some Drop tests 2013-08-01 13:46:55 -04:00
Florian Weingarten
ff570c3ddc Fix clashing method names in enumerable drops 2013-08-01 13:17:02 -04:00
Tristan Hume
824231284c Run test suite with both parsers 2013-08-01 12:49:36 -04:00
Tristan Hume
84f0c1bef8 Initial options passing 2013-07-30 14:44:41 -04:00
Tristan Hume
bc76c0daaf Collapse float and int into 'number' 2013-07-29 11:04:46 -04:00
Harry Brundage
bf53e517f5 Inline Parser#next_token to avoid method dispatch 2013-07-26 15:38:52 -04:00
Harry Brundage
bacacf2fd0 Remove the Token class from the lexer in favour of less smart but faster arrays 2013-07-26 15:14:01 -04:00
Tristan Hume
1b43bf5686 Add parser tests 2013-07-26 13:09:36 -04:00
Tristan Hume
83e71ace99 Add lexer tests and fixes 2013-07-26 12:50:27 -04:00
Tristan Hume
4dc9cc0ea1 Add back tests for lax parsing 2013-07-26 11:55:50 -04:00
Tristan Hume
87b8ee7341 Add error mode switching 2013-07-26 11:45:13 -04:00
Florian Weingarten
65dfd57bb5 Make 'map' filter work on Enumerable drops 2013-07-26 10:35:28 -04:00
Tristan Hume
8896b55fa5 Parsing for if statements 2013-07-26 10:31:26 -04:00
Florian Weingarten
3e13ed4ba1 Fix mapping over procs 2013-07-25 22:11:44 -04:00
Florian Weingarten
182d3fefb6 Always call 'to_liquid' on staff in map filter and allow to_liquid to be called on drops 2013-07-25 17:10:19 -04:00
Tristan Hume
4da7b36139 New variable parser! 2013-07-25 11:38:57 -04:00
Florian Weingarten
f9027d54ab Use invoke_drop in map filter 2013-07-24 15:41:50 -04:00
Florian Weingarten
f0ecd02199 Fix some blank tests 2013-07-03 02:47:22 +02:00
Florian Weingarten
0f38fe3596 Add blank test for case tags 2013-07-02 18:08:20 -04:00
Florian Weingarten
b53601100f Make sure include tags are never blank 2013-07-02 13:57:27 -04:00
Florian Weingarten
40a37c3fb6 Merge branch 'master' into dont_render_blank_blocks
Conflicts:
	lib/liquid/tags/cycle.rb
	lib/liquid/tags/increment.rb
2013-06-27 10:03:18 -04:00
Florian Weingarten
b4fbcea114 Cycle tags are never blank 2013-06-27 14:00:38 +02:00
Florian Weingarten
c16697746b Clean up whitespace collapsing a bit 2013-06-27 13:57:26 +02:00
Florian Weingarten
f01d0dbea6 More tests for whitespace collapsing 2013-06-27 13:39:04 +02:00
Florian Weingarten
10c151e3aa Some tests for whitespace collapsing 2013-06-26 22:30:33 -04:00
Florian Weingarten
0f5441b09e Convert legacy tab indentation to spaces and remove trailing whitespace from all lines 2013-06-26 19:53:09 -04:00
Florian Weingarten
8ca4868bff Merge branch 'master' of https://github.com/ndwebgroup/liquid into ndwebgroup-master 2013-06-18 04:13:49 +02:00
Florian Weingarten
f92da6948d Merge branch 'strip-html-fix' of https://github.com/jamesallardice/liquid into jamesallardice-strip-html-fix
Conflicts:
	lib/liquid/standardfilters.rb
2013-06-18 04:11:11 +02:00
Florian Weingarten
a1b156f0d4 strip_html multi-line comment test 2013-06-18 04:06:35 +02:00
Florian Weingarten
eca520025c Merge branch 'strip-html' of https://github.com/joliss/liquid into joliss-strip-html
Conflicts:
	lib/liquid/standardfilters.rb
2013-06-18 04:04:49 +02:00
Florian Weingarten
f488058789 UTF8 truncate test 2013-06-17 11:48:03 -04:00
Florian Weingarten
e47d1af03a Fix broken 'raw' tag parsing (issue #204) 2013-06-14 12:47:27 -04:00
Florian Weingarten
5cfa13d7a4 Merge pull request #205 from phoet/stricter_handling_of_variables_in_for
rejects variables like a/b in for loops, closes #150
2013-06-13 15:26:00 -07:00
Peter Schröder
cb12497859 add test for allowing whitespace between tokens 2013-06-13 18:21:49 -04:00
Florian Weingarten
4c2e2f8a24 Merge pull request #203 from phoet/strip_carriage_return
handle carriage return in strip_newline, closes #126
2013-06-13 12:54:17 -07:00
Peter Schröder
a2df5a421d rejects variables like a/b in for loops, closes #150 2013-06-11 17:22:33 -04:00