kemko/liquid
1
0
Fork 0
mirror of https://github.com/kemko/liquid.git synced 2026-01-01 15:55:40 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity
558 Commits 123 Branches 38 Tags
f5502e8152db5befebf644c5152cb4bbc65fe32e
Commit Graph

314 Commits

Author SHA1 Message Date
Dylan Thacker-Smith
cd7fc050b1 Remove ActionView template handler 
Fixes #21
 2014-03-29 15:59:42 -04:00
Florian Weingarten
3dbb35d823 Merge branch 'freeze_all_the_things' 
Conflicts:
	History.md
	lib/liquid/tags/assign.rb
	lib/liquid/tags/capture.rb
	lib/liquid/tags/decrement.rb
	lib/liquid/tags/if.rb
 2014-03-24 12:39:34 -04:00
Dylan Thacker-Smith
fdf03076e0 Revert "Merge pull request #325 from Shopify/remove-variable-incomplete-end" 
That pull request broke raw tags with open variable tags. E.g.

{% raw %}
{{
{% endraw %}
{{ 1 }}

This reverts commit fbaabf3b59, reversing
changes made to af24d2c2ab.
 2014-03-24 09:59:07 -04:00
Dylan Thacker-Smith
d8d9984a7b Remove some unused regexes. 2014-03-21 15:50:14 -04:00
Dylan Thacker-Smith
7e0ef867d2 Make tag/variable termination error clearer. 2014-03-21 02:04:01 -04:00
Dylan Thacker-Smith
3682414cc4 Allow quoted single curly braces in variables. 2014-03-21 02:04:01 -04:00
Dylan Thacker-Smith
3b14e27f55 Allow newlines in tags and variables. 2014-03-20 17:27:03 -04:00
Dylan Thacker-Smith
d4ecaff8b8 Refactor to create tags with a parse class method instead of new. 
By moving parse out of the initializer, we can call super at the start of
the initializers for subclasses, and avoid the nasty allocate hack.
 2014-03-20 16:10:10 -04:00
Dylan Thacker-Smith
92781ec43b Move definition for TableRow to the tags folder. 2014-03-18 17:13:39 -04:00
Dylan Thacker-Smith
503d924274 Use start and end of string rather than line matching in regexes. 2014-03-13 17:56:42 -04:00
Dylan Thacker-Smith
3c06d837b5 Speed up Context#increment_used_resources 2014-02-24 23:56:39 -05:00
Bogdan Gusiev
f23e69d565 Raise liquid argument error instead of ruby argument 
Wrong number of arguments for filter invocation now raises
Liuqid::ArgumentError but not ::ArgumentError
 2014-02-21 22:12:11 +02:00
Adam Doeler
5f8a028a56 Liquid::Drop should not return a string representation of standard ruby objects 2014-02-07 14:48:02 -05:00
Florian Weingarten
0a7de51e2b Revert some freezes on non-literals 2014-01-27 14:56:07 -05:00
Florian Weingarten
d2827bfa76 Add strip, lstrip, rstrip filters 2014-01-24 11:04:43 -05:00
Nicholas Jones
8f9f12e542 Merge remote-tracking branch 'upstream/master' into correct-if-nodelists 
Conflicts:
	test/liquid/tags/for_tag_test.rb
	test/liquid/tags/if_else_tag_test.rb
 2014-01-13 12:43:43 -08:00
Nicholas Jones
06e2f2577f Add else blocks to for and case nodelists 2014-01-13 11:53:25 -08:00
Florian Weingarten
c6e0c1e490 Fix resource counting bug with respond_to?(:length) 2014-01-08 13:00:53 -05:00
Florian Weingarten
43ac8d560b Freeze all the things 2014-01-07 12:35:16 -05:00
Florian Weingarten
be7bef4d0b Merge pull request #284 from agladkyi/custom-patterns-for-template-filenames 
Custom patterns for template filenames
 2013-12-16 11:28:19 -08:00
Gaurav Chande
5e8f2f8bd0 Fix escape_once filter 2013-12-01 20:37:47 -05:00
Andrei Gladkyi
0edb252489 Option to specify custom pattern for template filenames 2013-11-30 17:55:53 +02:00
Florian Weingarten
2d1f15281b Merge pull request #282 from Shopify/load_slice 
allow drops to optimize loading a slice of elements
 2013-11-25 08:12:06 -08:00
Florian Weingarten
4647e6d86b Remove unnecessary comment, add joost's change to History.md 2013-11-25 10:52:46 -05:00
Florian Weingarten
f5620d4670 Merge branch 'master' of github.com:joost/liquid into joost-master 2013-11-25 10:51:48 -05:00
Florian Weingarten
f1a5f6899b Add raggi's change to History, remove Ruby 1.8 code from test 2013-11-25 10:48:03 -05:00
Florian Weingarten
de497eaed2 Merge branch 'class_cache' of github.com:wildfireapp/liquid into wildfireapp-class_cache 2013-11-25 10:46:18 -05:00
Tom Burns
30e5f06313 don't make original slice_collection_using_each private 2013-11-25 10:37:10 -05:00
Tom Burns
e667352629 move slice_collection optimization to utils 2013-11-24 14:00:23 -05:00
Tom Burns
cf49b06ccc allow drops to optimize loading a slice of elements 2013-11-24 12:29:15 -05:00
Florian Weingarten
445f19d454 Merge pull request #276 from Shopify/remove_some_1.8_code 
Remove some legacy Ruby 1.8 compatibility code
 2013-11-01 05:50:29 -07:00
Florian Weingarten
a599a26f1a Remove some legacy Ruby 1.8 compatibility code 2013-10-31 15:35:12 -04:00
Dylan Thacker-Smith
cc982e92d0 security: Prevent arbitrary method invocation on conditions in if tag. 2013-10-28 12:20:27 -04:00
Bouke van der Bijl
a5cd661dd9 Use public_send on condition creation 
This makes sure you can't call Kernel methods like `throw`
 2013-10-28 13:57:28 +01:00
Bouke van der Bijl
511ee7fbe1 Remove to_sym from condition creation 
This prevents a DoS http://www.tricksonrails.com/2010/06/avoid-memory-leaks-in-ruby-rails-code-and-protect-against-denial-of-service/
 2013-10-28 13:57:28 +01:00
Joost Hietbrink
5eddfe87d0 Support for passing variables to snippets in subdirs 
Now you can use "include 'some/snippet' with variable".
 2013-10-16 11:55:12 +02:00
Derrick Reimer
5db1695694 Add default filter to standard filters 2013-10-09 16:07:32 -07:00
Florian Weingarten
a25ed17e2b Merge pull request #266 from Shopify/fix_map_on_hashes 
Fix map filter on Hash inputs
 2013-10-09 14:18:22 -07:00
Arthur Neves
fa3155fdcc Bump version to 3.0.0 2013-10-09 17:12:03 -04:00
Florian Weingarten
96b30a89a9 Fix map filter on Hash inputs 2013-10-08 08:18:03 -04:00
Florian Weingarten
2efe809e11 Make blank? default to false for all tags to maintain backwards compatible 2013-09-23 08:43:26 -04:00
Simon Eskildsen
6ce0b9d705 Fix i18n regex warning in Ruby 1.8 2013-09-16 14:35:33 -04:00
Florian Weingarten
5b172a4c05 Fix unknown tags in comment tags, second try 2013-09-11 12:31:54 -04:00
Florian Weingarten
f938756a58 Revert "Merge pull request #256 from Shopify/unknown_tags_in_comments" 
This reverts commit 1ae8c0e90a, reversing
changes made to 01d352bc51.
 2013-09-11 12:13:55 -04:00
Florian Weingarten
45795f8766 Fix handling of unknown tags in comments 2013-09-11 10:40:33 -04:00
James Tucker
13c826933c Update against failed cherry-pick 2013-09-07 01:42:41 +00:00
Tristan Hume
7c5b3e0c3b Fix bad range parsing. 2013-09-04 18:13:31 -04:00
Nick Jones
ca5bc5d75b Correct if-statement nodelist. 
The nodelist returned by all tags is a list of containing nodes, except for the if tag.  This correct that inconsistency
 2013-08-31 19:03:50 +00:00
James Tucker
9b2d5b7dd3 Add a class cache to avoid runtime extend calls 
* Strainer has a class cache that creates Strainer subclasses for each filter
   set that is used on .create calls.
 * Context now creates a list of filters and passes this to Strainer.create to
   utilize the class cache in almost all use cases.
 * If add_filter was called after a render, then the method cache may still be
   invalidated.

Conflicts:

	lib/liquid/strainer.rb
 2013-08-31 18:56:35 +00:00
Tristan Hume
e8b41c8856 Fix error 2013-08-30 16:06:48 -04:00