Commit Graph

544 Commits

Author SHA1 Message Date
Dylan Thacker-Smith
bb954bce1e Use StringSlice.join on the rendered results. 2014-02-28 14:12:57 -05:00
Dylan Thacker-Smith
cc0276bb97 Add a StringSlice class to use in the nodelist. 2014-02-28 13:16:07 -05:00
Dylan Thacker-Smith
03d586aafe Add convenience methods for getting a struct from a ruby object.
If we are trying to get the struct from something other than self, then we
should make sure to check the class of the object.  This util functions
make this easier.
2014-02-28 10:08:55 -05:00
Dylan Thacker-Smith
dc8a34a52f Implement Block#parse_body in C. 2014-02-28 07:47:36 -05:00
Dylan Thacker-Smith
99cebf74bc Rename Block#parse to parse_body since that is how it is being used. 2014-02-27 23:16:11 -05:00
Dylan Thacker-Smith
7eb64886dc Move the parse method out of Tag, only blocks need the body parsed.
The parse method should be renamed to something like parse_body,
since that is how it is used, and no non-block tags were using the
parse method.
2014-02-27 22:31:09 -05:00
Dylan Thacker-Smith
f89046e81f Use super rather than render_all in single block render classes. 2014-02-27 21:38:49 -05:00
Dylan Thacker-Smith
9ee4573ef4 Avoid keeping track of two lists of nodes during parsing. 2014-02-27 20:51:05 -05:00
Dylan Thacker-Smith
a48b4f47f6 Return nil in Document#block_delimiter rather than an empty array.
The block delimiter is normally a string, so nil makes more sense when
there is no delimiter. We also don't want to allocate an array for no
reason.
2014-02-27 20:06:57 -05:00
Dylan Thacker-Smith
72d402837e Remove unused Block#end_tag method.
Although the method is called, it is defined with an empty body and not
overridden to do anything else.
2014-02-27 18:53:18 -05:00
Dylan Thacker-Smith
06bef40527 Fix a missing return warning. 2014-02-27 18:47:55 -05:00
Dylan Thacker-Smith
a48b245e6e Turn on C compiler warnings. 2014-02-27 18:45:57 -05:00
Dylan Thacker-Smith
d4aabda625 Avoid freeing of uninitialized memory.
Thanks to Isha for pointing this out.
2014-02-27 18:32:19 -05:00
Dylan Thacker-Smith
dab6bdfdee Make sure the ext directory is included in the distributed gem. 2014-02-27 15:50:43 -05:00
Dylan Thacker-Smith
8c075fca1f Remove a couple FIXME comments which are only partially a lie.
I added those comments before creating an invalid token type to return the
error. However, we still aren't making use of the token type.
2014-02-27 15:21:57 -05:00
Dylan Thacker-Smith
ea8406e36e Create a Liquid::Tokenizer class in the C extension. 2014-02-27 15:20:22 -05:00
Dylan Thacker-Smith
8bb3bca64a Require the liquid extension when liquid is required. 2014-02-27 14:22:18 -05:00
Dylan Thacker-Smith
5de1082201 Add profile:stackprof rake task. 2014-02-27 11:20:49 -05:00
Dylan Thacker-Smith
7ba02d2811 Use start and end of string rather than line matching in regexes. 2014-02-27 10:07:04 -05:00
Dylan Thacker-Smith
2066676bf4 Add a C extension that doesn't yet do anything. 2014-02-27 09:58:33 -05: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
Arthur Nogueira Neves
d3fc30ef85 Merge pull request #309 from bogdan/argument_error_for_filters
Raise liquid argument error instead of ruby argument
2014-02-21 15:13:11 -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
fa179e811d Merge pull request #306 from Shopify/default_to_s_for_drops
Liquid::Drop should not return a string representation of standard ruby objects
2014-02-13 13:45:01 -05:00
Adam Doeler
18907fc570 Updates History.md 2014-02-10 10:24:37 -05: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
765751b9cb Merge pull request #303 from Shopify/strip_filter
Add strip, lstrip, rstrip filters
2014-01-24 08:09:19 -08:00
Florian Weingarten
d2827bfa76 Add strip, lstrip, rstrip filters 2014-01-24 11:04:43 -05:00
Florian Weingarten
70d92b84ab Rename test 2014-01-24 10:55:45 -05:00
Florian Weingarten
808fa244ca Merge pull request #250 from wildfireapp/correct-if-nodelists
Correct if-statement nodelist.
2014-01-13 12:47:51 -08:00
Nicholas Jones
5570f697fd Update history 2014-01-13 12:46:43 -08: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
Florian Weingarten
17dae40707 Fix History.md ordering 2014-01-13 15:38:18 -05:00
Nicholas Jones
06e2f2577f Add else blocks to for and case nodelists 2014-01-13 11:53:25 -08:00
Florian Weingarten
ee7edacacc Merge pull request #298 from Shopify/respond_to_resource_counting_bug
Fix resource counting bug with respond_to?(:length)
2014-01-08 10:37:48 -08:00
Florian Weingarten
62a86a25ae update history 2014-01-08 13:37:24 -05:00
Florian Weingarten
c6e0c1e490 Fix resource counting bug with respond_to?(:length) 2014-01-08 13:00:53 -05:00
Arthur Nogueira Neves
0388376925 Merge pull request #296 from Shopify/ruby2.1.0
Ruby2.1.0
2014-01-07 08:55:03 -08:00
Arthur Neves
57c8583dc3 Add 2.1.0 to travis 2014-01-07 11:37:24 -05:00
Arthur Neves
a13f237d3c Remove some 192 tests 2014-01-07 11:37:01 -05:00
Arthur Nogueira Neves
9ed2fa425b Merge pull request #295 from Shopify/remove_ruby_debug
remove ruby-debug
2014-01-07 08:34:19 -08:00
Arthur Neves
208c6c8800 remove ruby-debug 2014-01-07 11:31:46 -05:00
Florian Weingarten
9ec2b9da2d Rename tests because of name clashes (same method name used twice) 2014-01-07 11:20:32 -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
Andrei Gladkyi
0ae42bbc32 Added separate test for custom patterns specifying
+ updated History.md
2013-12-16 17:48:43 +02:00
Gaurav Chande
0ec69890ab Merge pull request #287 from Shopify/fix-escape-once
Fix escape_once filter
2013-12-02 08:57:24 -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
5ce36f79e9 Add Tom's slice loading change to History.md 2013-11-25 11:12:33 -05:00