Commit Graph

531 Commits

Author SHA1 Message Date
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
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
Arthur Neves
d465d5e20c Add ruby 2.1 on travis 2013-11-25 10:35:24 -05:00
Arthur Neves
7989e834f3 Allow rbx failure and not 2.0.0 2013-11-25 10:33:41 -05:00
Arthur Neves
c264459931 Update history log
Conflicts:
	History.md
2013-11-25 10:28:12 -05:00
Tom Burns
e667352629 move slice_collection optimization to utils 2013-11-24 14:00:23 -05:00
Tom Burns
2c26a880f0 add another test showing equivalent functionality 2013-11-24 12:32:32 -05:00
Tom Burns
cf49b06ccc allow drops to optimize loading a slice of elements 2013-11-24 12:29:15 -05:00
Florian Weingarten
f015d804ea Update history 2013-11-11 09:03:39 -05:00