Labyricorn/liquid
1
0
Fork 0
mirror of https://github.com/Shopify/liquid.git synced 2026-09-12 23:40:45 -07:00
Code Issues Packages Projects Releases Wiki Activity
118 Commits 314 Branches 70 Tags
aafb3ed9f223a6623b40ed90ebc1b64e2c31090e
Commit Graph
77 Commits
Author SHA1 Message Date
Mark H. Wilkinson aafb3ed9f2 Fix behaviour of Context#stack when Context#push raises. 
We only want to pop the scope at the end of the method if pushing it
succeeded, so the push needs to be outside the block with the ensure.
 2011-04-12 14:24:26 +01:00
David TurnbullandTobias Lütke 7bbb4ff84f Context is no longer lost when moving into a Liquid FileSystem. 2011-01-28 21:19:44 -05:00
thedarkoneandTobias Lütke f7ff9c81d3 Make use of the Module#public_method_defined?. 2011-01-28 21:16:22 -05:00
thedarkoneandTobias Lütke a65c4f51bc These are strings already. 2011-01-28 21:16:22 -05:00
thedarkoneandTobias Lütke a24049906b Resolve literals faster. 2011-01-28 21:16:22 -05:00
thedarkoneandTobias Lütke aa678302d6 Fix comments. 2011-01-28 21:16:22 -05:00
thedarkoneandTobias Lütke 6d0bb3303c Clean-up Context#stack. 2011-01-28 21:16:22 -05:00
Austin Mills 4fec29f288 OPS-250 Modifying liquid error handling so that it no longer captures Exceptions that are not subclasses of StandardError (previously, it was rescuing things like Interrupt and NoMemoryError). 2011-01-10 14:55:05 -06:00
DBAandTobias Lütke 3d43efe2bc Ruby compatibility issues 
- regexp engines are different from 1.8 to 1.9, fixed the literal shorthand regexp accordingly
  - changed the shorthand regexp text from a match to a string scan
  - test_helper now loads rubygems unless RUBY_VERSION is > 1.9
 2010-08-24 08:17:42 +08:00
