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
558 Commits 314 Branches 70 Tags
fa14fd02e71728b2ab8432d86d782091b8b57807
Commit Graph
42 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dylan Thacker-Smith 4c477c2087 Merge pull request #333 from Shopify/remove-liquid-view 
Remove ActionView template handler
 2014-03-31 10:16:37 -04:00
Dylan Thacker-Smith cd7fc050b1 Remove ActionView template handler 
Fixes #21
 2014-03-29 15:59:42 -04:00
Dylan Thacker-Smith 8291c5e72c Merge pull request #329 from Shopify/seperate-integration-tests 
Separate unit and integration tests.
 2014-03-26 16:04:39 -04:00
Dylan Thacker-Smith 7e45155aa9 Seperate unit and integration tests. 
This makes it easier to re-use the integration tests in a seperate gem that
optimizes parts of liquid with a native implementation.
 2014-03-26 15:47:07 -04:00
Dylan Thacker-Smith f0afbc27e0 Add regression test for raw tags with open variable tags. 2014-03-24 10:01:03 -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 d1bfda15e3 Add profile:strict rake task. 2014-03-21 21:54:53 -04:00
Dylan Thacker-Smith d8d9984a7b Remove some unused regexes. 2014-03-21 15:50:14 -04:00
Dylan Thacker-Smith fbaabf3b59 Merge pull request #325 from Shopify/remove-variable-incomplete-end 
Allow quoted single curly braces in variables.
 2014-03-21 13:48:47 -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 af24d2c2ab Add missing PR reference and author to a History.md entry. 2014-03-21 02:03:31 -04:00
Dylan Thacker-Smith 4ee43bc5d2 Merge pull request #324 from Shopify/multiline-tags-and-vars 
Allow newlines in tags and variables.
 2014-03-21 00:26:14 -04:00
Dylan Thacker-Smith 1320a69fca Merge pull request #323 from Shopify/render_bang_in_tests 
Use render! in tests to make debugging test failures easier.
 2014-03-20 18:33:40 -04:00
Dylan Thacker-Smith 3b14e27f55 Allow newlines in tags and variables. 2014-03-20 17:27:03 -04:00
Dylan Thacker-Smith face33a137 Merge pull request #321 from Shopify/move-tag-parse-out-of-initialize 
Refactor to create tags with a parse class method instead of new.
 2014-03-20 16:15:58 -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 a5990042ff Use render! in tests to make debugging test failures easier. 2014-03-20 12:04:17 -04:00
Dylan Thacker-Smith 4b5e41d04e Merge pull request #322 from Shopify/use-render-bang-in-benchmarks 
Use render! in benchmarks to avoid making it faster by breaking things.
 2014-03-19 18:06:15 -04:00
Dylan Thacker-Smith 4b69f6ae83 Use render! in benchmarks to avoid making it faster by breaking things. 2014-03-19 18:01:33 -04:00
Dylan Thacker-Smith b9feb415f6 Merge pull request #320 from Shopify/move-table-row-tag 
Move definition for TableRow to the tags folder.
 2014-03-18 17:16:32 -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 ff5c1f83f7 Merge pull request #318 from Shopify/stackprof 
Use stackprof for profiling.
 2014-03-14 10:27:46 -04:00
Dylan Thacker-Smith e2b337af2f Merge pull request #317 from Shopify/string-anchors 
Use start and end of string rather than line matching in regexes.
 2014-03-14 10:17:33 -04:00
Dylan Thacker-Smith f373b1003d Use stackprof for profiling. 2014-03-14 10:03:50 -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 3efa8e8762 Merge pull request #310 from Shopify/faster-increment-used-resources 
Speed up Context#increment_used_resources
 2014-02-25 00:18:27 -05:00
Dylan Thacker-Smith 3c06d837b5 Speed up Context#increment_used_resources 2014-02-24 23:56:39 -05:00
Dylan Thacker-Smith 4e14a651a7 Merge pull request #274 from Shopify/restrict-send-on-conditions 
security: Prevent arbitrary method invocation on conditions in if tag.
 2013-10-28 10:01:47 -07:00
Dylan Thacker-Smith cc982e92d0 security: Prevent arbitrary method invocation on conditions in if tag. 2013-10-28 12:20:27 -04:00
Dylan Thacker-Smith 437e9201de Merge pull request #174 from yardstick/drop-context 
Allow a Liquid::Drop to be passed into Template#render
 2013-06-10 07:46:06 -07:00
Dylan Thacker-Smith 482115d784 Merge pull request #173 from jsw0528/master 
fix `can't convert Fixnum into String` for `replace`
 2013-06-04 13:09:42 -07:00
Dylan Thacker-Smith 23203c0122 Fix some old templates that abused colon as an argument separator. 
This is a fallback for keyword argument parsing since this feature broke
old templates that accidentally used a colon as a filter argument
separator.
 2013-05-21 17:47:46 -04:00
Dylan Thacker-Smith 690b3ff27f Merge pull request #135 from astathopoulos/preserve_filters_ordering 
Use array instead of Hash to keep the registered filters
 2013-05-17 05:25:07 -07:00
Dylan Smith f7d1e1d0c1 Release 2.5.0 2013-03-06 10:51:06 -05:00
Dylan Smith 28fd2222c8 Merge branch 'remove-symbolizing' 2013-03-05 16:33:56 -05:00
Dylan Smith 9913895b81 Merge branch 'master' into remove-symbolizing 
Conflicts:
	lib/liquid/variable.rb
 2013-03-05 15:25:11 -05:00
Dylan Smith d706db3bd7 Add support for filter keyword arguments. Closes #175 2013-03-05 15:17:14 -05:00
Dylan Smith 38b4543bf1 Use sets to check if methods are invokable without symbolizing. 2013-02-05 14:45:08 -05:00
Dylan Smith ee41b3f4a3 Fix filter parser regex for filter args without separating spaces. 
The regex was using \S+ to match the comma between the filters
arguments, but would continue to match idependent quote characters and
filter separators. This can result in multiple filters being interpreted as
a single one with many arguments.
 2012-12-18 01:23:31 -05:00
Dylan Smith f5a20ff8e8 Fix a regression in tablerow limit parameter. 
I had accidentally read slice_collection_using_each as using to as an
inclusive limit rather than exclusive, and no tests covered the offset or
limit parameters.
 2012-06-21 14:56:05 -04:00
Dylan Smith d0184555d9 Allow tablerow to work with any Enumerable. Closes #132 2012-06-20 11:07:11 -04:00