Ken Dreyer and Florian Weingarten
3e3a415457
tests: fix whitespace in hash_ordering_test
...
Indent two spaces, not one.
2014-07-28 16:36:43 +00:00
Ken Dreyer and Florian Weingarten
deba039d6d
tests: reset "contains" op during IfElseTagTest
...
Two tests in IfElseTagTest each set a custom operator function for the
"contains" comparison operator.
The problem is that IfElseTagTest was clobbering the original operator
in Liquid and leaving it in an altered state.
As an example, ConditionUnitTest's test_contains_works_on_arrays relies
on the specific behavior of the "contains" operator, and its
test_contains_works_on_arrays was failing.
The problem was present when both test classes were require'd inside a
single ruby process. One example is "rake test", which runs "require" on
every test file. Another basic example is the following command:
ruby -Itest -e "require 'integration/tags/if_else_tag_test.rb';
require 'unit/condition_unit_test.rb'"
This would cause test_contains_works_on_arrays to fail.
Update IfElseTagTest to avoid clobbering the "contains" operator.
With this change, ConditionUnitTest's test_contains_works_on_arrays now
passes.
2014-07-28 16:36:43 +00:00
Ken Dreyer and Florian Weingarten
ee4295c889
tests: switch to minitest
...
Ruby 1.9+ uses Minitest as the backend for Test::Unit. As of Minitest 5,
the shim has broken some compatibility with Test::Unit::TestCase in some
scenarios.
Adjusts the test suite to support Minitest 5's syntax.
Minitest versions 4 and below do not support the newer Minitest::Test
class that arrived in version 5. For that case, use the
MiniTest::Unit::TestCase class as a fallback
Conflicts:
test/integration/tags/for_tag_test.rb
test/test_helper.rb
2014-07-28 16:36:38 +00:00
Jason Hiltz-Laforge
a8e63ff03d
Merge pull request #398 from Shopify/fix_order_of_constructor_initialize
...
Reorder constructor to avoid referencing uninitialized variable when environment contains a self-referencing proc
2014-07-24 15:04:36 -04:00
Jason Hiltz-Laforge
052ef9fcb8
Reorder constructor to avoid referencing uninitialized variable when environment contains a self-referencing proc
2014-07-24 18:58:23 +00:00
Arthur Neves
d07b12dc7d
Update History log
...
Bring latest History from 2-6-stable and 2-5-stable
2014-07-24 11:01:19 -04:00
Arthur Nogueira Neves
32e4f2d3b1
Merge pull request #240 from Shopify/remove_flatten
...
remove .flatten on standard filters
2014-07-24 10:54:28 -04:00
Arthur Nogueira Neves
2cb1483d54
Merge pull request #397 from Shopify/bogdan-excetion-handling-for-humans
...
Excetion handling for humans (2)
2014-07-24 10:51:02 -04:00
Florian Weingarten
6c6350f18b
Exception handling for humans
...
Ability to pass exception_handler as a block to #render
and provide whatever behavior you want on handling exceptions
https://github.com/Shopify/liquid/pull/254
2014-07-24 14:44:02 +00:00
Florian Weingarten
eae24373e6
remove unnecessary flatten filter
2014-07-24 02:56:57 +00:00
Jason Hiltz-Laforge
034a47a6cf
Merge pull request #395 from Shopify/fix_block_delimiter
...
Forgot an error message case
2014-07-23 22:35:13 -04:00
Jason Hiltz-Laforge
51c1165f26
Forgot an error message case
2014-07-24 02:27:26 +00:00
Florian Weingarten
0b45ffeada
add more legacy tests
2014-07-24 00:33:39 +00:00
Arthur Neves
b7b243a13d
Fix regression on map
2014-07-23 17:16:21 -04:00
Arthur Neves
18e8ce1eb0
add flatten filter
2014-07-23 17:16:20 -04:00
Florian Weingarten and Arthur Neves
994f309465
Fix broken standardfilter test
2014-07-23 17:15:39 -04:00
Arthur Neves
02d42a1475
Array is a Enumerable
2014-07-23 17:14:27 -04:00
Arthur Neves
d099878385
add a input iterator to standard filter
2014-07-23 17:14:27 -04:00
Arthur Neves
6a061cbe81
remove .flatten on standard filters
2014-07-23 17:14:26 -04:00
Arthur Nogueira Neves
c864a75903
Merge pull request #341 from curebit/comparation_argument_error
...
Raise Liquid::ArugmentError when condition has wrong usage
2014-07-23 17:03:31 -04:00
Jason Hiltz-Laforge
d6fdf86acd
Merge pull request #393 from Shopify/fix_block_delimiter
...
Fixing regression from block delimiter enhancement
2014-07-23 16:24:24 -04:00
Jason Hiltz-Laforge
55597b8398
Fixing regression from block delimiter enhancement
2014-07-23 19:18:02 +00:00
Florian Weingarten
c75522026b
Merge pull request #389 from Shopify/remove_unnecessary_blank_stuf
...
Remove unnecessary blank? code
2014-07-23 15:07:26 +02:00
Florian Weingarten
1e0e9f1f31
Remove unnecessary blank? code
2014-07-22 21:19:12 +00:00
Jason Hiltz-Laforge
5fc1929b73
Merge pull request #384 from Shopify/optimize_block_parsing
...
Optimize block parsing -- don't recreate delimiter, use strings instead of regex
2014-07-22 12:59:05 -04:00
Jason Hiltz-Laforge
746a800475
Merge pull request #386 from Shopify/optimize_variable_parsing
...
Reduce temporary objects during variable/filter parsing
2014-07-22 11:22:57 -04:00
Jason Hiltz-Laforge
85dc7ef610
Merge pull request #385 from Shopify/optimize_scope_variable_resolution
...
Remove block in favour of for loop to reduce temporary object allocation during variable context resolution
2014-07-22 11:22:33 -04:00
Jason Hiltz-Laforge
bc3b066ba8
Remove block in favour of for loop to reduce temporary object allocation during variable context resolution
2014-07-22 14:54:50 +00:00
Jason Hiltz-Laforge
3c2de7737d
Optimize block parsing -- don't recreate delimiter, use strings instead of regex
2014-07-22 02:43:20 +00:00
Jason Hiltz-Laforge
adb7d2bbb8
Reduce temporary objects during variable/filter parsing
2014-07-21 21:13:59 +00:00
Jason Hiltz-Laforge
0e56cf99ab
Merge pull request #383 from Shopify/optimize_variable_lookup
...
Cache parsed markup parts to avoid repeated calls during template render
2014-07-21 12:29:58 -04:00
Jason Hiltz-Laforge
0df3f1c372
Cache parsed markup parts to avoid repeated calls during template render
2014-07-21 15:55:06 +00:00
Jason Hiltz-Laforge
44b9ad604f
Merge pull request #381 from Shopify/add_object_profiling
...
Add object profiling in addition to cpu profiling
2014-07-16 16:41:31 -04:00
Jason Hiltz-Laforge
535d549978
Merge pull request #380 from Shopify/optimize_interrupt_handling
...
Optimize checking for interrupts by replacing any? with NOT empty?
2014-07-16 11:36:32 -04:00
Jason Hiltz-Laforge
32349033a9
Add object profiling in addition to cpu profiling
2014-07-16 15:32:04 +00:00
Jason Hiltz-Laforge
fd8c30070a
Adding tests, spy dependency
2014-07-16 15:05:45 +00:00
Jason Hiltz-Laforge
4cfc05e32a
Optimize checking for interrupts by replacing any? with NOT empty?
2014-07-15 18:31:40 +00:00
Florian Weingarten
c4bc6cf3db
Merge pull request #378 from Shopify/revert_352
...
Revert: Add error messages for missing variables when :strict
2014-07-08 17:31:19 +02:00
Florian Weingarten
0ac3ec7834
Revert "Merge pull request #352 from gaiottino/master"
...
This reverts commit 553b0926ae628ab3dc6a
2014-07-08 14:48:19 +00:00
Florian Weingarten
8909c9f27a
add regression tests for #377
2014-07-08 14:47:39 +00:00
David Cornu
51c708c8f8
Merge pull request #376 from Shopify/tag-class-reloading
...
Avoid holding on to stale tag classes
2014-07-03 12:01:50 -04:00
David Cornu
f57383af37
Allow tag classes to be reloaded when using Liquid.cache_classes is false
...
Because Liquid keeps a reference to tag classes, Rails class reloading may
cause problems with custom tags. This commit introduces a setting that
allows these classes to be resolved when required.
2014-07-02 20:03:18 +00:00
Jean Boussier
d007c50856
Merge pull request #374 from Shopify/remove-duplicate-ruby-version
...
Give some ❤️ to travis.yml
2014-07-02 11:04:38 -04:00
Tobias Lütke
101f125a69
Merge pull request #375 from Shopify/relative-link
...
Fixed relative link
2014-06-30 17:19:37 -04:00
Tony Zou
5110ca906c
Fixed relative link
2014-06-30 16:43:37 -04:00
Jean Boussier
ac0f63eda9
rbx-19mode is not supported anymore
2014-06-28 16:21:08 -04:00
Jean Boussier
1372274fca
Do not intall stackprof under jruby nor rubinius
2014-06-28 16:09:14 -04:00
Jean Boussier
69951be173
Canonicalize travis ruby versions
2014-06-28 16:02:37 -04:00
Arthur Nogueira Neves
c9863836cd
Merge pull request #371 from Shopify/unfreeze-version-string
...
Unfreeze version string
2014-06-24 09:59:46 -05:00
Jean Boussier
14b8d824d7
Unfreeze version string
...
It breaks gem installation on ruby 1.9.x (older rubygem?)
2014-06-23 10:47:10 -04:00