DBAandTobias Lütke c00a650492 Literal 
- added support for literals [closes #6]

Code beautifier
  - indented some files
 2010-08-24 08:17:42 +08:00
DBAandTobias Lütke 4819eb1a92 IF tag 
- now properly allows operands to have conditions (eg and, or) [closes #13]
 2010-08-24 08:17:41 +08:00
DBAandTobias Lütke 8579807d29 Conditions 
- added test to assert that conditions can contain conditions within its value (eg 'a-and-b')

Tags
  - indented the if tag

Tests
  - added ruby-debug to the test_helper
  - indented some tests
 2010-08-24 08:17:41 +08:00
DBAandTobias Lütke 8a0a8cfd99 FiltersTest 
- added test that asserts nonexistent filters are ignored

Liquid
  - Bill's mind blowing liquid patch to support filter separators (|) in quoted strings (svn r7516).
  - This is a consolidation effort based on newrelic's liquid fork commit 88a5b891d009054d56b994c9448725c74e2b1e13
 2010-08-23 01:30:05 +08:00
DBAandTobias Lütke 8304a046c9 Context 
- Check arity of proc before calling, to prevent error when using ruby 1.9.1+

Code beautifer
  - context.rb
 2010-08-23 01:30:03 +08:00
DBAandTobias Lütke c59cde9d17 Code beautifier 
- standardfilters.rb
  - standard_filter_test.rb
 2010-08-23 01:30:00 +08:00
DBAandTobias Lütke 29e140b655 StandardFilters 
- added escape_once, based on ActionView
 2010-08-23 01:30:00 +08:00
DBAandTobias Lütke 8e4573a7bf Strainer 
- respond_to_missing? is now a required method
 2010-08-23 01:29:59 +08:00
Tobias Lütke 6831eac902 Released gem 2.1.3 2010-08-05 18:07:05 -04:00
Dennis TheisenandTobias Lütke 13f98de7f3 Change behavior of capture tag to use existing variables if they already have been initialized in an outer scope. 2010-08-06 06:02:37 +08:00
Dennis TheisenandTobias Lütke e26f509277 Fixed minor typos in inline documentation for assign and capture 2010-08-06 06:02:37 +08:00
James MacAulay ff829e7996 fix if tag parsing with expressions starting with and/or 2010-07-07 16:48:23 -04:00
Jesse StorimerandJames MacAulay d87500bfe3 Liquid strip_html strips out the content of <script> tags. [#173 state:resolved] 2010-02-08 11:35:45 -05:00
James MacAulay fce8bcb1e7 Change behaviour of arithmetic filters to cast arguments to numbers 2010-02-04 11:45:55 -05:00
James MacAulay cbf8986745 fix variable output with quoted strings containing pipe ("|") characters 2009-09-23 15:54:25 -04:00
James MacAulay 11dc18bfdf A better fix for "and"/"or" in strings 
(now with less side effects)
 2009-09-23 15:44:29 -04:00
James MacAulay f42ce88456 fixed conditions with strings containing "and"/"or" 2009-09-14 15:01:26 -04:00
James MacAulay d1d6febfc1 'contains' operator returns false if either operand is nil 2009-08-19 19:38:31 -04:00
James MacAulay 0150067c40 Revert "Raise FilterNotFound on use of non-existent filter" 
This reverts commit 01c25a11a3.

Conflicts:

	test/context_test.rb
 2009-08-19 19:24:33 -04:00
James MacAulay 2d0532e041 QuotedStrings can be empty 2009-08-19 18:37:40 -04:00
James MacAulay 167825aa92 further differentiate between environments and only evaluate Procs once 2009-08-07 11:24:15 -04:00
James MacAulay c792c29066 Templates and Contexts differentiate between different sources of assigns 2009-08-06 18:33:41 -04:00
James MacAulay a4d7c80ce0 now able to set file_system for include tag through registers 2009-08-06 18:24:27 -04:00
Tobias Lütke 44f35c0990 Performance improvement for Block parsing. ~ 10% speedup 2009-06-15 10:33:33 -04:00
Tobias Lütke a65bd76e72 Merge branch 'master' of [email protected]:tobi/liquid 
Conflicts:
	lib/liquid.rb
	lib/liquid/context.rb
	lib/liquid/variable.rb
	test/standard_tag_test.rb
 2009-06-15 09:00:30 -04:00
Tobias Lütke 8ac4d6a92a cycle test coverage 2009-06-15 08:55:50 -04:00
Brian Candler 01c25a11a3 Raise FilterNotFound on use of non-existent filter 2009-06-06 16:32:20 +01:00
Brian Candler f29b9335c5 Allow question-mark at end of variable name only 2009-06-06 16:20:34 +01:00
Brian Candler cfe3e6f3be Allow Hash with default value or default proc to be used 2009-06-06 16:16:06 +01:00
Brian Candler 09c0b3b391 Allow template to be re-used without persisting assigns 2009-06-06 16:15:37 +01:00
Jakub KuźmaandTobias Lütke ed1b542abf All tests pass on Ruby 1.9.1 
Signed-off-by: Tobias Lütke <[email protected]>
 2009-04-17 06:33:28 +08:00
Jakub KuźmaandTobias Lütke 8d27864845 Ruby 1.9.1 bugfixes 
Signed-off-by: Tobias Lütke <[email protected]>
 2009-04-17 06:33:25 +08:00
Jakub KuźmaandTobias Lütke daadb1a2d6 Ruby 1.9.1 bugfixes 
Signed-off-by: Tobias Lütke <[email protected]>
 2009-04-17 06:33:20 +08:00
Tobias Lütke 68433a52a3 Some more documentation for regexpes 2009-04-06 08:45:04 -06:00
Tobias Lütke 075341d01c Fix for parsing spaces in fragments 2009-04-06 08:37:39 -06:00
Tobias Lütke 981831bc49 Corrected spelling mistake 2009-04-06 08:33:44 -06:00
Tobias Lütke edcc14f148 Reverted james filter in tags branch 
This reverts commit 282786d7e2.

Conflicts:

	lib/liquid.rb
	lib/liquid/variable.rb
	test/if_else_test.rb
 2009-04-06 08:30:19 -06:00
Tobias Lütke 26faf512a1 bump 2009-03-10 17:23:17 -04:00
Cody FauserandTobias Lütke 56f1aa9b4a Fix LiquidView for Rails 2.2. Fix local assigns for all versions of Rails 
Signed-off-by: Tobias Lütke <[email protected]>
 2009-01-27 02:18:06 +08:00
Tobias Lütke 13ddc6d96b Added append/prepend filters 2009-01-15 16:59:18 -05:00
Tobias Lütke 88309cf415 Fixed some parse errors thanks to Daniel Sheppard [Closes #6] 2008-12-22 11:47:26 -05:00