Compare commits

..
826 Commits
Author SHA1 Message Date
Lourens Naudé e853bf5b84 Also dump object distribution 2015-05-06 10:45:20 -04:00
Lourens Naudé 27248f1eb1 Lazy init context errors and interrupts to prevent excess allocation 2015-05-05 23:40:52 -04:00
Lourens Naudé 174839fbef Reuse filters array during variable parsing 2015-05-05 23:30:05 -04:00
Lourens Naudé 01a86728f2 Remove needless intermediate local var in VariableLookup#initialize 2015-05-05 23:21:28 -04:00
Lourens Naudé 0e38f88b58 Recycle the array buffer in BlockBody#render 2015-05-05 23:02:08 -04:00
Lourens Naudé 5a48edae6a Introduce support for memory usage profiles 2015-05-05 23:00:28 -04:00
Justin Li 76c24db039 Remove ruby-head from allowed failures 2015-05-05 12:49:04 -04:00
James Reid-Smith 251ce7483c Merge pull request #441 from Shopify/remove_context_from_read_template_file
Removed context from read_template_file, fixed tests to match new arity
2015-04-27 12:13:36 -04:00
James Reid-Smith 4592afcc8b Updated History.md and removed a couple remaining methods using the old signature 2015-04-27 15:45:44 +00:00
James Reid-Smith 448766b0c4 Removed context from read_template_file, fixed tests to match new arity 2015-04-27 15:27:03 +00:00
Justin Li 6390652c3f Update changelog with backported patches 2015-04-24 16:09:37 -04:00
Justin Li f266aee2e5 Slightly more concise issue# reference in changelog 2015-04-21 23:40:42 -04:00
Justin Li df0649a031 Update changelog 2015-04-21 23:36:54 -04:00
Justin Li 78a5972487 Merge pull request #541 from Shopify/history-sync
Sync History.md for Liquid 4
2015-04-21 23:34:29 -04:00
Justin Li 298ae3357c Merge pull request #551 from Shopify/expose-variable-name
Merge pull request 551
2015-04-21 23:33:13 -04:00
Justin Li f1f3f57647 Remove command_lookups reader 2015-04-21 00:25:51 -04:00
Justin Li e5dd63e1fc Expose name, lookups, and command flags from VariableLookup 2015-04-20 17:36:04 -04:00
Justin Li 881f86d698 Merge pull request #550 from Shopify/minitest-fail-workaround
Disable minitest expectation interface due to reckless modification of Object
2015-04-20 10:22:19 -04:00
Justin Li a1b209d212 Disable minitest expectation interface due to reckless modification of Object 2015-04-20 10:15:19 -04:00
Thierry Joyal 8e5926669b Merge pull request #545 from Shopify/explode-invokable_methods-on-drop
Explode invokable_methods method on Liquid::Drop
2015-04-02 09:02:48 -07:00
Thierry Joyal 8736b602ea Explode invokable_methods method on Liquid::Drop 2015-04-02 13:16:07 +00:00
Justin Li b8365af07d Add changes for 4.0.0 2015-03-25 14:53:43 -04:00
Justin Li 53842a471e Create history section for 4.0.0 2015-03-25 14:40:19 -04:00
Justin Li 86a82d3039 Merge pull request #540 from Shopify/array-concat
Add array concat filter
2015-03-25 01:42:22 -04:00
Justin Li 2b78e74b4e Add test for concat filter with non-array input 2015-03-25 01:34:47 -04:00
divecchandJustin Li db396dd739 adding concat filter to append arrays 2015-03-25 01:31:22 -04:00
Justin Li 3213db54d6 Merge pull request #520 from Shopify/forloop-parentloop
Add forloop.parentloop as a reference to the parent loop
2015-03-25 01:22:35 -04:00
Justin Li 97a3f145a1 Merge pull request #499 from kreynolds/to_date_downcase_regression
Fix case sensitivity regression in date standard filter
2015-03-25 01:22:04 -04:00
Florian Weingarten 2fbe813770 Merge pull request #539 from Dorian/patch-1
Update module_ex.rb code documentation and code style
2015-03-24 15:21:22 +01:00
Dorian Marié 23a23c6419 Update module_ex.rb code documentation and code style
Didn't look good on rubydoc.info: http://i.imgur.com/469N92P.png
2015-03-24 14:09:08 +01:00
Dylan Thacker-Smith 63eb1aac69 Merge pull request #519 from Shopify/remove-filter-method-blacklist
Allow filters to redefine Object methods to make them invokable.
2015-02-04 18:07:51 -05:00
Justin Li 205bd19d3f Add forloop.parentloop as a reference to the parent loop 2015-02-04 12:43:09 -05:00
Dylan Thacker-Smith 950f062041 Allow filters to redefine Object methods to make them invokable. 2015-02-03 13:51:33 -05:00
Tobias Lütke 3476a556dd Merge pull request #512 from Shopify/fix_tobi_name
Fix Tobi last name on gemspec
2015-01-23 21:24:04 -05:00
Arthur Neves d2ef9cef10 master is 4.0.0 2015-01-23 10:49:07 -05:00
Arthur Neves 0021c93fef Add ruby 2.2 to travis
and allow failure on ruby head
2015-01-23 10:42:26 -05:00
Arthur Neves dcf7064460 Fix Tobi last name on gemspec 2015-01-23 10:21:40 -05:00
Florian Weingarten bebd3570ee Merge pull request #506 from Shopify/fix_capture_with_hyphen
Use VariableSignature as Syntax for Capture tag to allow hyphens in variable names
2015-01-10 23:27:00 -05:00
Florian Weingarten 7cfee1616a Use VariableSignature as Syntax for Capture tag to allow hyphens in variable names 2015-01-09 14:15:26 +00:00
Arthur Nogueira Neves 4b0a7c5d1d Merge pull request #504 from alfredxing/duplicate-keys
Remove duplicate `index0` key in TableRow tag
2014-12-30 13:15:10 -05:00
Alfred Xing 5df1a262ad Remove duplicate key in hash 2014-12-25 12:12:42 -08:00
Kelley Reynolds 84fddba2e1 Remove regex for downcase and is_a?(String) 2014-12-18 13:01:23 -05:00
Kelley Reynolds 8b0774b519 Fix case sensitivity regression in date standard filter 2014-12-16 10:37:05 -05:00
Justin Li e2f8b28f56 Merge pull request #492 from Shopify/resource-counting-perf
Resource counting perf
2014-12-11 16:05:41 -05:00
Justin Li 3080f95a4f Make render_length tests stricter 2014-12-11 10:41:47 -05:00
Justin Li cc57908c03 Add test for render_length persisting between block bodies 2014-12-11 10:38:47 -05:00
Justin Li 4df4f218cf Use same template instance 2014-12-09 17:25:15 -05:00
Justin Li c2f71ee86b Reset resource consumption before each render 2014-12-09 17:23:07 -05:00
Justin Li 9f7e601110 Convert render output to strings in BlockBody 2014-12-05 15:17:09 -05:00
Justin Li 3755031c18 Merge pull request #485 from Shopify/lazy-load-profiler-hooks
Defer loading profiler hooks
2014-12-05 15:10:16 -05:00
Justin Li b628477af1 Disambiguate checking if Liquid::Profiler is defined 2014-12-04 17:51:54 -05:00
Justin Li dd455a6361 Force user to require the profiler themselves 2014-12-04 17:48:26 -05:00
Justin Li 8c70682d6b Don't automatically load hooks 2014-12-04 17:39:41 -05:00
Justin Li 742b3c69bb Remove commented code 2014-12-04 16:30:37 -05:00
Justin Li 1593b784a7 Simplify interface for setting template resource limits 2014-12-04 16:18:21 -05:00
Justin Li db00ec8b32 Move resource limit tracking to its own class 2014-12-04 16:18:09 -05:00
Justin Li 3ca40b5dea Merge pull request #491 from Shopify/drop-ruby-1-9
Drop Ruby 1.9 from CI, add Ruby head
2014-12-03 12:52:10 -05:00
Justin Li 378775992f Drop Ruby 1.9 from CI, add Ruby head 2014-12-02 14:33:51 -05:00
Florian Weingarten 319400ea23 Merge pull request #489 from alex-ross/patch-1
Fixes syntax error in documentation for unless tag
2014-11-19 14:02:58 +01:00
Alexander Ross 289a03f9d7 Fixes syntax error in documentation for unless tag 2014-11-19 10:49:58 +01:00
Justin Li a0710f4c70 Merge pull request #486 from Shopify/fix-exponential-warnings
Fix #warnings taking exponential time to compute
2014-11-12 17:22:16 -05:00
Justin Li 737be1a0c1 Use Timeout#timeout for warnings tests 2014-11-12 17:03:48 -05:00
Justin Li 1673098126 Handle potential case where warnings returns nil 2014-11-12 16:46:10 -05:00
Justin Li 422bafd66a Fix #warnings taking exponential time to compute 2014-11-12 16:12:00 -05:00
Justin Li c0aab820ed Lazily load profiler hooks 2014-11-12 00:05:01 -05:00
Florian Weingarten 3321cffe08 Merge pull request #482 from joshk/patch-1
Use the new beta build env on Travis
2014-11-07 03:06:52 +01:00
Josh Kalderimis f2772518b0 Use the new beta build env on Travis
job start in seconds, instead of 20-120 seconds
2014-11-07 14:54:21 +13:00
Justin Li 76ef675eb2 Merge pull request #481 from Shopify/fix-nil-blank
Coerce regex @blank output to a boolean
2014-11-06 13:03:15 -05:00
Justin Li e5fd4d929f Coerce regex @blank output to a boolean 2014-11-05 20:44:06 -05:00
Justin Li 2e42c7be1f Merge pull request #480 from Shopify/number_variables
Add quirks test for variables with number prefixes
2014-11-05 12:05:21 -05:00
Justin Li 95b031ee04 Add quirks test for extra dots in ranges 2014-11-05 11:41:12 -05:00
Justin Li 4d97a714a9 Add quirks test for variables with number prefixes 2014-11-05 10:56:58 -05:00
Justin Li aa182f64b4 Merge pull request #479 from Shopify/tweaks-for-c
Tweaks for C
2014-11-04 14:02:14 -05:00
Justin Li 4e870302b1 Add env var for saving stackprof graphviz output 2014-11-04 18:38:14 +00:00
Justin Li 098c89b5f5 Convenience methods for raising terminator syntax errors 2014-11-04 18:38:08 +00:00
Justin Li 70c45f8cd8 Use SVG badge URLs
[ci skip]
2014-11-03 17:41:42 -05:00
Justin Li 12d526a05c Merge pull request #458 from Shopify/block-body
Create a BlockBody class to decouple block body parsing from tags.
2014-11-03 17:34:39 -05:00
Dylan Thacker-SmithandJustin Li 2fd8ad08c0 Remove unused local variable that was accidentally added. 2014-11-03 17:07:42 -05:00
Dylan Thacker-SmithandJustin Li 15e1d46125 Avoid storing options instance variable in BlockBody.
There is no need to pass parse options to the BlockBody initializer, since
it does all the parsing in the parse method, unlike tags which parse the
tag markup in the initializer.
2014-11-03 17:07:42 -05:00
Dylan Thacker-SmithandJustin Li 73fcd42403 Create a BlockBody class to decouple block body parsing from tags. 2014-11-03 17:07:42 -05:00
Justin Li 263e90e772 Merge pull request #478 from Shopify/numbers-in-identifiers
Use a single token for identifiers
2014-10-30 21:59:26 -04:00
Justin Li 81770f094d Remove unnecessary + 2014-10-29 13:39:43 -04:00
Justin Li dd5ee81089 Disallow number and dash identifier prefixes 2014-10-29 12:08:00 -04:00
Justin Li a07e382617 Use a single token for identifiers 2014-10-29 11:28:41 -04:00
Justin Li 4dc682313f Merge pull request #476 from Shopify/missing-variable-name-error
Disallow filters with no variable in strict mode
2014-10-27 13:56:11 -04:00
Justin Li 5616ddf00e Remove obsolete comment 2014-10-27 13:44:14 -04:00
Justin Li fcb23a4cd2 Disallow filters with no variable in strict mode 2014-10-27 13:34:27 -04:00
Justin Li a8f60ff6b1 Merge pull request #472 from Shopify/fix-leaky-test
Fix test leaking error_mode, fix equality check for VariableLookup
2014-10-23 10:12:41 -04:00
Justin Li a206c8301d Fix test leaking error_mode, fix equality check for VariableLookup 2014-10-22 15:40:41 -04:00
Justin Li ee0de01480 Merge pull request #469 from Shopify/falsy-variable-fix
Fix case where a variable name is falsy
2014-10-21 15:06:34 -04:00
Justin Li 887b05e6ed Clarify test name 2014-10-21 14:06:30 -04:00
Justin Li 5d68e8803f Ensure nil works as a variable name 2014-10-21 14:03:10 -04:00
Justin Li dedd1d3dc0 Fix case where a variable name is falsy 2014-10-21 12:09:26 -04:00
Dylan Thacker-Smith d9ae36ec40 Merge pull request #466 from Shopify/remove-expression-cache
Remove expression cache
2014-10-20 13:57:17 -04:00
Dylan Thacker-Smith b9ac3fef8f Remove the quotes from the partial string in the profiler timing objects. 2014-10-18 16:26:18 -04:00
Dylan Thacker-Smith f5faa4858c Remove parsed expression cache. 2014-10-18 15:03:40 -04:00
Dylan Thacker-Smith bc5e444d04 Use Expression.parse and Context#evaluate in the Include class. 2014-10-18 15:03:40 -04:00
Dylan Thacker-Smith 3a4b63f37e Use Expression.parse and Context#evaluate in the TableRow class. 2014-10-18 15:03:40 -04:00
Dylan Thacker-Smith a1a128db19 Refactor Condition so that it takes a parsed expression. 2014-10-18 15:03:40 -04:00
Dylan Thacker-Smith d502b9282a Use Expression.parse and Context#evaluate in the For class. 2014-10-18 15:03:36 -04:00
Dylan Thacker-Smith fee8e41466 Use Expression.parse and Context#evaluate in the Cycle class. 2014-10-18 14:27:58 -04:00
Dylan Thacker-Smith 37260f17ff Use Expression.parse and Context#evaluate in the Condition class. 2014-10-18 14:27:58 -04:00
Florian Weingarten 2da9d49478 Merge pull request #465 from Shopify/avoid_multi_assigns
Avoid parallel assignments
2014-10-18 16:19:02 +02:00
Florian Weingarten 7196a2d58e Avoid parallel assignments 2014-10-18 13:58:32 +00:00
Justin Li a056f6521c Merge pull request #463 from Shopify/stricter-identifiers
Separate ? and - into special tokens
2014-10-17 13:45:48 -04:00
Justin Li de16db9b72 Don't allow - to end a variable name 2014-10-17 13:38:07 -04:00
Justin Li b4ea483c4e Separate ? and - into special tokens 2014-10-17 13:30:54 -04:00
Justin Li 7843bcca8d Merge pull request #443 from Shopify/completely-parse-variables
Parse expressions in Liquid::Variable#parse.
2014-10-17 13:12:46 -04:00
Florian Weingarten 76ea5596ff Merge pull request #462 from Shopify/flat_map
nodelist flat_map over map.flatten
2014-10-17 18:32:00 +02:00
Florian Weingarten f9318e8c93 flat_map 2014-10-17 16:11:12 +00:00
Florian Weingarten 71253ec6f9 Merge pull request #459 from Shopify/pop_vs_shift
Use pop over shift to avoid reverse
2014-10-15 21:42:53 +02:00
Florian Weingarten 0fa075b879 Use pop over shift to avoid reverse 2014-10-15 19:26:39 +00:00
Dylan Thacker-Smith 6d080afd22 Merge pull request #446 from Shopify/remove-end-tag
Remove unused Block#end_tag method.
2014-10-14 03:03:31 -04:00
Dylan Thacker-Smith a67e2a0a00 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-10-14 02:58:11 -04:00
Dylan Thacker-Smith f387508666 Parse expressions in Liquid::Variable#parse. 2014-10-08 21:06:59 -04:00
Florian Weingarten 632b1fb702 Merge pull request #455 from Shopify/parse_error_line_numbers
Line numbers for all parse errors
2014-10-04 17:53:30 +02:00
Dylan Thacker-Smith d84870d7a5 Test line number of errors in nested blocks. 2014-10-03 16:25:12 -05:00
Florian Weingarten 584b492e70 Line numbers for all parse errors 2014-10-03 21:00:31 +00:00
Dylan Thacker-Smith b79c9cb9bf Merge pull request #453 from Shopify/no-modify-default-resource-limit
Avoid modifying the default resources limits hash.
2014-10-01 19:02:09 -05:00
Dylan Thacker-Smith cf5ccede50 Avoid modifying the default resources limits hash. 2014-10-01 18:51:06 -05:00
Evan Huus 23622a9739 Merge pull request #440 from Shopify/drop-tainting
Variable tainting
2014-09-22 13:43:35 -04:00
Florian Weingarten 7ba5a6ab75 Merge pull request #450 from Shopify/additional_test_for_includes
Regression test for including assignments
2014-09-18 21:05:37 +02:00
Florian Weingarten be3d261e11 Regression test for including assignments 2014-09-18 10:37:44 +00:00
Evan Huus eeb061ef44 Address code review comments
- clean up comment wording
- fix potentially leaky tests
2014-09-16 17:23:26 +00:00
Evan Huus 67b2c320a1 Add tainting tests 2014-09-16 17:23:26 +00:00
Evan Huus 1d151885be Auto-untaint variables passed through 'escape' 2014-09-16 17:23:26 +00:00
Evan Huus e836024dd9 Check and handle when a tainted variable is used 2014-09-16 17:23:26 +00:00
Dylan Thacker-Smith 638455ed92 Merge pull request #448 from Shopify/remove-unused-filter-not-found-error
Remove Liquid::FilterNotFoundError since it is never raised.
2014-09-15 17:43:33 -04:00
Dylan Thacker-Smith b2a74883e9 Remove Liquid::FilterNotFoundError since it is never raised. 2014-09-15 17:42:07 -04:00
Dylan Thacker-Smith 6875e5e16f Merge pull request #449 from Shopify/fix-flaky-total-render-time-test
Fix flaky test which assumes total_render_time can't be 0.
2014-09-15 17:41:41 -04:00
Dylan Thacker-Smith a5717a3f8d Fix flaky test which assumes total_render_time can't be 0.
jruby has millisecond precision for Time.now, so total_render_time can be 0
due to this lack of precision.
2014-09-15 17:26:55 -04:00
Dylan Thacker-Smith 804fcfebd1 Merge pull request #444 from Shopify/remove-block-children
Avoid keeping track of two lists of nodes during parsing.
2014-09-15 09:56:08 -04:00
Dylan Thacker-Smith b37ee5684a Merge pull request #445 from Shopify/prefer-super-over-render-all
Use super rather than render_all in single block render classes.
2014-09-15 09:53:54 -04:00
Dylan Thacker-Smith 0573b63b4c Use super rather than render_all in single block render classes. 2014-09-12 16:58:07 -04:00
Dylan Thacker-Smith 29c21d7867 Avoid keeping track of two lists of nodes during parsing. 2014-09-12 16:43:00 -04:00
Dylan Thacker-Smith 478eb893a9 Merge pull request #439 from Shopify/default-resource-limits
Make it easy to set default resource limits.
2014-09-11 14:27:52 -04:00
Dylan Thacker-Smith eae29f8c48 Make it easy to set default resource limits. 2014-09-11 13:54:30 -04:00
Florian Weingarten 4004cb63a5 Merge pull request #419 from Shopify/liquid_error_line_numbers
Optional line numbers for liquid errors
2014-09-08 23:15:53 +02:00
Jason Hiltz-Laforge aafdf4adb0 Fix JRuby builds 2014-09-08 20:41:22 +00:00
Florian Weingarten debac5dd0b Revert "move line number check"
This reverts commit 939365c234.

Conflicts:
	lib/liquid/template.rb
2014-09-06 10:21:17 -04:00
Florian Weingarten ce06ed4bb1 merge conflicts 2014-09-05 14:16:20 +00:00
Florian Weingarten 939365c234 move line number check 2014-09-05 14:12:30 +00:00
Florian Weingarten c60fd0715d remove unnecessary nil 2014-09-05 14:12:30 +00:00
Florian Weingarten c83e1c7b6d prefix for Liquid::Error instances 2014-09-05 14:12:30 +00:00
Florian Weingarten aabbd8f1a1 remove unnecessary method 2014-09-05 14:12:30 +00:00
Florian Weingarten 60d8a213a5 Clean up Liquid::Error#render 2014-09-05 14:12:30 +00:00
Florian Weingarten 17cc8fdbb3 put line number in parentheses 2014-09-05 14:12:30 +00:00
Tristan HumeandFlorian Weingarten 27c1019385 Add line numbers to warnings 2014-09-05 14:12:30 +00:00
Tristan HumeandFlorian Weingarten 3a0ee6ae91 Remove parser switching duplication 2014-09-05 14:12:29 +00:00
Florian Weingarten 5eff375094 Optional line numbers for liquid errors 2014-09-05 14:12:29 +00:00
Tristan Hume 2df643ba18 Merge pull request #425 from Shopify/pass-options-include
Pass options through on include
2014-08-26 13:40:06 -04:00
Tristan Hume 68af2d6e2a Pass options to include tags 2014-08-26 10:50:25 -04:00
Arthur Nogueira Neves dfb6c20493 Merge pull request #423 from bogdan/contains-with-integer
Fixed condition constains operator with wrong data type
2014-08-18 14:58:08 -04:00
Bogdan Gusiev 4e9d414fde Fixed condition constains operator with wrong data type
"contains" operator on wrong data type should not cause NoMethodError.
2014-08-18 17:32:29 +03:00
Florian Weingarten c0ec0652ae Merge pull request #421 from djreimer/url-encode-filter
Add url_encode standard filter
2014-08-15 20:05:39 +02:00
Derrick Reimer f8c3cea09b Add url_encode filter to history 2014-08-15 11:03:06 -07:00
Derrick Reimer 0b847e553c Add url_encode standard filter 2014-08-15 08:45:40 -07:00
Florian Weingarten c2663258be Merge pull request #364 from collectiveidea/instrument-rendering-with-hooks
Profiling the rendering of a liquid template
2014-08-13 23:04:29 +02:00
Tristan Hume d4654d0062 Merge pull request #417 from Shopify/simplify-regex
Simplify Variable Parsing Regexes
2014-08-13 12:07:35 -04:00
Tristan Hume ffd4f9d959 Simplify secondary filter regex 2014-08-13 09:36:02 -04:00
Tristan Hume 292161865d Simplify filter parse regex 2014-08-13 09:28:01 -04:00
Florian Weingarten 35808390ee Merge pull request #414 from Shopify/to_liquid_context
Call to_liquid in Context invoke
2014-08-12 22:05:52 +02:00
Florian Weingarten 1678c07548 Call to_liquid in Context invoke 2014-08-12 19:54:12 +00:00
Jason Roelofs 173a58d36a Profile liquid rendering
Add a simple profiling system to liquid rendering. Each
liquid tag ({{ }} and {% %}) is processed through this profiling,
keeping track of the partial name (in the case of {% include %}), line
number, and the time it took to render the tag. In the case of {%
include %}, the profiler keeps track of the name of the partial and
properly links back tag rendering to the partial and line number for
easy lookup and dive down. With this, it's now possible to track down
exactly how long each tag takes to render.

These hooks get installed and uninstalled on an as-need basis so by
default there is no impact on the overall liquid execution speed.
2014-08-12 15:37:21 -04:00
Tristan Hume f31e309770 Merge pull request #416 from Shopify/filter-quirks
Make Filter Quirks Tests Actual Integration Tests
2014-08-12 10:08:05 -04:00
Tristan Hume ffe1036e15 Make tests actual integration tests 2014-08-12 09:27:46 -04:00
Dylan Thacker-Smith d3b113d2e1 Merge pull request #391 from Shopify/extract-context-parse
Separate expression parsing and rendering from Context#[]
2014-08-11 14:17:54 -07:00
Dylan Thacker-Smith 2aa9bbbac2 Separate expression parsing and rendering from Context#resolve. 2014-08-11 14:15:58 -07:00
Tristan Hume d5e57a8ea4 Merge pull request #412 from Shopify/assign-strict
Pass through options on assign tag
2014-08-11 15:37:49 -04:00
Florian Weingarten 5c0e0be639 Merge pull request #402 from Shopify/benchmark-ips
benchmark/ips
2014-08-11 21:22:43 +02:00
Florian Weingarten a74d40f1e5 benchmark/ips 2014-08-11 19:22:06 +00:00
Tristan Hume 79d4ec1a48 Merge pull request #413 from Shopify/filter-quirks
Add quirks test for unanchored filter args
2014-08-11 13:06:51 -04:00
Tristan Hume 4db22be8ba Add tests for assign tag fix 2014-08-11 13:06:01 -04:00
Tristan Hume dc58a4d648 Add quirks test for unanchored filter args 2014-08-11 11:58:36 -04:00
Tristan Hume 2809ec780a Pass through options on assign tag 2014-08-11 10:38:36 -04:00
Jean Boussier 2d98392bf5 Merge pull request #411 from Shopify/to-s-before-split
Cast input to string before spliting
2014-08-08 00:13:35 -04:00
Jean Boussier df6b442816 Cast input to string before spliting 2014-08-07 14:01:44 -04:00
Florian Weingarten 4b22fc8d1b Merge pull request #407 from Shopify/slice_arrays
Slice filter for arrays
2014-08-05 20:00:45 +02:00
Florian Weingarten fb6f9c1c13 Slice filter for arrays. 2014-08-05 17:59:31 +00:00
Florian Weingarten 66ae7f3ec0 Merge pull request #406 from Shopify/slice_filter
slice filter
2014-08-05 17:14:01 +02:00
Florian Weingarten 0bea31d2ef Use Integer() instead of to_i 2014-08-05 15:13:15 +00:00
Florian Weingarten e5b0487fef Merge pull request #312 from Shopify/uniq_filter
uniq filter
2014-08-05 16:22:48 +02:00
Florian Weingarten 9117722740 Use symbols in respond_to? 2014-08-05 14:22:11 +00:00
Florian Weingarten baea0a6bf7 slice filter 2014-08-04 16:47:08 +00:00
Tom Burns 17347d43de Merge pull request #400 from Shopify/lazy_stack
lazily create stacks
2014-07-30 11:43:31 -04:00
Tom Burns 794ca9f604 make the conditions around stack creation easier to read 2014-07-30 15:42:24 +00:00
Tom Burns 15f6cabf83 avoid a hash comparison 2014-07-30 15:12:22 +00:00
Tom Burns e53d102a2c use 'unless' instead of 'if !' for simple conditional 2014-07-30 14:59:56 +00:00
Florian WeingartenandFlorian Weingarten 33e7b8e373 uniq filter 2014-07-29 13:09:34 +00:00
Florian Weingarten 9b8e3d437e Merge pull request #401 from Shopify/ktdreyer-minitest
Minitest 5 (continuation of #358)
2014-07-29 15:05:23 +02:00
Florian Weingarten a2f0f2547d with_global_filter test helper 2014-07-28 19:28:22 +00:00
Ken DreyerandFlorian Weingarten 57d5426eed tests: reset Strainer's filters after modification
Three tests in the test suite use the Liquid::Template.register_filter
function to register custom filters with Liquid::Strainer. The problem
is that these register_filter calls leave the Liquid::Strainer object in
an altered state.

As an example, the FiltersTest's test_local_filter relies on the default
behavior of Liquid::Strainer operator, and the test was failing if
register_function had been called earlier. The same thing was happening
with FiltersInTemplate's test_local_global.

The problem was present when the Filters test classes were loaded inside
a single ruby process that also loaded HashOrderingTest. One example is
"rake test", which runs "require" on every test file. Another basic
example is the following command:

  ruby -Itest -e "require 'integration/hash_ordering_test';
  require 'integration/filter_test'"

Update the tests to always reset Liquid::Strainer's filters back to the
default list of filters.

With this change, FiltersTest and FiltersInTemplate now pass.
2014-07-28 16:36:43 +00:00
Ken DreyerandFlorian Weingarten 3e3a415457 tests: fix whitespace in hash_ordering_test
Indent two spaces, not one.
2014-07-28 16:36:43 +00:00
Ken DreyerandFlorian 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 DreyerandFlorian 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
Tom Burns f5e67a12f9 remove added newline in liquid.rb 2014-07-28 14:24:29 +00:00
Tom Burns 6b56bdd74f remove variables used for counting empty stacks 2014-07-28 14:23:16 +00:00
Tom Burns ba6e3e3da6 lazily create stacks 2014-07-28 14:12:11 +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 WeingartenandArthur 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 553b0926ae, reversing
changes made to 628ab3dc6a.
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
Florian Weingarten 114a37d9ba add additional tests for https://github.com/jekyll/jekyll/pull/2505 2014-06-23 09:28:24 -04:00
Arthur Nogueira Neves 30bd9ad957 Merge pull request #368 from Shopify/add-round-ceil-and-floor
[Liquid] Add round, ceil and floor standard filters
2014-06-16 10:32:17 -05:00
Christian Blais 2239921804 [Liquid] Add round, ceil and floor standard filters 2014-06-16 11:15:53 -04:00
Florian Weingarten 1ea178e7a8 Merge pull request #363 from rrrene/patch-2
Update docs badge in README
2014-06-05 10:32:47 -04:00
René Föhring 5650c7eea1 Update docs badge in README
Update the URL of the docs badge to include it from inch-ci.org instead of inch-pages.github.io (the former being the successor of the Inch Pages project).

[ci skip]
2014-06-05 12:25:26 +02:00
Arthur Neves 553b0926ae Merge pull request #352 from gaiottino/master
Add error messages for missing variables when :strict

Conflicts:
	History.md
2014-05-06 10:16:45 -04:00
Daniel Gaiottino 2bac6267f9 Add error messages for missing variables when :strict 2014-05-06 16:12:46 +02:00
Florian Weingarten 628ab3dc6a add test for numerical sort 2014-05-04 19:50:38 -04:00
Florian Weingarten 2eb552c65d Merge pull request #354 from Dillon-Benson/patch-3
use attr_writer instead of error_mode= method
2014-05-02 18:15:33 -04:00
Dillon Benson 6e40746ce4 use attr_writer instead of error_mode= method 2014-05-02 17:18:56 -04:00
Thierry Joyal 75068e8fa4 Merge pull request #349 from Shopify/render_bang_allow_not_safe_contexts
render! will properly force rethrow of errors if context is passed as an argument
2014-05-01 12:52:06 -04:00
Thierry Joyal ad1152853a render! will properly force rethrow of errors if context is passed as an argument 2014-05-01 16:44:00 +00:00
David Cornu 73098ac5bc Merge pull request #351 from Shopify/date-cleanup
Move date coercion to #to_date
2014-04-30 20:47:39 -04:00
David Cornu 8bc3792c0e Move date coercion to #to_date 2014-04-30 22:32:36 +00:00
Florian Weingarten 3ef29c624c Merge pull request #347 from Dillon-Benson/patch-1
remove template return
2014-04-30 08:23:36 -04:00
Dillon Benson a85fb38769 remove template return 2014-04-30 03:00:16 -04:00
Florian Weingarten 6a1c3cff1a update history.md 2014-04-29 15:26:22 -04:00
Florian Weingarten bde32018dd Merge pull request #346 from Shopify/false_rendering
Fix broken rendering of variables which are equal to false (closes #345)
2014-04-29 15:21:30 -04:00
Florian Weingarten 2a12f253bf Fix broken rendering of variables which are equal to false (closes #345) 2014-04-29 14:33:30 -04:00
Bogdan Gusiev fa14fd02e7 Raise Liquid::ArugmentError when condition has wrong usage
Condition now raises ::ArgumentError when built wrongly.
This patch make it raise Liquid::ArgumentError instead
to indicate a liquid markup error instead of ruby error.
2014-04-21 16:42:37 +03:00
Arthur Nogueira Neves f15d24509d Merge pull request #338 from here/docs-filter-date-strftime
Update standardfilters.rb add docs to date filter
2014-04-12 20:14:44 -04:00
mikey dubs 09e4378cfb Update standardfilters.rb add docs to date filter
Added '%s' - Number of seconds since 1970-01-01 00:00:00 UTC to included list of flags
Added link to Ruby docs on Time#strftime() to allow easier discovery of unlisted filter options.
2014-04-12 15:21:06 -07:00
Dylan Thacker-Smith af0e26fb16 Merge pull request #337 from Shopify/remove-rails-dev-dependancy
Remove active_support from the development dependancies.
2014-04-11 15:08:34 -04:00
Dylan Thacker-Smith f5502e8152 Remove active_support from the development dependancies. 2014-04-11 14:26:40 -04:00
Arthur Nogueira Neves c098235baa Merge pull request #335 from rrrene/patch-1
Add docs badge to README
2014-04-05 11:46:32 -04:00
René Föhring 0e2bf768ba Add docs badge to README 2014-04-05 12:24:56 +02:00
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
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
Florian Weingarten 44f29a87a8 Update history 2014-03-24 12:35:47 -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
Florian Weingarten e190bbba9e move change to top 2014-03-19 18:15:31 -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
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 0a7de51e2b Revert some freezes on non-literals 2014-01-27 14:56:07 -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
Florian Weingarten 43ac8d560b Freeze all the things 2014-01-07 12:35:16 -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
Arthur Nogueira Neves 78c42bce44 Update README.md
Show travis badge from master only.
2013-11-04 18:37:53 -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 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
Bouke van der Bijl 71a386f723 Merge pull request #273 from Shopify/make-if-less-dangerous
Make if less dangerous
2013-10-28 06:39:05 -07:00
Bouke van der Bijl 2f50a0c422 Add history message 2013-10-28 14:10:13 +01: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
Florian Weingarten 9b910a4e6d Update README.md
Remove old wiki link
2013-10-15 13:14:39 -04:00
Arthur Neves 7e1a0be752 Put travis badge on top 2013-10-11 12:08:19 -04:00
Arthur Neves c9ea578b64 Drop 1.8 support on travis CI and add 2.0.0 2013-10-11 12:03:01 -04:00
Florian Weingarten 549777ae53 Merge pull request #267 from djreimer/default-filter
Add default filter to standard filters
2013-10-11 07:59:21 -07:00
Derrick Reimer 6710ef60bc Add default filter to history 2013-10-10 09:17:49 -07:00
Arthur Nogueira Neves 5fdab083b0 Merge pull request #268 from Shopify/better_rake
Improve Rakefile
2013-10-10 07:55:08 -07:00
Arthur Neves 0644da02bb Improve Rakefile 2013-10-10 10:44:16 -04: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
Arthur Neves 534338f923 Update history
Add 3.0.0 history
Add changes related to 2.5.x
2013-10-09 17:11:19 -04:00
Florian Weingarten 96b30a89a9 Fix map filter on Hash inputs 2013-10-08 08:18:03 -04:00
Florian Weingarten 81d3733f57 Regression test for change of blank? default behaviour (2efe809e11) 2013-09-23 09:38:45 -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 Hørup Eskildsen 322ecca145 Merge pull request #261 from Shopify/fix-i18n-regex-warning
Fix i18n regex warning in Ruby 1.8
2013-09-16 11:36:47 -07:00
Simon Eskildsen 6ce0b9d705 Fix i18n regex warning in Ruby 1.8 2013-09-16 14:35:33 -04:00
Florian Weingarten 736998df64 Merge pull request #257 from Shopify/fix_comment_tags_second_try
Fix unknown tags in comment tags, second try
2013-09-11 13:33:26 -07:00
Florian Weingarten 5b172a4c05 Fix unknown tags in comment tags, second try 2013-09-11 12:31:54 -04:00
Florian Weingarten bd20595f1a Add regression test for comment tag 2013-09-11 12:14:27 -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 1ae8c0e90a Merge pull request #256 from Shopify/unknown_tags_in_comments
Fix handling of unknown tags in comments
2013-09-11 07:59:44 -07:00
Florian Weingarten 45795f8766 Fix handling of unknown tags in comments 2013-09-11 10:40:33 -04:00
Florian Weingarten 01d352bc51 Move stuff in test around 2013-09-11 14:40:11 +02:00
Ishibashi Hideto 70513fccaf remove include Liquid from the class CustomInclude and substitute QuotedFragment with Liquid::QuotedFragment 2013-09-11 03:25:06 +09:00
Ishibashi Hideto a5285d3d09 test for the Jekyll's issue: [Liquid doesn't render my partial · Issue #1519 · mojombo/jekyll](https://github.com/mojombo/jekyll/issues/1519) 2013-09-10 22:58:56 +09:00
James Tucker fbfd5712df Merge pull request #3 from dntj/master
Add a test for corrected if-nodelist
2013-09-07 18:30:55 -07:00
Nicholas Jones 90593d3f18 Add a test for corrected if-nodelist 2013-09-07 11:15:49 -07:00
Tristan Hume beded415cd Merge pull request #253 from trishume/fix-range-parsing
Fix bad range parsing.
2013-09-07 05:17:30 -07: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 JonesandJames Tucker 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 d4679cd550 Strainer test now works on 1.8 2013-08-31 18:57:09 +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
Tristan Hume 4c22bacbba Merge branch 'master' of https://github.com/Shopify/liquid 2013-08-30 15:56:13 -04:00
Tristan Hume 09a5b57ebe Fix variable closing error message 2013-08-30 15:55:43 -04:00
Florian Weingarten 8059da4938 Update History.md 2013-08-30 15:28:33 -04:00
Tristan Hume af50f71224 Guard against state that shouldn't happen but does 2013-08-30 15:26:26 -04:00
Simon Hørup Eskildsen 136b6763e6 Merge pull request #241 from Shopify/i18n-error
Add I18n syntax error translation
2013-08-30 09:55:05 -07:00
Simon Eskildsen ad184fbfc9 Remove superplus translations 2013-08-30 12:31:58 -04:00
Simon Eskildsen 380828f807 Rename outdated test 2013-08-30 12:31:57 -04:00
Simon Eskildsen fc8c45ebe6 Fix use of 1.9 hash syntax 2013-08-30 12:31:57 -04:00
Simon Eskildsen 072c12dc47 Localize errors in Liquid 2013-08-30 12:31:57 -04:00
Simon Eskildsen 29cdabc30e Move I18n to options 2013-08-30 12:31:57 -04:00
Simon Eskildsen df5980f23f Change interpolation syntax to %{key} 2013-08-30 12:31:57 -04:00
Simon Eskildsen 5ee4f960e8 Move localization option to register 2013-08-30 12:31:57 -04:00
Simon Eskildsen 0343f6dc94 Add escaping of symbols 2013-08-30 12:31:57 -04:00
Simon Eskildsen 40fba9ee6c Add locale to context registers 2013-08-30 12:31:57 -04:00
Simon Eskildsen 0a2f21386d Add fixture helper 2013-08-30 12:31:57 -04:00
Simon Eskildsen e7bcf04d1d Remove delegate require from localization 2013-08-30 12:31:57 -04:00
Simon Eskildsen 0dac6fe88a Change to absolute path in localization test 2013-08-30 12:31:57 -04:00
Simon Eskildsen f37a984fd7 Add sketch of I18n error translation 2013-08-30 12:31:57 -04:00
Tristan Hume 0e41c2c6e9 Merge pull request #235 from Shopify/recursive-parsing
Add a Real Parser. Closes #229 and closes #225.
2013-08-30 07:12:38 -07:00
Tristan Hume 7b52dfcb95 Clean up lexer logic 2013-08-27 16:36:22 -04:00
Tristan Hume 1fa029ab67 Simplify lexer logic. 2013-08-27 11:35:03 -04:00
Tristan Hume 26eb9a0817 Merge pull request #244 from Shopify/proper-parse-warnings
Add Better Parse Warnings To recursive-parser Branch
2013-08-27 06:53:34 -07:00
Tristan Hume e305edc3b8 Remove extra comment 2013-08-27 09:53:06 -04:00
Tristan Hume c94b5e87c9 Use attr_reader for warnings. 2013-08-22 16:16:28 -04:00
Tristan Hume dd3196b22e Consistency in warnings. 2013-08-22 16:15:12 -04:00
Tristan Hume 86ba2f4174 Fix error message 1.8 compatibility 2013-08-22 13:23:44 -04:00
Tristan Hume 5bdfb62bf2 Remove old warning method 2013-08-22 12:57:16 -04:00
Tristan Hume 77db92de54 Better testing of warn mode. 2013-08-22 12:55:54 -04:00
Tristan Hume b0cba5298a Fix warnings and make tags a proper syntax tree. 2013-08-22 12:44:23 -04:00
Tristan Hume 93fcd5687c Broken warnings implementation. 2013-08-22 12:12:35 -04:00
Tristan Hume 14a17520de Merge branch 'master' into recursive-parsing 2013-08-22 10:39:08 -04:00
Tristan Hume 0beb4a4793 Add handy context to strict parser error messages. 2013-08-19 15:45:05 -04:00
Tristan Hume 324d26d405 Consistent lack of periods in syntax errors. 2013-08-19 15:20:39 -04:00
Tristan Hume 047900d0dd Proper warning support 2013-08-19 15:14:26 -04:00
Florian Weingarten f6f89fd0aa Merge pull request #242 from Shopify/overwrite_drop_inspect
Overwrite drop inspect
2013-08-19 09:48:16 -07:00
Florian Weingarten a57d576708 Overwrite drop inspect 2013-08-19 12:08:27 -04:00
Tristan Hume eb68a751ac Hopefully fix CI by improving multi-suite runner. 2013-08-16 15:15:15 -04:00
Florian Weingarten 355199dac4 Update History.md 2013-08-14 17:00:26 -04:00
Florian Weingarten c8f38ad9d0 Merge pull request #239 from Shopify/sort_filter_on_enumerables
Sort filter on Enumerables
2013-08-14 13:59:44 -07:00
Florian Weingarten ed4b61bfd3 Fix broken map test and add sort test 2013-08-08 11:53:52 -04:00
Florian Weingarten 8f978ecd1a Make sort filter work on Enumerable drops 2013-08-08 11:47:26 -04:00
Florian Weingarten 98c184f2fb Update History.md 2013-08-06 10:24:37 -04:00
Florian Weingarten 615e48fe29 Merge pull request #238 from Shopify/fix_clashing_method_names_in_enumerable_drops
Fix clashing method names in enumerable drops
2013-08-06 07:23:56 -07:00
Tristan Hume 6cde98319f More little fixes and changed default benchmark 2013-08-02 15:21:15 -04:00
Tristan Hume 15b53b77d6 Make stuff nicer 2013-08-02 15:17:17 -04:00
Tristan Hume 48f50eea3b Remove unused lex_specials method 2013-08-02 15:12:11 -04:00
Tristan Hume ace12e29da Hopefully fix CI on Rubinius 2013-08-02 13:37:56 -04:00
Florian Weingarten f98949117d Fix .include? method on Enumerable drops, used by "contains" conditions 2013-08-02 10:23:10 -04:00
Florian Weingarten 7fdb789eac Ruby 1.8.x compatibility 2013-08-01 13:56:01 -04:00
Florian Weingarten c92efd3ab9 Update some Drop tests 2013-08-01 13:46:55 -04:00
Florian Weingarten ff570c3ddc Fix clashing method names in enumerable drops 2013-08-01 13:17:02 -04:00
Tristan Hume 824231284c Run test suite with both parsers 2013-08-01 12:49:36 -04:00
Florian Weingarten ee2902761c Update History.md 2013-08-01 09:18:29 -04:00
Tristan Hume f6eacbf875 Add prayer for forgiveness. 2013-07-31 09:49:31 -04:00
Tristan Hume c5afdc529a Shuffle logic around. 2013-07-30 16:17:03 -04:00
Tristan Hume 84f0c1bef8 Initial options passing 2013-07-30 14:44:41 -04:00
Tristan Hume 1458396733 Fix benchmark 2013-07-30 14:20:16 -04:00
Tristan Hume 346e92aaa6 Describe error modes in Readme 2013-07-29 16:40:22 -04:00
Tristan Hume 3b3961be39 Use lax mode by default so nothing breaks 2013-07-29 16:28:20 -04:00
Tristan Hume 8ca00982b6 Fixed ranges and added for loop parser 2013-07-29 14:11:47 -04:00
Tristan Hume 525e1ff195 Add range support 2013-07-29 13:25:48 -04:00
Tristan Hume 8f4b398c7a Abstract parser switching into tag 2013-07-29 13:00:35 -04:00
Tristan Hume d5d41a8202 Make previous commit work 2013-07-29 12:43:05 -04:00
Tristan Hume c8bd0b91b3 Catch easy cases 2013-07-29 12:07:18 -04:00
Tristan Hume bc76c0daaf Collapse float and int into 'number' 2013-07-29 11:04:46 -04:00
Tristan Hume be4a04ed85 Merged array_tokens into recursive-parsing 2013-07-29 10:38:52 -04:00
Tristan Hume 8dcf44e99d Faster token creation, hopefully. 2013-07-29 10:23:04 -04:00
Tristan Hume a892e69a88 Hopefully fix CI build 2013-07-26 15:55:10 -04:00
Harry Brundage bf53e517f5 Inline Parser#next_token to avoid method dispatch 2013-07-26 15:38:52 -04:00
Harry Brundage bacacf2fd0 Remove the Token class from the lexer in favour of less smart but faster arrays 2013-07-26 15:14:01 -04:00
Tristan Hume 1b43bf5686 Add parser tests 2013-07-26 13:09:36 -04:00
Tristan Hume 83e71ace99 Add lexer tests and fixes 2013-07-26 12:50:27 -04:00
Tristan Hume 4dc9cc0ea1 Add back tests for lax parsing 2013-07-26 11:55:50 -04:00
Tristan Hume 87b8ee7341 Add error mode switching 2013-07-26 11:45:13 -04:00
Florian Weingarten 07f7d63bea Use kind_of? instead of class.include? and rearrange stuff 2013-07-26 11:34:00 -04:00
Florian Weingarten 1af28a6eb8 Merge pull request #233 from Shopify/make_map_work_on_enumerables
Make 'map' filter work on Enumerable drops
2013-07-26 08:30:16 -07:00
Florian Weingarten 65dfd57bb5 Make 'map' filter work on Enumerable drops 2013-07-26 10:35:28 -04:00
Tristan Hume 8b1dff9d98 Allow ! in identifiers like Ruby 2013-07-26 10:33:30 -04:00
Tristan Hume 8896b55fa5 Parsing for if statements 2013-07-26 10:31:26 -04:00
Tristan Hume c0b9d53548 Revert "Test a different lexer architechture"
This reverts commit 24ddaf1a9c.
2013-07-26 09:52:04 -04:00
Tristan Hume 24ddaf1a9c Test a different lexer architechture 2013-07-26 09:51:58 -04:00
Tristan Hume 673826630c Unfinished if statement parser. 2013-07-26 09:32:08 -04:00
Florian Weingarten 554675d1f8 Update README.md 2013-07-26 14:46:55 +02:00
Florian Weingarten 11e1379570 Merge pull request #234 from Shopify/fix_mapping_procs
Fix mapping over procs
2013-07-26 05:45:56 -07:00
Florian Weingarten 3e13ed4ba1 Fix mapping over procs 2013-07-25 22:11:44 -04:00
Florian Weingarten b004acf856 Merge pull request #232 from Shopify/to_liquid_stuff
Always call 'to_liquid' on stuff in map filter and allow to_liquid to be...
2013-07-25 14:10:52 -07:00
Florian Weingarten 182d3fefb6 Always call 'to_liquid' on staff in map filter and allow to_liquid to be called on drops 2013-07-25 17:10:19 -04:00
Tristan Hume 17d818b453 Fix profiler 2013-07-25 15:04:04 -04:00
Tristan Hume 0453d7e299 Fix benchmarks to use only valid liquid. 2013-07-25 11:51:51 -04:00
Tristan Hume 4da7b36139 New variable parser! 2013-07-25 11:38:57 -04:00
Florian Weingarten c7336e0cc1 Add license to gemspec, closes #231 2013-07-24 19:10:12 -04:00
Tristan Hume f43e973e67 Basic expression parsing 2013-07-24 16:36:14 -04:00
Florian Weingarten bbc405a24c Merge pull request #230 from Shopify/use_invoke_drop_in_map
Use invoke_drop in map filter
2013-07-24 12:47:56 -07:00
Florian Weingarten f9027d54ab Use invoke_drop in map filter 2013-07-24 15:41:50 -04:00
Tristan Hume 84be895db2 Fancy StringScanner based lexer 2013-07-24 15:39:48 -04:00
Tristan Hume b20a594f25 Better lexer 2013-07-24 15:19:14 -04:00
Tristan Hume 76272a1afa Bring back the lexer 2013-07-24 14:40:29 -04:00
Tristan Hume 61a6deb43b Descriptive comment for lexer 2013-07-24 12:00:51 -04:00
Tristan Hume ee14775f83 Replace hand-coded lexer with faster hacky lexer. 2013-07-24 11:41:47 -04:00
Tristan Hume 2332d86156 Slow lexer and parser scaffold. 2013-07-24 11:35:00 -04:00
Florian Weingarten fbfda1a189 Little cosmetic change 2013-07-05 11:30:50 -04:00
Florian Weingarten f0ecd02199 Fix some blank tests 2013-07-03 02:47:22 +02:00
Florian Weingarten 4a103a9dde Merge pull request #218 from Shopify/dont_render_blank_blocks
Dont render blank blocks
2013-07-02 15:15:54 -07:00
Florian Weingarten 0f38fe3596 Add blank test for case tags 2013-07-02 18:08:20 -04:00
Florian Weingarten cd3f976288 Merge branch 'master' into dont_render_blank_blocks
Conflicts:
	lib/liquid/tag.rb
2013-07-02 14:00:30 -04:00
Florian Weingarten b53601100f Make sure include tags are never blank 2013-07-02 13:57:27 -04:00
Florian Weingarten 5c5e7de31e Merge pull request #221 from d-Pixie/master
Changes not empty? to any?
2013-07-01 07:55:26 -07:00
Jonas Schubert Erlandsson f91233450f Changes not empty? to any? 2013-07-01 16:12:58 +02:00
Florian Weingarten 429e492984 Merge pull request #220 from coding46/master
Fix some typos in comments
2013-06-27 13:20:24 -07:00
G. Bodenschatz d36a1c518b Fix some typos in comments 2013-06-27 22:16:23 +02:00
Florian Weingarten 40a37c3fb6 Merge branch 'master' into dont_render_blank_blocks
Conflicts:
	lib/liquid/tags/cycle.rb
	lib/liquid/tags/increment.rb
2013-06-27 10:03:18 -04:00
Florian Weingarten 37309678de Merge pull request #219 from Shopify/indent_and_trailing_ws_cleanup
Convert legacy tab indentation to spaces and remove trailing whitespace ...
2013-06-27 06:50:28 -07:00
Florian Weingarten cfb60c2f1b Update History.md 2013-06-27 14:30:37 +02:00
Florian Weingarten 668ee5e1c4 Clean up whitespace collapsing 2013-06-27 14:06:05 +02:00
Florian Weingarten b4fbcea114 Cycle tags are never blank 2013-06-27 14:00:38 +02:00
Florian Weingarten c16697746b Clean up whitespace collapsing a bit 2013-06-27 13:57:26 +02:00
Florian Weingarten f01d0dbea6 More tests for whitespace collapsing 2013-06-27 13:39:04 +02:00
Florian Weingarten 10c151e3aa Some tests for whitespace collapsing 2013-06-26 22:30:33 -04:00
Florian Weingarten d6e13faa43 Don't render blank blocks 2013-06-26 22:21:47 -04:00
Florian Weingarten 0f5441b09e Convert legacy tab indentation to spaces and remove trailing whitespace from all lines 2013-06-26 19:53:09 -04:00
Florian Weingarten 7a3746ad77 Update CONTRIBUTING.md
Add @arthurnn for code review
2013-06-26 05:03:05 +03:00
Florian Weingarten 24511556d3 Update README.md 2013-06-20 09:53:21 -03:00
Florian Weingarten 5621556b3a Update History.md 2013-06-18 12:36:50 -03:00
Florian Weingarten fd230bef14 Merge pull request #106 from gnowoel/fix_example_servlet
fix example servlet
2013-06-18 08:35:42 -07:00
Florian Weingarten e9f3a8e4d3 Update History.md 2013-06-18 05:18:43 +03:00
Florian Weingarten 8ca4868bff Merge branch 'master' of https://github.com/ndwebgroup/liquid into ndwebgroup-master 2013-06-18 04:13:49 +02:00
Florian Weingarten f92da6948d Merge branch 'strip-html-fix' of https://github.com/jamesallardice/liquid into jamesallardice-strip-html-fix
Conflicts:
	lib/liquid/standardfilters.rb
2013-06-18 04:11:11 +02:00
Florian Weingarten a1b156f0d4 strip_html multi-line comment test 2013-06-18 04:06:35 +02:00
Florian Weingarten eca520025c Merge branch 'strip-html' of https://github.com/joliss/liquid into joliss-strip-html
Conflicts:
	lib/liquid/standardfilters.rb
2013-06-18 04:04:49 +02:00
Florian Weingarten 9c9a7ce8d3 Update History.md 2013-06-18 05:01:23 +03:00
Florian Weingarten b7837ce218 Merge pull request #210 from Shopify/truncate_utf8_test
UTF8 truncate test
2013-06-17 09:45:10 -07:00
Florian Weingarten b81469d183 Make truncate work for Ruby 1.8 2013-06-17 12:05:02 -04:00
Florian Weingarten f488058789 UTF8 truncate test 2013-06-17 11:48:03 -04:00
Florian Weingarten f5d75718e9 Update History.md 2013-06-16 18:31:19 +03:00
Florian Weingarten c280936afa Merge pull request #209 from Shopify/fix_broken_raw_parsing
Fix broken 'raw' tag parsing (issue #204)
2013-06-15 04:58:51 -07:00
Florian Weingarten e47d1af03a Fix broken 'raw' tag parsing (issue #204) 2013-06-14 12:47:27 -04:00
Florian Weingarten 81f6c79c53 Update README.md 2013-06-14 10:04:24 -03:00
Florian Weingarten 3174411407 Merge pull request #208 from Shopify/contributing
CONTRIBUTING.md
2013-06-14 05:58:37 -07:00
Florian Weingarten f7c4b0cdec Update History.md 2013-06-14 08:57:27 -04:00
Florian Weingarten 3d1f582318 Merge pull request #201 from arthurnn/adding_version_file
create version.rb file, and bump version
2013-06-14 05:45:48 -07:00
Florian Weingarten 27db1def63 CONTRIBUTING.md 2013-06-14 02:41:08 +02:00
Florian Weingarten 5cfa13d7a4 Merge pull request #205 from phoet/stricter_handling_of_variables_in_for
rejects variables like a/b in for loops, closes #150
2013-06-13 15:26:00 -07:00
Peter Schröder cb12497859 add test for allowing whitespace between tokens 2013-06-13 18:21:49 -04:00
Florian Weingarten 4c2e2f8a24 Merge pull request #203 from phoet/strip_carriage_return
handle carriage return in strip_newline, closes #126
2013-06-13 12:54:17 -07:00
Peter Schröder a2df5a421d rejects variables like a/b in for loops, closes #150 2013-06-11 17:22:33 -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
Peter Schröder fd263bba0f handle carriage return in strip_newline, closes #126 2013-06-09 10:24:35 -04:00
Arthur Neves 0d9353591b bump master version to 2.6.0
Bumping master version to 2.6.0
Adding 2.6.0 changes to history
2013-06-06 14:17:12 -04:00
Arthur Neves 1849c24f2c Adding version file
Follow the standard structure of having a version.rb file
2013-06-06 14:10:45 -04:00
Daniel Huckstep f8288546f8 Missed in the rebase conflicts 2013-06-06 10:20:34 -06:00
Daniel Huckstep 076ae903c0 Make sure the context gets set 2013-06-06 10:19:20 -06:00
Daniel Huckstep ba5e65f685 Better test, resuse Hash block 2013-06-06 10:18:47 -06:00
Daniel Huckstep b699c93bae Allow a Liquid::Drop to be passed into Template#render 2013-06-06 10:17:01 -06:00
Florian Weingarten 85c1503378 Merge pull request #200 from arthurnn/155_float_precision
use BigDecimal on filters to have better precision
2013-06-05 14:07:20 -07:00
Arthur Neves ab760649ee use BigDecimal on filters to have better precision 2013-06-05 16:09:05 -04:00
Florian Weingarten f4fb2f159c Merge pull request #157 from stomar/avoid_warnings
Avoid warnings in Ruby 1.9.3
2013-06-05 09:10:41 -07:00
Florian Weingarten a5cd494717 Merge pull request #176 from unreal/master
Add reverse filter
2013-06-05 09:04:53 -07:00
Florian Weingarten f8915f3cd2 Merge pull request #199 from phoet/add_documentation_for_include
add documentation to include, fixes #163
2013-06-05 09:00:11 -07:00
Peter Schröder e92540a9bf add documentation to include, fixes #163 2013-06-05 11:53:01 -04: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
Florian Weingarten 94ff457744 Merge pull request #198 from Shopify/limit_resource_usage
Resource usage limits
2013-05-31 08:24:29 -07:00
Florian Weingarten 1e8c081b42 Create new resource_limits hash on Template initialization 2013-05-31 09:41:59 -04:00
Florian Weingarten 2b17e24b16 Mutate resource_limits hash to flag that the limit was reached (for outside observation) 2013-05-31 09:34:23 -04:00
Florian Weingarten 9075b428b1 Resource limits: Don't raise Error but render error message (but abort after first error) 2013-05-31 09:25:25 -04:00
Florian Weingarten 8760b5e8c4 Add optional resource usage limitations to number of rendering calls, length of rendering output and/or number of variable/capture assignments 2013-05-30 17:04:26 -04:00
Tom Burns 50b2ebee56 Merge pull request #189 from Shopify/cache_partials
Cache tokenized partial templates
2013-05-29 07:51:12 -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
Tom Burns 27fe76c0dd Merge pull request #192 from Shopify/revert_utf8
Revert "Merge pull request #185 from ISSIntel/liquid-utf8"
2013-05-21 14:46:17 -07:00
Tom Burns 8913a5615a Revert "Merge pull request #185 from ISSIntel/liquid-utf8"
This reverts commit c5dfcd29b0, reversing
changes made to f7d1e1d0c1.
2013-05-20 19:53:13 -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
Tasos Stathopoulos 8c1bbfec57 Use array instead of Hash to keep the registered filters
1.8.7 compatibility fix

In Ruby 1.8.7, Hash does not preserve insertion ordering as Array does.
This could cause a problem when registering filters which depend on others and
the registration order is important.

So, the @@filters variable was changed to array where the order of the filters is
the same as the insertion order.
2013-05-17 14:12:57 +03:00
Tom Burns b8fbd2b4fa typo 2013-05-16 20:25:31 -04:00
Tom Burns ba5a9f2e47 remove _ on private methods 2013-05-13 13:45:43 -04:00
Tom Burns 1e309ba74b cache included partial templates 2013-05-13 02:34:19 -04:00
Tom Burns 485340713a Add tests for caching partial includes 2013-05-13 02:34:19 -04:00
Tom Burns 2af4ea1295 Support benchmarking templates with 'include' tag 2013-05-12 22:17:08 -04:00
Tom Burns c5dfcd29b0 Merge pull request #185 from ISSIntel/liquid-utf8
Liquid UTF-8 support
2013-04-23 10:29:49 -07:00
Ozéias Sant'ana f9c289372d Merge branch 'master' into liquid-utf8
Conflicts:
	lib/liquid/variable.rb
2013-04-23 13:10:16 -03:00
Jay Strybis a556ae6c26 Add reverse filter 2013-03-07 16:29:39 -06: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
Marcus Stollsteimer 1cac09831d Completely remove unused variable 2013-03-05 22:19:38 +01: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
wǒ_is神仙 17dd85868d add tests for replace filter 2013-02-21 10:52:46 +08:00
wǒ_is神仙 6e967f7f3a fix can't convert Fixnum into String 2013-02-06 12:55:35 +08:00
Dylan Smith 38b4543bf1 Use sets to check if methods are invokable without symbolizing. 2013-02-05 14:45:08 -05:00
Jason Roelofs 1300210f05 Convert Strainer to white-list method protection
After moving the method existence check from Context into Strainer,
updated Strainer to only accept invokation methods that were added via
filter Modules, and done in a way that respond_to? is never called,
preventing unconstrained Symbol table growth.
2013-01-16 11:14:01 -05:00
Jason Roelofs a48e162237 Change Drop method lookup to not hit respond_to?
Class.public_method_defined? ends up diving into Ruby's core looking for
a method with the given method_or_key. This process at some point turns
method_or_key into a Symbol. This change no longer takes that path and
thus doesn't grow the Symbol table.
2013-01-16 11:07:48 -05:00
Jason Roelofs 7bcb565668 Remove #to_sym calls from Drop and Variable
Symbols are not needed here and using plain strings is nicer on Ruby
2013-01-16 09:46:17 -05:00
Jason Roelofs c3e6cde67f Add security tests to show that the symbol table doesn't grow 2013-01-16 09:46:17 -05:00
Adam Tanner 0b36540b78 Liquid has UTF8 support. 2012-12-26 18:14:36 -08:00
Dylan Smith 50bd34fd78 Merge pull request #161 from Shopify/fix-filter-parser-regex
Fix filter parser regex for filter args without separating spaces.
2012-12-18 10:13:21 -08: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
Marcus Stollsteimer b48ad7da3a Remove trailing whitespace 2012-11-18 10:29:22 +01:00
Marcus Stollsteimer afc3944a4a Fix assignment with no effect outside of iterator 2012-11-18 10:21:03 +01:00
Marcus Stollsteimer c79abf1f87 Avoid warnings for assigned but unused variable 2012-11-18 10:20:07 +01:00
Marcus Stollsteimer 90b40ffb4b Avoid warnings for shadowed outer local variable 2012-11-18 10:19:05 +01:00
Marcus Stollsteimer fea9c54768 Avoid warning for grouped expression 2012-11-18 10:08:00 +01:00
Tobias Lütke 05d9976e16 fix benchmark 2012-10-29 16:47:57 -04:00
Tom Burns 6c2fde5eea Instantiate blank string once instead of at every comparison 2012-10-25 11:54:19 -04:00
Tobias Lütke ce76dbf8d9 fixed the performance suite 2012-10-20 10:53:53 -04:00
Steven Soroka 661ff2ccdf Merge pull request #140 from binarycleric/feature/break_for_loop
Added break and continue statements
2012-08-21 13:22:24 -07:00
Jon Daniel 9c183bea83 added interrupt class for continue/break statements
When a continue or break statement is executed it pushes an interrupt to a
stack in context. If any non-handled interrupts are present blocks will cease
to execute. The for loop can handle the most recent interrupt in the stack.
2012-08-21 13:14:27 -04:00
Jon Daniel 484fd18612 added break and continue tags 2012-08-21 00:00:02 -04:00
Jonathan Rudenberg bf86459456 Merge pull request #139 from pjb3/fix_block_test_name
Class name does not match file name
2012-08-19 15:07:59 -07:00
Paul Barry d2827c561b Class name does not match file name 2012-08-19 07:44:35 -04:00
Tobias Lütke 16c34595a4 fix mergeconflict 2012-08-07 13:21:31 -04:00
Tobias Lütke 6e091909ee Merge branch 'master' of github.com:Shopify/liquid 2012-08-07 13:20:37 -04:00
Tobias Lütke d7cb39ccb3 release 2.4.0 2012-08-07 13:20:23 -04:00
Jonathan Rudenberg f8d46804fd Fix rake test for broken version of rake on travis 2012-08-07 09:49:55 -04:00
Jonathan Rudenberg 5c6de2d919 Fix typo 2012-08-07 09:37:19 -04:00
Jonathan Rudenberg a8e9327f0b Update HISTORY.md for v2.4.0 release 2012-08-07 09:32:38 -04: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
Jason Normore 6ebdded8f2 Merge branch 'issue_1650_strip_html_ignore_comments' 2012-06-11 10:33:00 -04:00
Jason Normore 515b31158e strip_html to ignore comments with html tags. fixes #1650 2012-06-11 10:32:12 -04:00
7ransandJason Normore 40cc799f3d Add example to split filter. 2012-06-11 10:32:12 -04:00
Daniel SchierbeckandJason Normore 5ac91e0837 Fix typo and add punctuation 2012-06-11 10:32:12 -04:00
Jonathan Rudenberg f6cb54fa59 Merge pull request #93 from trans/master
Split Filter Example
2012-06-07 12:21:40 -07:00
Jonathan Rudenberg 1606b4b705 Merge pull request #118 from dasch/patch-1
Fix typo and add punctuation
2012-06-07 12:20:54 -07:00
Jonathan Rudenberg 7cfd0f15d1 Merge pull request #128 from andmej/patch-1
Tpyo.
2012-06-07 12:18:09 -07:00
Jonathan Rudenberg 25ba54fc52 Enable 19mode for travis rbx/jruby 2012-06-07 15:16:58 -04:00
Jonathan Rudenberg 1aff63ff57 Merge pull request #107 from amateurhuman/syntax-error-fixes-for-rubinius
Fix syntax error in htmltags.rb and for.rb for compatibility with rbx-2.0.0-dev (1.9.3)
2012-06-07 12:14:35 -07:00
Jonathan Rudenberg 08fdcbbf65 Merge pull request #120 from infospace/interpolate_regex_once
add interpolate once flag to regexes that never change
2012-06-07 12:06:57 -07:00
Jonathan Rudenberg 2dba9ed0ea Merge pull request #113 from arika/improve-process-time
apply "o" option to regexps to improve process time
2012-06-07 12:04:28 -07:00
Andrés Mejía 6d02d59fbd Tpyo. 2012-06-06 22:32:42 -05:00
Michael Green 281e3ea9c8 add interpolate once flag to regexes that never change 2012-05-08 16:27:50 -07:00
Daniel Schierbeck b51b30fac1 Fix typo and add punctuation 2012-05-03 14:16:06 +03:00
Jeremy Friesen 740cd6e762 Merge branch 'master' of git://github.com/Shopify/liquid
* 'master' of git://github.com/Shopify/liquid:
  * Seperated 'Howto' into 'How to'. * Added periods to the second list as the first item has them. I guess I'm anally retentive like that. :)
  Fix conditions using negative number comparisons
2012-04-19 10:59:44 -04:00
Jeremy Friesen 5d0004a87e Added tests to verify that {{ 'now' | date :'%Y' }} and {{ 'today' | date :'%Y' }} work.
In the case of Ruby 1.9.3, 'now' is no longer parsed.  For safe
measures, I've added 'today' as well.
2012-04-19 10:48:55 -04:00
jamesallardice 12112dee35 Make strip_html filter strip contents of style tags 2012-04-11 16:23:21 +01:00
akira yamada 84ed3d9964 apply "o" option to regexps to improve process time 2012-04-02 19:31:55 +09:00
Dennis Theisen c10f936d2a Merge pull request #109 from DanAtkinson/patch-1
Minor modification to readme
2012-03-14 08:27:43 -07:00
Dan Atkinson 1ee342d83b * Seperated 'Howto' into 'How to'.
* Added periods to the second list as the first item has them. I guess I'm anally retentive like that. :)
2012-03-14 14:58:12 +00:00
Dennis Theisen 0e3b522fe2 Fix conditions using negative number comparisons 2012-03-12 16:38:34 -04:00
Chris Kelly db07e2b67e Fix syntax error in for and htmltags files for compatibility with Rubinius 2.0.0-dev 2012-03-09 00:24:31 -08:00
Leo Wong 5c4938f443 fix example servlet 2012-03-08 01:29:50 +08:00
Dennis Theisen b8d7b9aeda Fix for-tag update to also work properly in Ruby 1.8.
* Follow up commit to 3d7c1c8
2012-02-29 16:13:46 -05:00
Dennis Theisen 3d7c1c80a0 Ruby 1.8 compatibility fix: Ensure for-loop on an empty string does not enter for-body. 2012-02-29 14:41:21 -05:00
Dennis Theisen 1b2d0198ea Added backwards compatibility test for tablerow tag update
* Follow up to 043d816
2012-02-22 14:30:19 -05:00
Dennis Theisen 043d816460 Fix tablerow block to work with collection names in quoted syntax.
* Allows e.g. {% tablerow product in collections['frontpage'] %} instead of only collections.frontpage
2012-02-22 12:45:38 -05:00
Jo Liss 4a2bbafeb4 Make strip_html strip tags spread across lines 2012-02-16 15:42:10 +01:00
7rans 974ea40cca Add example to split filter. 2012-02-10 13:45:35 -05:00
Kristian PD d8b416187a Merge pull request #88 from kristianpd/master
Add 1.9.3 support for 1.8.7 like strings behaviour in forloop
2012-01-31 10:27:44 -08:00
Kristian PD 58ad90677b Clarified compatibility comments, removed unused var from tag test. 2012-01-20 17:22:23 -05:00
Kristian PD 2b04590d4b Revert "Revert "Added backwards compatibility for 1.8.7 String.each returning itself (and 1.9.3 not supporting .each).""
This reverts commit bce0033c65.
2012-01-20 16:54:26 -05:00
Kristian PD bce0033c65 Revert "Added backwards compatibility for 1.8.7 String.each returning itself (and 1.9.3 not supporting .each)."
This reverts commit 01dea94671.
2012-01-20 16:47:34 -05:00
Kristian PD 01dea94671 Added backwards compatibility for 1.8.7 String.each returning itself (and 1.9.3 not supporting .each).
Moved for tag tests to their own test model from StandardTagTest.
2012-01-20 16:45:41 -05:00
Tobias Lütke 1a1b4702d7 Merge pull request #80 from ROFISH/master
Add Filters to Assign
2011-12-20 13:58:05 -08:00
Steven Soroka 85d1dc0d07 Merge pull request #84 from biow0lf/master
Fix typo
2011-12-16 09:12:07 -08:00
Igor Zubkov 0eafe7f2fd Fix typo 2011-12-16 12:28:29 +02:00
Jonathan Rudenberg 815e4e2b8d Remove travis rbx-1.9 mode for now 2011-11-17 16:55:50 -05:00
Jonathan Rudenberg ef98715b12 Update Travis rubies 2011-11-17 14:23:25 -05:00
Jonathan Rudenberg c4d713b6bb Add modulo filter 2011-11-17 14:08:57 -05:00
Ryan Alyea 975b17b529 Allow filters in assign.
A simple attempt, but basically it shifts the parsing of the right hand side of the assign from a simple context lookup to using the Variable parser (that includes filters). Fixes #79.
2011-11-01 01:46:26 -07:00
Jonathan Rudenberg 745d875e79 Add date to History.md 2011-10-16 10:22:20 -04:00
Tobias Lütke c91cb8af6c released new gem 2011-10-16 09:16:23 -04:00
Jonathan Rudenberg bb73198b4f Fix servlet strip example 2011-10-15 22:59:58 -04:00
Jonathan Rudenberg f0f2e56369 Merge pull request #76 from trans/master
Add split example to example servlet
2011-10-15 19:58:40 -07:00
Jonathan Rudenberg b816521563 Merge pull request #72 from zacstewart/patch-1
Correct formatting for doc comments
2011-10-15 17:25:48 -07:00
Jonathan Rudenberg 4026f6c340 Update history file 2011-10-15 20:18:00 -04:00
Jonathan Rudenberg 05a20c627d Clean up test suite 2011-10-15 20:04:27 -04:00
Jonathan Rudenberg 8e3f0c122e Clean up Rakefile and gemspec 2011-10-15 19:56:03 -04:00
Jonathan Rudenberg 487b240404 Fix another drop call regression 2011-10-14 11:21:22 -04:00
Jonathan Rudenberg f129ee33f2 Remove 1.8.6 (unsupported) from Travis 2011-10-13 12:03:08 -04:00
Jonathan Rudenberg cdf7f5b6a7 Fix UTC time for Travis 2011-10-13 12:00:42 -04:00
Jonathan Rudenberg 204d876187 Don't use the rubygems version of liquid in performance test 2011-10-13 11:48:24 -04:00
Jonathan Rudenberg 8b5cf73ccc Fix regression with calling a drop with a empty string 2011-10-13 11:47:23 -04:00
7rans edebcaa603 Add split example to example servlet. 2011-09-29 18:41:47 -04:00
Zac 6cf6d8b990 Correct formatting for doc comments
Portions of the code examples were not being rendered as code because they lacked a leading tab. Also, a missing period on the first sentence made the first paragraph confusing.
2011-09-10 10:36:22 -03:00
Tobias Lütke 1379061398 Merge pull request #69 from trans/master
Added split filter
2011-09-05 13:01:15 -07:00
7rans 4971b9e9bc Remove comment about stripping split results. 2011-09-01 12:03:27 -04:00
7rans da34d27258 Add test for split filter. 2011-08-31 22:20:45 -04:00
7rans cc7899aef5 Add split filter. 2011-08-31 21:28:32 -04:00
Jonathan Rudenberg 0fc78a2dbb Merge pull request #65 from adomokos/add_rvmrc_to_gitignore
Add the .rvmrc to .gitignore
2011-07-13 04:51:34 -07:00
Attila Domokos c401ffb9c3 Add the .rvmrc to .gitignore 2011-07-13 04:18:19 -04:00
Jonathan Rudenberg 2434c3d0e0 Remove duplicate commas from StrictQuotedFragment. Closes #26. 2011-07-12 09:18:46 -04:00
Tobias Lütke 352f83a9d2 Merge pull request #28 from mcr/mcr_inc_tag
increment tag
2011-07-01 11:48:13 -07:00
Tobias Lütke 98c96ed86a Merge pull request #60 from a-team/master
Avoid creating singleton classes on nil, true and false objects
2011-07-01 11:43:27 -07:00
Tobias Lütke 410cce9740 Merge pull request #56 from oozou/for-else
For-else !!!
2011-07-01 11:42:17 -07:00
Jonathan Rudenberg a8ed72a036 Add build status and small copy changes in the README 2011-06-30 16:36:49 -04:00
Jonathan Rudenberg 4aaf750fa8 Don't mess with the load path 2011-06-30 16:31:37 -04:00
Jonathan Rudenberg e5a3d67a32 Add Rubinius to Travis runs 2011-06-30 16:25:55 -04:00
Jonathan Rudenberg fe25644726 Rescue NameError for Rubinius 2011-06-30 16:24:17 -04:00
Jonathan Rudenberg c47eac1683 Add kind_of? and singleton_methods to Strainer so that Rubinius works 2011-06-30 16:17:31 -04:00
Jonathan Rudenberg c10a40f1fa Ignore rubinius bytecode files 2011-06-30 16:16:35 -04:00
Jonathan Rudenberg e4003a74a1 Remove failing Rubies from Travis run for now 2011-06-29 15:08:44 -04:00
Jonathan Rudenberg 03065274d8 Use Travis CI 2011-06-29 11:06:20 -04:00
Jonathan Rudenberg 00afc9dd8a Merge pull request #62 from rmetzler/master
code blocks in README.md displayed properly on github (closes #61)
2011-06-19 20:48:03 -07:00
Richard Metzler 6bfdda9e17 html highlighting 2011-06-19 03:50:52 -07:00
Richard Metzler 00da0b6a42 ruby highlighting 2011-06-19 03:50:08 -07:00
Richard Metzler 39174ccee6 code blocks in github flavored markdown 2011-06-19 03:49:37 -07:00
Tim Felgentreff c7033ff4c8 Avoid creating singleton classes on nil, true and false objects. Instead extend their respective classes. Just because those objects are singletons in current Ruby implementations doesn't mean we should rely on that. Fixes liquid on Maglev. 2011-06-13 18:13:47 +02:00
Jonathan Rudenberg f85bea2902 Remove literal tag (raw is more performant)
This reverts commit c00a650492.
2011-06-13 09:34:15 -04:00
Jonathan Rudenberg 17922273e1 Merge old Shopify/liquid 2011-06-13 09:31:31 -04:00
Jonathan Rudenberg 4087a94d88 Add raw tag. Fixes #37.
Thanks to phaer: https://gist.github.com/1020852

YO DAWG, WE HEARD YOU LIKE LIQUID

SO WE PUT A RAW TAG IN YOUR LIQUID
SO YOU CAN HAVE LIQUID IN YOUR LIQUID
2011-06-12 11:15:16 -04:00
Steven Soroka 1a4ff9547a render_all should internally always return strings. This eases some 1.9 compatability issues. 2011-05-02 10:58:27 -04:00
Steven Soroka 888cbe8f09 fix next if /^__.+__$/ to /^(__.+__|object_id)$/, since object_id will complain if it is removed 2011-04-28 15:24:50 -05:00
Steven Soroka 2f11364417 make ruby-debug optional 2011-04-28 15:18:59 -05:00
Steven Soroka 74cdfc6718 Fix commit 7bbb4ff84f so it's backwards-compatible 2011-04-28 15:18:51 -05:00
Prathan Thananart d19213177a Added documentation for for-else 2011-04-28 13:11:13 +07:00
Prathan Thananart caf59940d3 Added code to make for-else work 2011-04-28 13:07:41 +07:00
Prathan Thananart 8319d78c2e Added a failing test case for for-else 2011-04-28 12:00:21 +07:00
Tobias Lütke bc55c4d348 Merged pull request #34 from claco/date-epoch.
Epoch support
2011-04-25 09:03:30 -07:00
Tobias Lütke 017f0dc342 Merged pull request #53 from mhw/fix-stacklevelerror-test.
Fix behaviour of Context#stack when Context#push raises.
2011-04-25 09:00:00 -07:00
Tobias Lütke ab556cbdd9 Merged pull request #54 from mhw/fix-drop-numeric-parameter.
Fix passing numeric parameter to drops
2011-04-25 08:59:10 -07:00
Tobias Lütke 82e4904403 Merged pull request #55 from ssoroka/master.
fixes failing test
2011-04-25 08:58:13 -07:00
Steven Soroka 59a63e0fe5 fix failing test "recursively_included_template_does_not_produce_endless_loop", push needs to come before exception raise since pop is in ensure block and always happens. 2011-04-24 01:09:56 -05:00
Mark H. Wilkinson aafb3ed9f2 Fix behaviour of Context#stack when Context#push raises.
We only want to pop the scope at the end of the method if pushing it
succeeded, so the push needs to be outside the block with the ensure.
2011-04-12 14:24:26 +01:00
Mark H. Wilkinson 935d3530af Handle invoking drops for keys that are not strings.
For example, {{ pages[8] ... }} will result in the integer value 8 being
passed to invoke_drop.
2011-04-12 14:11:06 +01:00
Mark H. Wilkinson 662b2983fe Failing test for integer drop lookup. 2011-04-12 14:09:43 +01:00
Mark H. Wilkinson 37a0fe213b Fix text method name clash. 2011-04-12 13:47:27 +01:00
David TurnbullandTobias Lütke 7bbb4ff84f Context is no longer lost when moving into a Liquid FileSystem. 2011-01-28 21:19:44 -05:00
Tobias Lütke 9926d86c91 Fix rake file, add rake benchmark:run 2011-01-28 21:18:07 -05:00
Tobias Lütke 9c49b8bbb2 improved benchmark suite 2011-01-28 21:16:22 -05:00
thedarkoneandTobias Lütke f7ff9c81d3 Make use of the Module#public_method_defined?. 2011-01-28 21:16:22 -05:00
thedarkoneandTobias Lütke a65c4f51bc These are strings already. 2011-01-28 21:16:22 -05:00
thedarkoneandTobias Lütke a24049906b Resolve literals faster. 2011-01-28 21:16:22 -05:00
thedarkoneandTobias Lütke aa678302d6 Fix comments. 2011-01-28 21:16:22 -05:00
thedarkoneandTobias Lütke 6d0bb3303c Clean-up Context#stack. 2011-01-28 21:16:22 -05:00
Austin Mills 4fec29f288 OPS-250 Modifying liquid error handling so that it no longer captures Exceptions that are not subclasses of StandardError (previously, it was rescuing things like Interrupt and NoMemoryError). 2011-01-10 14:55:05 -06:00
Christopher H. Laco 33ecb29d49 Update date to accept epoch 2010-11-07 20:41:41 -05:00
Michael Richardson 58e5820e7a thought that these were turned off, removed 2010-09-03 10:54:29 -04:00
Michael Richardson bb035d96e1 ignore backups 2010-09-02 09:46:21 -04:00
Michael Richardson 3919ff6bc3 renamed inc -> increment
added decrement as well (pre-decremented)
2010-09-02 09:41:43 -04:00
Michael Richardson 381b4f5268 adjusted test case to have third argument 2010-08-31 19:42:13 -04:00
Michael Richardson 97f18112b2 the variables should be stored in the normal environment, not in the register 2010-08-31 17:26:41 -04:00
Michael Richardson ca2fa587cf added tag to increment a variable each time it is referenced 2010-08-31 16:17:12 -04:00
DBAandTobias Lütke 0526348cae Gemspec
- rewritten
2010-08-24 11:57:26 +08:00
Tobias Lütke a3fb7ba2b3 Merge branch 'master' of github.com:tobi/liquid
Conflicts:
	liquid.gemspec
2010-08-23 20:24:08 -04:00
Tobias Lütke 77cc0f2ed9 Version bump 2010-08-23 20:22:35 -04:00
DBAandTobias Lütke 3d43efe2bc Ruby compatibility issues
- regexp engines are different from 1.8 to 1.9, fixed the literal shorthand regexp accordingly
  - changed the shorthand regexp text from a match to a string scan
  - test_helper now loads rubygems unless RUBY_VERSION is > 1.9
2010-08-24 08:17:42 +08:00
DBAandTobias Lütke 772233d881 Readme: pre to code 2010-08-24 08:17:42 +08:00
DBAandTobias Lütke 90d1bc26d8 History
- updated (2.2.0 & 2.2.1)

Manifest
  - updated readme reference

Readme
  - Converted to markdown
  - cleaned up

Gemspec
  - updated to 2.2.1
2010-08-24 08:17:42 +08:00
DBAandTobias Lütke c00a650492 Literal
- added support for literals [closes #6]

Code beautifier
  - indented some files
2010-08-24 08:17:42 +08:00
DBAandTobias Lütke 4819eb1a92 IF tag
- now properly allows operands to have conditions (eg and, or) [closes #13]
2010-08-24 08:17:41 +08:00
DBAandTobias Lütke 8579807d29 Conditions
- added test to assert that conditions can contain conditions within its value (eg 'a-and-b')

Tags
  - indented the if tag

Tests
  - added ruby-debug to the test_helper
  - indented some tests
2010-08-24 08:17:41 +08:00
DBAandTobias Lütke daf786fd28 Test Helper
- added assert_template_result_matches
  - fixed indentation / white spacing
2010-08-24 08:17:41 +08:00
Tobias Lütke 101137045e remove swp files 2010-08-22 13:33:26 -04:00
DBAandTobias Lütke 8a0a8cfd99 FiltersTest
- added test that asserts nonexistent filters are ignored

Liquid
  - Bill's mind blowing liquid patch to support filter separators (|) in quoted strings (svn r7516).
  - This is a consolidation effort based on newrelic's liquid fork commit 88a5b891d009054d56b994c9448725c74e2b1e13
2010-08-23 01:30:05 +08:00
DBAandTobias Lütke 8304a046c9 Context
- Check arity of proc before calling, to prevent error when using ruby 1.9.1+

Code beautifer
  - context.rb
2010-08-23 01:30:03 +08:00
DBAandTobias Lütke c72c84ea9b Tests
- Organized the files
  - Cleaned up some of the white spacing issues
  - A lot can still be done to make the tests more readable to the new developers
2010-08-23 01:30:01 +08:00
DBAandTobias Lütke 01145f872b Test Helper
- Removed unnecessary test helper file. The file being used is helper.rb
2010-08-23 01:30:00 +08:00
DBAandTobias Lütke 5409814552 Code beautifier
- standard_filter_test.rb
2010-08-23 01:30:00 +08:00
DBAandTobias Lütke 2d9331a234 StandardFilters
- Ruby 1.9.2-rc changed the float precision, thus the tests are now more generic and backwards compatible.
2010-08-23 01:30:00 +08:00
DBAandTobias Lütke c59cde9d17 Code beautifier
- standardfilters.rb
  - standard_filter_test.rb
2010-08-23 01:30:00 +08:00
DBAandTobias Lütke 29e140b655 StandardFilters
- added escape_once, based on ActionView
2010-08-23 01:30:00 +08:00
DBAandTobias Lütke a48332871a Test helper
- extras path now uses File.join instead of string concatenation
  - extras path is only loaded into $LOAD_PATH if it's not already part of it
2010-08-23 01:30:00 +08:00
DBAandTobias Lütke bd7f867759 Code beautifier
- strainer_test.rb
2010-08-23 01:30:00 +08:00
DBAandTobias Lütke 8e4573a7bf Strainer
- respond_to_missing? is now a required method
2010-08-23 01:29:59 +08:00
DBAandTobias Lütke 5425679a96 Rakefile
- Updated to run with Ruby 1.9.2-p0
  - Fixed some indentations / white spacing
2010-08-23 01:29:59 +08:00
Tobias Lütke 6831eac902 Released gem 2.1.3 2010-08-05 18:07:05 -04:00
Dennis TheisenandTobias Lütke 13f98de7f3 Change behavior of capture tag to use existing variables if they already have been initialized in an outer scope. 2010-08-06 06:02:37 +08:00
Dennis TheisenandTobias Lütke e26f509277 Fixed minor typos in inline documentation for assign and capture 2010-08-06 06:02:37 +08:00
James MacAulay 0417c9e723 Gem v2.1.2 2010-07-09 09:17:10 -04:00
James MacAulay ffd48880e2 Gem v2.1.1 2010-07-09 09:11:49 -04:00
James MacAulay 6b79f25c87 rake release 2010-07-09 09:11:41 -04:00
James MacAulay ff829e7996 fix if tag parsing with expressions starting with and/or 2010-07-07 16:48:23 -04:00
James MacAulay d53a4e1834 rake default task is 'test' 2010-07-06 16:01:15 -04:00
James MacAulay 5ff699bb8a Gem version 2.1.0. Don't use Hoe. 2010-07-06 13:19:38 -04:00
Jesse StorimerandJames MacAulay d87500bfe3 Liquid strip_html strips out the content of <script> tags. [#173 state:resolved] 2010-02-08 11:35:45 -05:00
James MacAulay fce8bcb1e7 Change behaviour of arithmetic filters to cast arguments to numbers 2010-02-04 11:45:55 -05:00
James MacAulay 97548d4f01 shopify performance tests: add 'compact' size to product_img_url filter 2010-02-04 10:57:14 -05:00
James MacAulay cbf8986745 fix variable output with quoted strings containing pipe ("|") characters 2009-09-23 15:54:25 -04:00
James MacAulay 11dc18bfdf A better fix for "and"/"or" in strings
(now with less side effects)
2009-09-23 15:44:29 -04:00
James MacAulay f42ce88456 fixed conditions with strings containing "and"/"or" 2009-09-14 15:01:26 -04:00
James MacAulay d1d6febfc1 'contains' operator returns false if either operand is nil 2009-08-19 19:38:31 -04:00
James MacAulay 0150067c40 Revert "Raise FilterNotFound on use of non-existent filter"
This reverts commit 01c25a11a3.

Conflicts:

	test/context_test.rb
2009-08-19 19:24:33 -04:00
James MacAulay 2d0532e041 QuotedStrings can be empty 2009-08-19 18:37:40 -04:00
James MacAulay 167825aa92 further differentiate between environments and only evaluate Procs once 2009-08-07 11:24:15 -04:00
James MacAulay c792c29066 Templates and Contexts differentiate between different sources of assigns 2009-08-06 18:33:41 -04:00
James MacAulay a4d7c80ce0 now able to set file_system for include tag through registers 2009-08-06 18:24:27 -04:00
Tobias Lütke 7ff4352de2 Added convenience task rake profile:grind to load up KCacheGind 2009-06-15 10:35:49 -04:00
Tobias Lütke 44f35c0990 Performance improvement for Block parsing. ~ 10% speedup 2009-06-15 10:33:33 -04:00
Tobias Lütke a65bd76e72 Merge branch 'master' of [email protected]:tobi/liquid
Conflicts:
	lib/liquid.rb
	lib/liquid/context.rb
	lib/liquid/variable.rb
	test/standard_tag_test.rb
2009-06-15 09:00:30 -04:00
Tobias Lütke 8ac4d6a92a cycle test coverage 2009-06-15 08:55:50 -04:00
Tobias Lütke 37e913f755 added 3 more themes to add veriety to the profiler run 2009-06-14 18:09:40 -04:00
Tobias Lütke 5e0ad75ff5 remove benchmark dir 2009-06-14 18:05:18 -04:00
Tobias Lütke 1b3b3e4958 added rake profile for easier invokation 2009-06-14 18:04:07 -04:00
Tobias Lütke 31a5606d42 fixed a bug with mock paginate tag 2009-06-14 17:42:28 -04:00
Tobias Lütke f65ce254c7 added full profiler suite to liquid based on real-world code form Shopify and vision 2009-06-14 17:32:50 -04:00
Brian Candler 01c25a11a3 Raise FilterNotFound on use of non-existent filter 2009-06-06 16:32:20 +01:00
Brian Candler f29b9335c5 Allow question-mark at end of variable name only 2009-06-06 16:20:34 +01:00
Brian Candler cfe3e6f3be Allow Hash with default value or default proc to be used 2009-06-06 16:16:06 +01:00
Brian Candler 09c0b3b391 Allow template to be re-used without persisting assigns 2009-06-06 16:15:37 +01:00
Brian Candler 678fdfdb8a Add test case for presetting assigns 2009-06-06 15:47:52 +01:00
Jakub KuźmaandTobias Lütke ed1b542abf All tests pass on Ruby 1.9.1
Signed-off-by: Tobias Lütke <[email protected]>
2009-04-17 06:33:28 +08:00
Jakub KuźmaandTobias Lütke 8d27864845 Ruby 1.9.1 bugfixes
Signed-off-by: Tobias Lütke <[email protected]>
2009-04-17 06:33:25 +08:00
Jakub KuźmaandTobias Lütke 37580976db regenerated gemspec
Signed-off-by: Tobias Lütke <[email protected]>
2009-04-17 06:33:21 +08:00
Jakub KuźmaandTobias Lütke daadb1a2d6 Ruby 1.9.1 bugfixes
Signed-off-by: Tobias Lütke <[email protected]>
2009-04-17 06:33:20 +08:00
Tobias Lütke 68433a52a3 Some more documentation for regexpes 2009-04-06 08:45:04 -06:00
Tobias Lütke 075341d01c Fix for parsing spaces in fragments 2009-04-06 08:37:39 -06:00
Tobias Lütke 981831bc49 Corrected spelling mistake 2009-04-06 08:33:44 -06:00
Tobias Lütke edcc14f148 Reverted james filter in tags branch
This reverts commit 282786d7e2.

Conflicts:

	lib/liquid.rb
	lib/liquid/variable.rb
	test/if_else_test.rb
2009-04-06 08:30:19 -06:00
Tobias Lütke e3fd003a74 Ignore pkg directory 2009-04-06 08:10:13 -06:00
Tobias Lütke 26faf512a1 bump 2009-03-10 17:23:17 -04:00
Cody FauserandTobias Lütke 56f1aa9b4a Fix LiquidView for Rails 2.2. Fix local assigns for all versions of Rails
Signed-off-by: Tobias Lütke <[email protected]>
2009-01-27 02:18:06 +08:00
Tobias Lütke 70ca647e1e Had the tests in the wrong file 2009-01-16 09:55:03 -05:00
Tobias Lütke 13ddc6d96b Added append/prepend filters 2009-01-15 16:59:18 -05:00
Tobias Lütke 88309cf415 Fixed some parse errors thanks to Daniel Sheppard [Closes #6] 2008-12-22 11:47:26 -05:00
Tobias Lütke 7b9b5f31fb Merge branch 'experimental' of git://github.com/jamesmacaulay/liquid into jamesmacaulay/experimental
Conflicts:

	lib/liquid.rb
	lib/liquid/variable.rb
2008-11-02 10:11:08 -08:00
Tobias Lütke b165599495 Merge branch 'master' of git://github.com/josephholsten/liquid into josephholsten/master 2008-11-02 10:08:55 -08:00
Tobias Lütke 96c998a944 Merge branch 'master' of git://github.com/mhw/liquid into mhw/master 2008-11-02 10:06:02 -08:00
Tobias Lütke 7031d8a49a Fix test not failing while in PST timezone 2008-11-02 10:05:10 -08:00
Tobias Lütke 7959664c9d Merge branch 'master' of git://github.com/EmmanuelOga/liquid into EmmanuelOga/master 2008-11-02 10:04:01 -08:00
Joseph Anthony Pasquale Holsten c15a683063 Fixed Strainer#respond_to? to accept two parameters 2008-11-02 06:24:07 -06:00
James MacAulay 36860eab57 added array sorting and mapping on properties 2008-10-28 10:36:05 -04:00
James MacAulay 3d8efe04a7 filtered variables in for loops 2008-10-24 14:50:59 -04:00
James MacAulay edf7b5577b filtered variables for assign, case, and cycle 2008-10-15 17:02:26 -04:00
James MacAulay 282786d7e2 if blocks work with filtered variables 2008-10-15 17:02:26 -04:00
James MacAulay 69bc84b777 Added filters for basic arithmetic 2008-10-15 11:02:25 -04:00
Michael Klett 3bfde37a53 Enable rails 2.1.x compaitibility by allowing the render method to accept an ActionView::Template object.
This seems to complete the earlier 'ugly hack' for rails 2.1.x compatibility
2008-09-22 09:48:15 -04:00
Zack Chandler 24bf446b0e Refactor date filter to accept "Time types" other than Date, Time, and DateTime. For example, TzTime (http://github.com/rails/tztime/tree/master) is now supported. 2008-09-05 11:16:24 -07:00
Mark H. Wilkinson 916f501bde Fix spelling of FilterSeparator constant. 2008-08-18 20:32:34 +01:00
Mark H. Wilkinson 7eeb895192 Remove trailing whitespace. 2008-08-18 20:32:30 +01:00
Mark H. Wilkinson 7acdac2a1c Fix attribute expansion to index only once in all cases.
Also drop array.<digits> syntax
2008-07-09 18:46:38 +01:00
Mark H. Wilkinson 50edd0f5b9 Add some failing tests for Context.
Using an attribute should only cause the corresponding method to be invoked
once. Replacing a lambda with its return value should work for arrays.
Array index syntax shouldn't allow calls to special methods.
2008-07-09 18:46:38 +01:00
Mark H. Wilkinson 819b70204f Fix syntax in doc comment; test same syntax. 2008-07-09 18:34:41 +01:00
Mark H. Wilkinson eb609ee4aa Strip trailing whitespace. 2008-07-09 18:34:41 +01:00
Emmanuel Oga 3eddf5fb9e adjusted parsing regex for syntax quirk 2008-07-08 12:54:52 -03:00
Tobias Lütke 6dd4f716f8 Gemspecs make my brain hurt 2008-06-23 09:47:41 -04:00
Tobias Lütke 5c259a3f49 stip gemspec down to essentials 2008-06-23 09:43:25 -04:00
Tobias Lütke 1a160c5d84 Seriously... 2008-06-23 09:42:15 -04:00
Tobias Lütke 56caba720d Let hoe create the gemspec automatically 2008-06-23 09:39:35 -04:00
Tobias Lütke d28cbe6df7 remove gem from repository 2008-06-23 09:36:49 -04:00
Tobias Lütke 1ccb83d7cb Maybe now? 2008-06-23 09:36:31 -04:00
Tobias Lütke e0dd07811c Added gemspec for automatic rubygem github madness 2008-06-23 09:34:34 -04:00
Stefano Cobianchi 82e5e8c188 Ugly hack for compatibility with Rails 2.1, take two 2008-06-04 17:22:47 +02:00
Stefano Cobianchi 3ef9d2f4f9 Ugly hack for compatibility with Rails 2.1 2008-06-04 17:18:41 +02:00
Nathaniel Bibler 4c30922d8e The if tag now raises Liquid::SyntaxError rather than a generic RuntimeError for syntax problems. 2008-05-21 23:58:12 -04:00
Tobias Lütke ed75a6d948 Make before_method work more like method_missing 2008-05-08 17:22:07 -04:00
Tobias Lütke 63f9a05223 Implemented reversed flag on for loops {% for a in b reversed %} 2008-05-08 17:17:41 -04:00
Tobias Lütke 8f45647aa3 Parse time errors should propagate to calling site 2008-05-08 12:35:17 -04:00
Tobias Lütke 4c0cfae0b7 Changed implementation of For in such a way that it only depends on the existence of a each method. This allows drops to simply implement each for enumeration 2008-05-08 12:30:48 -04:00
Tobias Lütke 7f58cbf82d Merged last set of changes from original SVN location 2008-05-08 11:34:43 -04:00
Tobias Lütke 1d647361e1 Initial github import of liquid 2008-05-08 11:28:13 -04:00
232 changed files with 12346 additions and 3200 deletions
+8 -41
View File
@@ -1,41 +1,8 @@
_site/
.sass-cache/
node_modules/
# Compiled source #
###################
*.com
*.class
*.dll
*.exe
*.o
*.so
# Packages #
############
# it's better to unpack these files and commit the raw source
# git has its own built in compression methods
*.7z
*.dmg
*.gz
*.iso
*.jar
*.rar
*.tar
*.zip
# Logs and databases #
######################
*.log
*.sql
*.sqlite
# OS generated files #
######################
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
ehthumbs.db
Thumbs.db
*~
*.gem
*.swp
pkg
*.rbc
.rvmrc
.ruby-version
Gemfile.lock
+19 -3
View File
@@ -1,4 +1,20 @@
install: gem install github-pages
script: jekyll build --trace
language: ruby
rvm:
- 2.0
- 2.1
- 2.2
- ruby-head
- jruby-head
- rbx-2
sudo: false
rvm: 2.1
matrix:
allow_failures:
- rvm: jruby-head
script: "rake test"
notifications:
disable: true
-1
View File
@@ -1 +0,0 @@
liquidmarkup.org
+26
View File
@@ -0,0 +1,26 @@
# How to contribute
## Things we will merge
* Bugfixes
* Performance improvements
* Features which are likely to be useful to the majority of Liquid users
## Things we won't merge
* Code which introduces considerable performance degrations
* Code which touches performance critical parts of Liquid and comes without benchmarks
* Features which are not important for most people (we want to keep the core Liquid code small and tidy)
* Features which can easily be implemented on top of Liquid (for example as a custom filter or custom filesystem)
* Code which comes without tests
* Code which breaks existing tests
## Workflow
* Fork the Liquid repository
* Create a new branch in your fork
* If it makes sense, add tests for your code and run a performance benchmark
* Make sure all tests pass
* Create a pull request
* In the description, ping one of [@boourns](https://github.com/boourns), [@fw42](https://github.com/fw42), [@camilo](https://github.com/camilo), [@dylanahsmith](https://github.com/dylanahsmith), or [@arthurnn](https://github.com/arthurnn) and ask for a code review.
+8 -1
View File
@@ -1,3 +1,10 @@
source 'https://rubygems.org'
gem 'github-pages', group: :jekyll_plugins
gemspec
gem 'stackprof', platforms: :mri_21
gem 'allocation_tracer', platforms: :mri_21
group :test do
gem 'spy', '0.4.1'
gem 'benchmark-ips'
end
-133
View File
@@ -1,133 +0,0 @@
GEM
remote: https://rubygems.org/
specs:
RedCloth (4.2.9)
activesupport (4.2.6)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.4.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.10.0)
colorator (0.1)
ethon (0.8.1)
ffi (>= 1.3.0)
execjs (2.6.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.10)
gemoji (2.1.0)
github-pages (64)
RedCloth (= 4.2.9)
github-pages-health-check (= 1.1.0)
jekyll (= 3.0.3)
jekyll-coffeescript (= 1.0.1)
jekyll-feed (= 0.4.0)
jekyll-gist (= 1.4.0)
jekyll-github-metadata (= 1.9.0)
jekyll-mentions (= 1.0.1)
jekyll-paginate (= 1.1.0)
jekyll-redirect-from (= 0.10.0)
jekyll-sass-converter (= 1.3.0)
jekyll-seo-tag (= 1.3.2)
jekyll-sitemap (= 0.10.0)
jekyll-textile-converter (= 0.1.0)
jemoji (= 0.5.1)
kramdown (= 1.10.0)
liquid (= 3.0.6)
mercenary (~> 0.3)
rdiscount (= 2.1.8)
redcarpet (= 3.3.3)
rouge (= 1.10.1)
terminal-table (~> 1.4)
github-pages-health-check (1.1.0)
addressable (~> 2.3)
net-dns (~> 0.8)
octokit (~> 4.0)
public_suffix (~> 1.4)
typhoeus (~> 0.7)
html-pipeline (2.3.0)
activesupport (>= 2, < 5)
nokogiri (>= 1.4)
i18n (0.7.0)
jekyll (3.0.3)
colorator (~> 0.1)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 1.1)
kramdown (~> 1.3)
liquid (~> 3.0)
mercenary (~> 0.3.3)
rouge (~> 1.7)
safe_yaml (~> 1.0)
jekyll-coffeescript (1.0.1)
coffee-script (~> 2.2)
jekyll-feed (0.4.0)
jekyll-gist (1.4.0)
octokit (~> 4.2)
jekyll-github-metadata (1.9.0)
octokit (~> 4.0)
jekyll-mentions (1.0.1)
html-pipeline (~> 2.3)
jekyll (~> 3.0)
jekyll-paginate (1.1.0)
jekyll-redirect-from (0.10.0)
jekyll (>= 2.0)
jekyll-sass-converter (1.3.0)
sass (~> 3.2)
jekyll-seo-tag (1.3.2)
jekyll (~> 3.0)
jekyll-sitemap (0.10.0)
jekyll-textile-converter (0.1.0)
RedCloth (~> 4.0)
jekyll-watch (1.3.1)
listen (~> 3.0)
jemoji (0.5.1)
gemoji (~> 2.0)
html-pipeline (~> 2.2)
jekyll (>= 2.0)
json (1.8.3)
kramdown (1.10.0)
liquid (3.0.6)
listen (3.0.6)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9.7)
mercenary (0.3.5)
mini_portile2 (2.0.0)
minitest (5.8.4)
multipart-post (2.0.0)
net-dns (0.8.0)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
octokit (4.3.0)
sawyer (~> 0.7.0, >= 0.5.3)
public_suffix (1.5.3)
rb-fsevent (0.9.7)
rb-inotify (0.9.7)
ffi (>= 0.5.0)
rdiscount (2.1.8)
redcarpet (3.3.3)
rouge (1.10.1)
safe_yaml (1.0.4)
sass (3.4.21)
sawyer (0.7.0)
addressable (>= 2.3.5, < 2.5)
faraday (~> 0.8, < 0.10)
terminal-table (1.5.2)
thread_safe (0.3.5)
typhoeus (0.8.0)
ethon (>= 0.8.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
PLATFORMS
ruby
DEPENDENCIES
github-pages
BUNDLED WITH
1.11.2
-72
View File
@@ -1,72 +0,0 @@
// Gruntfile
module.exports = function(grunt) {
require('load-grunt-tasks')(grunt);
// Project configuration.
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
watch: {
css: {
files: ['_sass/**/*.scss'],
tasks: ['sass', 'postcss', 'shell:jekyllBuild'],
options: {
atBegin: true
}
},
jekyll: {
files: ['index.md', '_includes/*.html', 'filters/*.*', '_layouts/*.*', 'tags/*.*', 'basics/*.*'],
tasks: ['shell:jekyllBuild']
}
},
sass: {
dist: {
options: {
style: 'expanded',
sourcemap: 'none'
},
files: {
'_site/css/main.css':'_sass/main.scss'
}
}
},
shell: {
jekyllServe: {
command: 'jekyll serve --no-watch'
},
jekyllBuild: {
command: 'jekyll build'
}
},
postcss: {
options: {
map: true,
processors: [
require('autoprefixer-core')({browsers: 'last 2 versions'})
]
},
dist: {
src: '_site/css/*.css'
}
},
concurrent: {
tasks: ['shell:jekyllServe', 'watch'],
options: {
logConcurrentOutput: true
}
}
});
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-sass');
grunt.loadNpmTasks('grunt-postcss');
grunt.loadNpmTasks('grunt-concurrent');
grunt.registerTask('default', ['concurrent']);
};
+187
View File
@@ -0,0 +1,187 @@
# Liquid Change Log
## 4.0.0 / not yet released / branch "master"
### Changed
* Add forloop.parentloop as a reference to the parent loop (#520) [Justin Li, pushrax]
* Block parsing moved to BlockBody class (#458) [Dylan Thacker-Smith, dylanahsmith]
* Add concat filter to concatenate arrays (#429) [Diogo Beato, dvbeato]
* Ruby 1.9 support dropped (#491) [Justin Li, pushrax]
* Liquid::Template.file_system's read_template_file method is no longer passed the context. (#441) [James Reid-Smith, sunblaze]
### Fixed
* Fix capturing into variables with a hyphen in the name (#505) [Florian Weingarten, fw42]
* Fix case sensitivity regression in date standard filter (#499) [Kelley Reynolds, kreynolds]
* Disallow filters with no variable in strict mode (#475) [Justin Li, pushrax]
* Disallow variable names in the strict parser that are not valid in the lax parser (#463) [Justin Li, pushrax]
* Fix BlockBody#warnings taking exponential time to compute (#486) [Justin Li, pushrax]
## 3.0.2 / 2015-04-24 / branch "3-0-stable"
* Expose VariableLookup private members (#551) [Justin Li, pushrax]
* Documentation fixes
## 3.0.1 / 2015-01-23
* Remove duplicate `index0` key in TableRow tag (#502) [Alfred Xing]
## 3.0.0 / 2014-11-12
* Removed Block#end_tag. Instead, override parse with `super` followed by your code. See #446 [Dylan Thacker-Smith, dylanahsmith]
* Fixed condition with wrong data types (#423) [Bogdan Gusiev]
* Add url_encode to standard filters (#421) [Derrick Reimer, djreimer]
* Add uniq to standard filters [Florian Weingarten, fw42]
* Add exception_handler feature (#397) and #254 [Bogdan Gusiev, bogdan and Florian Weingarten, fw42]
* Optimize variable parsing to avoid repeated regex evaluation during template rendering #383 [Jason Hiltz-Laforge, jasonhl]
* Optimize checking for block interrupts to reduce object allocation #380 [Jason Hiltz-Laforge, jasonhl]
* Properly set context rethrow_errors on render! #349 [Thierry Joyal, tjoyal]
* Fix broken rendering of variables which are equal to false (#345) [Florian Weingarten, fw42]
* Remove ActionView template handler [Dylan Thacker-Smith, dylanahsmith]
* Freeze lots of string literals for new Ruby 2.1 optimization (#297) [Florian Weingarten, fw42]
* Allow newlines in tags and variables (#324) [Dylan Thacker-Smith, dylanahsmith]
* Tag#parse is called after initialize, which now takes options instead of tokens as the 3rd argument. See #321 [Dylan Thacker-Smith, dylanahsmith]
* Raise `Liquid::ArgumentError` instead of `::ArgumentError` when filter has wrong number of arguments #309 [Bogdan Gusiev, bogdan]
* Add a to_s default for liquid drops (#306) [Adam Doeler, releod]
* Add strip, lstrip, and rstrip to standard filters [Florian Weingarten, fw42]
* Make if, for & case tags return complete and consistent nodelists (#250) [Nick Jones, dntj]
* Prevent arbitrary method invocation on condition objects (#274) [Dylan Thacker-Smith, dylanahsmith]
* Don't call to_sym when creating conditions for security reasons (#273) [Bouke van der Bijl, bouk]
* Fix resource counting bug with respond_to?(:length) (#263) [Florian Weingarten, fw42]
* Allow specifying custom patterns for template filenames (#284) [Andrei Gladkyi, agladkyi]
* Allow drops to optimize loading a slice of elements (#282) [Tom Burns, boourns]
* Support for passing variables to snippets in subdirs (#271) [Joost Hietbrink, joost]
* Add a class cache to avoid runtime extend calls (#249) [James Tucker, raggi]
* Remove some legacy Ruby 1.8 compatibility code (#276) [Florian Weingarten, fw42]
* Add default filter to standard filters (#267) [Derrick Reimer, djreimer]
* Add optional strict parsing and warn parsing (#235) [Tristan Hume, trishume]
* Add I18n syntax error translation (#241) [Simon Hørup Eskildsen, Sirupsen]
* Make sort filter work on enumerable drops (#239) [Florian Weingarten, fw42]
* Fix clashing method names in enumerable drops (#238) [Florian Weingarten, fw42]
* Make map filter work on enumerable drops (#233) [Florian Weingarten, fw42]
* Improved whitespace stripping for blank blocks, related to #216 [Florian Weingarten, fw42]
## 2.6.1 / 2014-01-10 / branch "2-6-stable"
Security fix, cherry-picked from master (4e14a65):
* Don't call to_sym when creating conditions for security reasons (#273) [Bouke van der Bijl, bouk]
* Prevent arbitrary method invocation on condition objects (#274) [Dylan Thacker-Smith, dylanahsmith]
## 2.6.0 / 2013-11-25
IMPORTANT: Liquid 2.6 is going to be the last version of Liquid which maintains explicit Ruby 1.8 compatability.
The following releases will only be tested against Ruby 1.9 and Ruby 2.0 and are likely to break on Ruby 1.8.
* Bugfix for #106: fix example servlet [gnowoel]
* Bugfix for #97: strip_html filter supports multi-line tags [Jo Liss, joliss]
* Bugfix for #114: strip_html filter supports style tags [James Allardice, jamesallardice]
* Bugfix for #117: 'now' support for date filter in Ruby 1.9 [Notre Dame Webgroup, ndwebgroup]
* Bugfix for #166: truncate filter on UTF-8 strings with Ruby 1.8 [Florian Weingarten, fw42]
* Bugfix for #204: 'raw' parsing bug [Florian Weingarten, fw42]
* Bugfix for #150: 'for' parsing bug [Peter Schröder, phoet]
* Bugfix for #126: Strip CRLF in strip_newline [Peter Schröder, phoet]
* Bugfix for #174, "can't convert Fixnum into String" for "replace" [wǒ_is神仙, jsw0528]
* Allow a Liquid::Drop to be passed into Template#render [Daniel Huckstep, darkhelmet]
* Resource limits [Florian Weingarten, fw42]
* Add reverse filter [Jay Strybis, unreal]
* Add utf-8 support
* Use array instead of Hash to keep the registered filters [Tasos Stathopoulos, astathopoulos]
* Cache tokenized partial templates [Tom Burns, boourns]
* Avoid warnings in Ruby 1.9.3 [Marcus Stollsteimer, stomar]
* Better documentation for 'include' tag (closes #163) [Peter Schröder, phoet]
* Use of BigDecimal on filters to have better precision (closes #155) [Arthur Nogueira Neves, arthurnn]
## 2.5.5 / 2014-01-10 / branch "2-5-stable"
Security fix, cherry-picked from master (4e14a65):
* Don't call to_sym when creating conditions for security reasons (#273) [Bouke van der Bijl, bouk]
* Prevent arbitrary method invocation on condition objects (#274) [Dylan Thacker-Smith, dylanahsmith]
## 2.5.4 / 2013-11-11
* Fix "can't convert Fixnum into String" for "replace" (#173), [wǒ_is神仙, jsw0528]
## 2.5.3 / 2013-10-09
* #232, #234, #237: Fix map filter bugs [Florian Weingarten, fw42]
## 2.5.2 / 2013-09-03 / deleted
Yanked from rubygems, as it contained too many changes that broke compatibility. Those changes will be on following major releases.
## 2.5.1 / 2013-07-24
* #230: Fix security issue with map filter, Use invoke_drop in map filter [Florian Weingarten, fw42]
## 2.5.0 / 2013-03-06
* Prevent Object methods from being called on drops
* Avoid symbol injection from liquid
* Added break and continue statements
* Fix filter parser for args without space separators
* Add support for filter keyword arguments
## 2.4.0 / 2012-08-03
* Performance improvements
* Allow filters in `assign`
* Add `modulo` filter
* Ruby 1.8, 1.9, and Rubinius compatibility fixes
* Add support for `quoted['references']` in `tablerow`
* Add support for Enumerable to `tablerow`
* `strip_html` filter removes html comments
## 2.3.0 / 2011-10-16
* Several speed/memory improvements
* Numerous bug fixes
* Added support for MRI 1.9, Rubinius, and JRuby
* Added support for integer drop parameters
* Added epoch support to `date` filter
* New `raw` tag that suppresses parsing
* Added `else` option to `for` tag
* New `increment` tag
* New `split` filter
## 2.2.1 / 2010-08-23
* Added support for literal tags
## 2.2.0 / 2010-08-22
* Compatible with Ruby 1.8.7, 1.9.1 and 1.9.2-p0
* Merged some changed made by the community
## 1.9.0 / 2008-03-04
* Fixed gem install rake task
* Improve Error encapsulation in liquid by maintaining a own set of exceptions instead of relying on ruby build ins
## Before 1.9.0
* Added If with or / and expressions
* Implemented .to_liquid for all objects which can be passed to liquid like Strings Arrays Hashes Numerics and Booleans. To export new objects to liquid just implement .to_liquid on them and return objects which themselves have .to_liquid methods.
* Added more tags to standard library
* Added include tag ( like partials in rails )
* [...] Gazillion of detail improvements
* Added strainers as filter hosts for better security [Tobias Luetke]
* Fixed that rails integration would call filter with the wrong "self" [Michael Geary]
* Fixed bad error reporting when a filter called a method which doesn't exist. Liquid told you that it couldn't find the filter which was obviously misleading [Tobias Luetke]
* Removed count helper from standard lib. use size [Tobias Luetke]
* Fixed bug with string filter parameters failing to tolerate commas in strings. [Paul Hammond]
* Improved filter parameters. Filter parameters are now context sensitive; Types are resolved according to the rules of the context. Multiple parameters are now separated by the Liquid::ArgumentSeparator: , by default [Paul Hammond]
{{ 'Typo' | link_to: 'http://typo.leetsoft.com', 'Typo - a modern weblog engine' }}
* Added Liquid::Drop. A base class which you can use for exporting proxy objects to liquid which can acquire more data when used in liquid. [Tobias Luetke]
class ProductDrop < Liquid::Drop
def top_sales
Shop.current.products.find(:all, :order => 'sales', :limit => 10 )
end
end
t = Liquid::Template.parse( ' {% for product in product.top_sales %} {{ product.name }} {% endfor %} ' )
t.render('product' => ProductDrop.new )
* Added filter parameters support. Example: {{ date | format_date: "%Y" }} [Paul Hammond]
+20
View File
@@ -0,0 +1,20 @@
Copyright (c) 2005, 2006 Tobias Luetke
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+72 -6
View File
@@ -1,9 +1,75 @@
# New Liquid Docs
[![Build Status](https://api.travis-ci.org/Shopify/liquid.svg?branch=master)](http://travis-ci.org/Shopify/liquid)
[![Inline docs](http://inch-ci.org/github/Shopify/liquid.svg?branch=master)](http://inch-ci.org/github/Shopify/liquid)
To run, follow these steps:
# Liquid template engine
1. Download ZIP or clone in GitHub
2. Navigate to `liquid` folder
3. Run `jekyll watch`
4. Open `http://127.0.0.1:4000` in your browser
* [Contributing guidelines](CONTRIBUTING.md)
* [Version history](History.md)
* [Liquid documentation from Shopify](http://docs.shopify.com/themes/liquid-basics)
* [Liquid Wiki at GitHub](https://github.com/Shopify/liquid/wiki)
* [Website](http://liquidmarkup.org/)
## Introduction
Liquid is a template engine which was written with very specific requirements:
* It has to have beautiful and simple markup. Template engines which don't produce good looking markup are no fun to use.
* It needs to be non evaling and secure. Liquid templates are made so that users can edit them. You don't want to run code on your server which your users wrote.
* It has to be stateless. Compile and render steps have to be separate so that the expensive parsing and compiling can be done once and later on you can just render it passing in a hash with local variables and objects.
## Why you should use Liquid
* You want to allow your users to edit the appearance of your application but don't want them to run **insecure code on your server**.
* You want to render templates directly from the database.
* You like smarty (PHP) style template engines.
* You need a template engine which does HTML just as well as emails.
* You don't like the markup of your current templating engine.
## What does it look like?
```html
<ul id="products">
{% for product in products %}
<li>
<h2>{{ product.name }}</h2>
Only {{ product.price | price }}
{{ product.description | prettyprint | paragraph }}
</li>
{% endfor %}
</ul>
```
## How to use Liquid
Liquid supports a very simple API based around the Liquid::Template class.
For standard use you can just pass it the content of a file and call render with a parameters hash.
```ruby
@template = Liquid::Template.parse("hi {{name}}") # Parses and compiles the template
@template.render('name' => 'tobi') # => "hi tobi"
```
### Error Modes
Setting the error mode of Liquid lets you specify how strictly you want your templates to be interpreted.
Normally the parser is very lax and will accept almost anything without error. Unfortunately this can make
it very hard to debug and can lead to unexpected behaviour.
Liquid also comes with a stricter parser that can be used when editing templates to give better error messages
when templates are invalid. You can enable this new parser like this:
```ruby
Liquid::Template.error_mode = :strict # Raises a SyntaxError when invalid syntax is used
Liquid::Template.error_mode = :warn # Adds errors to template.errors but continues as normal
Liquid::Template.error_mode = :lax # The default mode, accepts almost anything.
```
If you want to set the error mode only on specific templates you can pass `:error_mode` as an option to `parse`:
```ruby
Liquid::Template.parse(source, :error_mode => :strict)
```
This is useful for doing things like enabling strict mode only in the theme editor.
It is recommended that you enable `:strict` or `:warn` mode on new apps to stop invalid templates from being created.
It is also recommended that you use it in the template editors of existing apps to give editors better error messages.
Executable
+91
View File
@@ -0,0 +1,91 @@
require 'rake'
require 'rake/testtask'
$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
require "liquid/version"
task :default => 'test'
desc 'run test suite with default parser'
Rake::TestTask.new(:base_test) do |t|
t.libs << '.' << 'lib' << 'test'
t.test_files = FileList['test/{integration,unit}/**/*_test.rb']
t.verbose = false
end
desc 'run test suite with warn error mode'
task :warn_test do
ENV['LIQUID_PARSER_MODE'] = 'warn'
Rake::Task['base_test'].invoke
end
desc 'runs test suite with both strict and lax parsers'
task :test do
ENV['LIQUID_PARSER_MODE'] = 'lax'
Rake::Task['base_test'].invoke
ENV['LIQUID_PARSER_MODE'] = 'strict'
Rake::Task['base_test'].reenable
Rake::Task['base_test'].invoke
end
task :gem => :build
task :build do
system "gem build liquid.gemspec"
end
task :install => :build do
system "gem install liquid-#{Liquid::VERSION}.gem"
end
task :release => :build do
system "git tag -a v#{Liquid::VERSION} -m 'Tagging #{Liquid::VERSION}'"
system "git push --tags"
system "gem push liquid-#{Liquid::VERSION}.gem"
system "rm liquid-#{Liquid::VERSION}.gem"
end
namespace :benchmark do
desc "Run the liquid benchmark with lax parsing"
task :run do
ruby "./performance/benchmark.rb lax"
end
desc "Run the liquid benchmark with strict parsing"
task :strict do
ruby "./performance/benchmark.rb strict"
end
end
namespace :profile do
desc "Run the liquid profile/performance coverage"
task :run do
ruby "./performance/profile.rb"
end
desc "Run the liquid profile/performance coverage with strict parsing"
task :strict do
ruby "./performance/profile.rb strict"
end
end
namespace :memory do
desc "Run the liquid memory tracer"
task :run do
ruby "./performance/memory.rb"
end
desc "Run the liquid memory tracer with strict parsing"
task :strict do
ruby "./performance/memory.rb strict"
end
end
desc "Run example"
task :example do
ruby "-w -d -Ilib example/server/server.rb"
end
-25
View File
@@ -1,25 +0,0 @@
title: Liquid Templating Engine
description: "Liquid is a template language and accompanying rendering engine. It is built for security, so is perfect for rendering custom templates from your users."
repository: https://github.com/Shopify/liquid
# Build settings
baseurl: "" # the subpath of your site, e.g. /blog/
url: http://liquidmarkup.org # the base hostname & protocol for your site
markdown: redcarpet
redcarpet:
extensions: ["with_toc_data", "tables", "disable_indented_code_blocks", "no_intra_emphasis"]
highlighter: pygments
permalink: pretty
exclude:
- README.md
- CNAME
- node_modules
keep_files: ["css"]
# Front matter defaults
defaults:
- scope:
path: "" # an empty string here means all files in the project
values:
layout: default
-8
View File
@@ -1,8 +0,0 @@
<header class="home-banner">
<h1>Liquid</h1>
<p>Safe, customer facing template language for flexible web apps.</p>
<p class="btn-row">
<a href="https://github.com/Shopify/liquid/archive/master.zip" target="_blank" class="btn"><i class="icon fa fa-2x fa-arrow-circle-down"></i>Download</a>
<a href="https://github.com/Shopify/liquid" target="_blank" class="btn"><i class="icon fa fa-2x fa-github"></i>View on Github</a>
</p>
</header>
-24
View File
@@ -1,24 +0,0 @@
<div class="home-users-grid">
<div class="home-users-grid__item">
<a href="http://jekyllrb.com/" target="_blank">
<img src="/images/jekyll-logo.png" />
</a>
</div>
<div class="home-users-grid__item">
<a href="http://www.desk.com/" target="_blank">
<img src="/images/salesforcedesk-logo.png" />
</a>
</div>
<div class="home-users-grid__item">
<a href="https://www.zendesk.com/ " target="_blank">
<img src="/images/zendesk-logo.png" />
</a>
</div>
<div class="home-users-grid__item">
<a href="http://500px.com/" target="_blank">
<img src="/images/500px-logo.png" />
</a>
</div>
</div>
<p class="home-users-blurb">...and <a href="https://github.com/Shopify/liquid/wiki#who-uses-liquid" target="_blank">many more!</a></p>
-18
View File
@@ -1,18 +0,0 @@
<div class="sidebar">
<div class="sidebar--logo">
<a href="/">Liquid</a>
</div>
<nav class="sidebar--nav"> {% assign sections = "basics, tags, filters" | split: ", " %}
{% for section in sections %}
<h3 class="section__header">{{ section | capitalize }}</h3>
<ul class="section__links">
{% for item in site.pages %}{% if item.url contains section/ %}{% unless item.path contains "index" %}
<li><a href="{{ item.url | prepend: site.baseurl }}" class="section__link{% if item.url contains page.url and page.url != "/" %} section__link--is-active {% endif %}">{{ item.title }}</a></li>
{% endunless %}{% endif %}{% endfor %}
</ul>
{% endfor %}
</nav>
</div>
-29
View File
@@ -1,29 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<title>{% if page.title %}{{ page.title }} {% endif %}{{ site.title }}</title>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
<link rel="stylesheet" href="{{ '/css/main.css' | prepend: site.baseurl }}">
<link href='http://fonts.googleapis.com/css?family=Droid+Sans:400,700' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" />
</head>
<body>
{% include sidebar.html %}
<div class="content__area">
<div class="content">
<h1>{{ page.title }}</h1>
{{ content }}
</div>
</div>
</body>
</html>
-17
View File
@@ -1,17 +0,0 @@
@charset "utf-8";
@import "partials/defaults";
@import "partials/colors";
@import "partials/helpers";
@import "modules/base";
@import "modules/layout";
@import "modules/buttons";
@import "modules/home-banner";
@import "modules/home-users-grid";
@import "modules/content-area";
@import "vendors/syntax-highlighting";
-185
View File
@@ -1,185 +0,0 @@
* {
box-sizing: border-box;
}
/**
* Reset some basic elements
*/
body, h1, h2, h3, h4, h5, h6,
p, blockquote, pre, hr,
dl, dd, ol, ul, figure {
margin: 0;
padding: 0;
}
/**
* Basic styling
*/
body {
font-family: $base-font-family;
font-size: $base-font-size;
line-height: $base-line-height;
font-weight: 300;
color: $color-slate;
-webkit-text-size-adjust: 100%;
}
/** Set `margin-bottom` to maintain vertical rhythm */
h1, h2, h3, h4, h5, h6,
p, blockquote, pre,
ul, ol, dl, figure,
%vertical-rhythm {
margin-bottom: $spacing-unit / 2;
}
/** Images */
img {
max-width: 100%;
vertical-align: middle;
}
/** Figures */
figure > img {
display: block;
}
figcaption {
font-size: $small-font-size;
}
/** Lists */
ul, ol {
margin-left: $spacing-unit;
}
li {
> ul, > ol {
margin-bottom: 0;
}
}
/** Headings */
h1, h2, h3, h4, h5, h6 {
font-weight: bold;
}
/** Links */
a {
color: $color-blue-5;
&:visited {
color: #609;
}
&:hover {
text-decoration: underline;
}
}
h1 {
font-size: 2em;
}
h2 {
font-size: 1.5em;
text-decoration: underline;
margin-top: $spacing-unit;
}
h3 {
font-size: 1em;
text-decoration: underline;
}
h4 {
font-size: 1em;
}
blockquote {
color: lighten($color-slate, 30%);
border-left: 2px solid lighten($color-slate, 50%);
padding-left: $spacing-unit / 2;
letter-spacing: -1px;
font-style: italic;
> :last-child {
margin-bottom: 0;
}
}
pre, code {
font-size: 15px;
border-radius: 3px;
background-color: lighten($color-blue-1, 0.9);
}
code {
padding: 1px 5px;
}
pre {
padding: 8px 12px;
border: 1px solid $color-blue-2;
word-wrap: break-word;
> code {
border: 0;
padding-right: 0;
padding-left: 0;
}
}
hr {
display: block;
height: 1px;
border: 0;
background-color: lighten($color-slate, 50%);
margin-bottom: $spacing-unit/2;
}
table {
width: 100%;
overflow: auto;
display: block;
margin: 15px 0;
border-collapse: collapse;
thead {
margin: 0;
padding: 0;
border: 0;
font-size: 100%;
font: inherit;
vertical-align: baseline;
}
th {
border: 1px solid #ddd;
padding: 6px 13px;
font-weight: bold;
text-align: center;
}
tbody {
vertical-align: middle;
border-color: inherit;
}
tr {
border-top: 1px solid #ccc;
background-color: #fff;
vertical-align: inherit;
}
td {
border: 1px solid #ddd;
padding: 6px 13px;
}
/* Don't use a margin on code samples within tables */
pre {
margin-bottom: 0;
}
}
p {
line-height: 1.8;
}
-34
View File
@@ -1,34 +0,0 @@
.btn {
color: $color-white;
display: flex;
background: $color-blue-5;
align-items: center;
padding: $spacing-unit/4 $spacing-unit/2;
border-radius: 8px;
text-decoration: none;
&:hover {
background: $color-blue-4;
cursor: pointer;
text-decoration: none;
}
}
.btn:visited {
color: $color-white;
}
.btn-row {
display: flex;
justify-content: center;
margin-bottom: 0;
.btn:not(:first-child) {
margin-left: $spacing-unit / 2;
}
}
.icon {
vertical-align: middle;
margin-right: $spacing-unit / 4;
}
-31
View File
@@ -1,31 +0,0 @@
.content__item {
margin-bottom: $spacing-unit * 2;
}
.highlight {
pre {
border-top: none;
border-radius: 0 0 3px 3px;
}
&:before {
content: "Example";
display: block;
padding: 8px 12px;
color: $color-slate;
background: #fff;
border: 1px solid $color-blue-2;
border-radius: 3px 3px 0 0;
font-size: 16px;
font-weight: bold;
}
// Label every second code block with "Output"
& + .highlight:nth-of-type(2n) {
&:before {
content: "Output";
}
}
}
-11
View File
@@ -1,11 +0,0 @@
.home-banner {
text-align: center;
border-bottom: 1px solid lighten($color-slate, 50%);
padding-bottom: $spacing-unit;
margin-bottom: $spacing-unit;
h1 {
font-weight: bold;
font-size: 5em;
}
}
-20
View File
@@ -1,20 +0,0 @@
.home-users-grid {
display: flex;
align-items: center;
flex-wrap: wrap;
margin-bottom: $spacing-unit / 2;
}
.home-users-grid__item{
flex: 1;
margin-right: $spacing-unit / 2;
max-width: 50%;
&:last-child {
margin-right: 0;
}
}
.home-users-blurb {
text-align: right;
}
-112
View File
@@ -1,112 +0,0 @@
$sidebar-width: 250px;
$logo-height: 130px;
$wrapper-width: 800px;
/*============================================================================
Content Area
==============================================================================*/
.content__area {
padding: $spacing-unit $spacing-unit $spacing-unit ($spacing-unit + $sidebar-width);
width: 100%;
}
.content {
max-width: $wrapper-width;
margin: 0 auto;
padding: 0 $spacing-unit;
@extend %clearfix;
}
/*============================================================================
Sidebar
==============================================================================*/
.sidebar {
background: $color-blue-5;
width: $sidebar-width;
height: 100vh;
position: fixed;
}
.sidebar--logo {
font-size: $base-font-size * 2;
font-weight: bold;
text-align: center;
height: $logo-height;
line-height: $logo-height;
margin-bottom: 0;
border-bottom: 1px solid $color-blue-4;
a {
color: $color-white;
text-decoration: none;
&:hover {
text-decoration: underline;
}
}
}
.sidebar--nav {
padding: $spacing-unit $spacing-unit ($spacing-unit + $logo-height); // Add a bit more padding at the bottom for consistency.
font-weight: bold;
max-height: 100%;
overflow-y: scroll;
li {
list-style: none;
a {
color: $color-white;
&:hover {
text-decoration: none;
}
}
}
}
.section {
margin: 0px;
> li {
margin-bottom: $spacing-unit / 2;
&:last-child {
margin-bottom: $spacing-unit;
}
}
}
.section__header {
font-weight: bold;
font-size: 1em;
text-decoration: none;
color: $color-white;
margin-bottom: $spacing-unit / 4;
}
.section__links {
margin-left: $spacing-unit / 2;
margin-bottom: $spacing-unit;
font-weight: normal;
font-size: 0.9em;
}
.section__link {
display: inline-block;
margin-top: $spacing-unit/4;
opacity: 0.75;
text-decoration: none;
&:hover {
opacity: 1;
}
}
.section__link--is-active {
font-weight: bold;
opacity: 1;
}
-10
View File
@@ -1,10 +0,0 @@
// I got the blues, man.
// 1 --> 5, lightest --> darkest.
$color-blue-1: #E8F8FF;
$color-blue-2: #B4DCED;
$color-blue-3: #91C9E8;
$color-blue-4: #67B8DE;
$color-blue-5: #3399CC;
$color-white: #ffffff;
$color-slate: #5E5E5E;
-6
View File
@@ -1,6 +0,0 @@
$base-font-family: 'Droid Sans', sans-serif;
$base-font-size: 18px;
$small-font-size: $base-font-size * 0.875;
$base-line-height: 1.5;
$spacing-unit: 40px;
-7
View File
@@ -1,7 +0,0 @@
%clearfix {
&:after {
content: "";
display: table;
clear: both;
}
}
-67
View File
@@ -1,67 +0,0 @@
/**
* Syntax highlighting styles
*/
.highlight {
background: #fff;
@extend %vertical-rhythm;
.c { color: #998; font-style: italic } // Comment
.err { color: #a61717; background-color: #e3d2d2 } // Error
.k { font-weight: bold } // Keyword
.o { font-weight: bold } // Operator
.cm { color: #998; font-style: italic } // Comment.Multiline
.cp { color: #999; font-weight: bold } // Comment.Preproc
.c1 { color: #998; font-style: italic } // Comment.Single
.cs { color: #999; font-weight: bold; font-style: italic } // Comment.Special
.gd { color: #000; background-color: #fdd } // Generic.Deleted
.gd .x { color: #000; background-color: #faa } // Generic.Deleted.Specific
.ge { font-style: italic } // Generic.Emph
.gr { color: #a00 } // Generic.Error
.gh { color: #999 } // Generic.Heading
.gi { color: #000; background-color: #dfd } // Generic.Inserted
.gi .x { color: #000; background-color: #afa } // Generic.Inserted.Specific
.go { color: #888 } // Generic.Output
.gp { color: #555 } // Generic.Prompt
.gs { font-weight: bold } // Generic.Strong
.gu { color: #aaa } // Generic.Subheading
.gt { color: #a00 } // Generic.Traceback
.kc { font-weight: bold } // Keyword.Constant
.kd { font-weight: bold } // Keyword.Declaration
.kp { font-weight: bold } // Keyword.Pseudo
.kr { font-weight: bold } // Keyword.Reserved
.kt { color: #458; font-weight: bold } // Keyword.Type
.m { color: #099 } // Literal.Number
.s { color: #d14 } // Literal.String
.na { color: #008080 } // Name.Attribute
.nb { color: #0086B3 } // Name.Builtin
.nc { color: #458; font-weight: bold } // Name.Class
.no { color: #008080 } // Name.Constant
.ni { color: #800080 } // Name.Entity
.ne { color: #900; font-weight: bold } // Name.Exception
.nf { color: #900; font-weight: bold } // Name.Function
.nn { color: #555 } // Name.Namespace
.nt { color: #000080 } // Name.Tag
.nv { color: #008080 } // Name.Variable
.ow { font-weight: bold } // Operator.Word
.w { color: #bbb } // Text.Whitespace
.mf { color: #099 } // Literal.Number.Float
.mh { color: #099 } // Literal.Number.Hex
.mi { color: #099 } // Literal.Number.Integer
.mo { color: #099 } // Literal.Number.Oct
.sb { color: #d14 } // Literal.String.Backtick
.sc { color: #d14 } // Literal.String.Char
.sd { color: #d14 } // Literal.String.Doc
.s2 { color: #d14 } // Literal.String.Double
.se { color: #d14 } // Literal.String.Escape
.sh { color: #d14 } // Literal.String.Heredoc
.si { color: #d14 } // Literal.String.Interpol
.sx { color: #d14 } // Literal.String.Other
.sr { color: #009926 } // Literal.String.Regex
.s1 { color: #d14 } // Literal.String.Single
.ss { color: #990073 } // Literal.String.Symbol
.bp { color: #999 } // Name.Builtin.Pseudo
.vc { color: #008080 } // Name.Variable.Class
.vg { color: #008080 } // Name.Variable.Global
.vi { color: #008080 } // Name.Variable.Instance
.il { color: #099 } // Literal.Number.Integer.Long
}
-48
View File
@@ -1,48 +0,0 @@
---
title: Handles
---
A handle is used to access the attributes of a Liquid object. By default, the handle is the object's title in lowercase with any spaces and special characters replaced by hyphens (-).
For example, a page with the title "About Us" can be accessed in Liquid via its handle `about-us` as shown below:
{% highlight liquid %}
{% raw %}
<!-- the content of the About Us page -->
{{ pages.about-us.content }}
{% endraw %}
{% endhighlight %}
## Creating handles
An object with the title "Shirt" will automatically be given the handle `shirt`. If there is already an object with the handle `shirt`, the handle will auto-increment. In other words, "Shirt" objects created after the first one will receive the handle `shirt-1`, `shirt-2`, and so on.
Whitespace in titles is replaced by hyphens in handles. For example, the title "My Shiny New Title" will be given the handle `my-shiny-new-title`.
Handles also determine the URL of their corresponding objects. For example, a page with the handle `about-us` would have the url `/pages/about-us`.
Websites often rely on static handles for pages, posts, or objects. To preserve design elements and avoid broken links, if you modify the title of an object, **its handle is not automatically updated**. For example, if you were to change a page title from "About Us" to "About This Website", its handle would still be `about-us`.
You can change an object's handle manually (TK how to change a handle manually)
## Accessing handle attributes
In many cases you may know the handle of a object whose attributes you want to access. You can access its attributes by pluralizing the name of the object, then using either the square bracket ( [ ] ) or dot ( . ) notation.
<div class="code-block code-block--input">
{% highlight liquid %}
{% raw %}
{{ pages.about-us.title }}
{{ pages["about-us"].title }}
{% endraw %}
{% endhighlight %}
</div>
<div class="code-block code-block--output">
{% highlight text %}
About Us
About Us
{% endhighlight %}
</div>
In the example above, notice that we are using `pages` as opposed to `page`.
-4
View File
@@ -1,4 +0,0 @@
---
layout: default
---
-64
View File
@@ -1,64 +0,0 @@
---
title: Introduction
---
Liquid code can be categorized into [**objects**](#objects), [**tags**](#tags), and [**filters**](#filters).
## Objects
**Objects** tell Liquid where to show content on a page. Objects and variable names are denoted by double curly braces: `{% raw %}{{{% endraw %}` and `{% raw %}}}{% endraw %}`.
```liquid
{% raw %}
{{ page.title }}
{% endraw %}
```
```text
Introduction
```
In this case, Liquid is rendering the content of an object called `page.title`, and that object contains the text `Introduction`.
## Tags
**Tags** create the logic and control flow for templates. They are denoted by curly braces and percent signs: `{% raw %}{%{% endraw %}` and `{% raw %}%}{% endraw %}`.
The markup used in tags does not produce any visible text. This means that you can assign variables and create conditions and loops without showing any of the Liquid logic on the page.
```liquid
{% raw %}
{% if user %}
Hello {{ user.name }}!
{% endif %}
{% endraw %}
```
```text
Hello Adam!
```
Tags can be categorized into three types:
- [Control flow](/tags/control-flow)
- [Iteration](/tags/iteration)
- [Variable assignments](/tags/variable)
You can read more about each type of tag in their respective sections.
## Filters
**Filters** change the output of a Liquid object. They are using within an output and are separated by a `|`.
```liquid
{% raw %}
{{ "/my/fancy/url" | append: ".html" }}
{% endraw %}
```
```text
{{ "/my/fancy/url" | append: ".html" }}
```
-88
View File
@@ -1,88 +0,0 @@
---
title: Operators
---
Liquid includes many logical and comparison operators.
## Basic operators
<table>
<tbody>
<tr>
<td><code>==</code></td>
<td>equals</td>
</tr>
<tr>
<td><code>!=</code></td>
<td>does not equal</td>
</tr>
<tr>
<td><code>&gt;</code></td>
<td>greater than</td>
</tr>
<tr>
<td><code>&lt;</code></td>
<td>less than</td>
</tr>
<tr>
<td><code>&gt;=</code></td>
<td>greater than or equal to</td>
</tr>
<tr>
<td><code>&lt;=</code></td>
<td>less than or equal to</td>
</tr>
<tr>
<td><code>or</code></td>
<td>logical or</td>
</tr>
<tr>
<td><code>and</code></td>
<td>logical and</td>
</tr>
</tbody>
</table>
For example:
```liquid
{% raw %}
{% if product.title == "Awesome Shoes" %}
These shoes are awesome!
{% endif %}
{% endraw %}
```
You can use multiple operators in a tag:
```liquid
{% raw %}
{% if product.type == "Shirt" or product.type == "Shoes" %}
This is a shirt or a pair of shoes.
{% endif %}
{% endraw %}
```
## contains
`contains` checks for the presence of a substring inside a string.
```liquid
{% raw %}
{% if product.title contains 'Pack' %}
This product's title contains the word Pack.
{% endif %}
{% endraw %}
```
`contains` can also check for the presence of a string in an array of strings.
```liquid
{% raw %}
{% if product.tags contains 'Hello' %}
This product has been tagged with 'Hello'.
{% endif %}
{% endraw %}
```
`contains` can only search strings. You cannot use it to check for an object in an array of objects.
-76
View File
@@ -1,76 +0,0 @@
---
title: Truthy and falsy
---
In programming, anything that returns `true` in a conditional is called **truthy**. Anything that returns `false` in a conditional is called **falsy**. All object types can be described as either truthy or falsy.
- [Truthy](#truthy)
- [Falsy](#falsy)
- [Summary](#summary)
## Truthy
All values in Liquid are truthy except `nil` and `false`.
In the example below, the string "Tobi" is not a boolean, but it is truthy in a conditional:
```liquid
{% raw %}
{% assign tobi = "Tobi" %}
{% if tobi == true %}
This condition will always be true.
{% endif %}
{% endraw %}
```
[Strings](/basics/types/#string), even when empty, are truthy. The example below will result in empty HTML tags if `settings.fp_heading` is empty:
```liquid
{% raw %}
{% if settings.fp_heading %}
<h1>{{ settings.fp_heading }}</h1>
{% endif %}
{% endraw %}
```
```html
<h1></h1>
```
[EmptyDrops](/basics/types/#emptydrop) are also truthy. In the example below, if `settings.page` is an empty string or set to a hidden or deleted object, you will end up with an EmptyDrop. The result is an empty `div`:
```liquid
{% raw %}
{% if pages[settings.page] %}
<div>{{ pages[settings.page].content }}</div>
{% endif %}
{% endraw %}
```
```html
<div></div>
```
## Falsy
The falsy values in Liquid are [`nil`](/basics/types/#nil) and [`false`](/basics/types/#boolean).
## Summary
The table below summarizes what is truthy or falsy in Liquid.
| | truthy | falsy |
| ------------- |:-------------:|:-------------:|
| true | • | |
| false | | • |
| nil | | • |
| string | • | |
| empty string | • | |
| 0 | • | |
| integer | • | |
| float | • | |
| array | • | |
| empty array | • | |
| page | • | |
| EmptyDrop | • | |
-160
View File
@@ -1,160 +0,0 @@
---
title: Types
---
Liquid objects can have one of six types:
- [String](#string)
- [Number](#number)
- [Boolean](#boolean)
- [Nil](#nil)
- [Array](#array)
- [EmptyDrop](#emptydrop)
You can initialize Liquid variables with the [assign](/tags/#assign) or [capture](/tags/#capture) tags.
## String
Declare a string by wrapping a variable's value in single or double quotes:
```liquid
{% raw %}
{% assign my_string = "Hello World!" %}
{% endraw %}
```
## Number
Numbers include floats and integers:
```liquid
{% raw %}
{% assign my_int = 25 %}
{% assign my_float = 39.756 %}
{% endraw %}
```
## Boolean
Booleans are either `true` or `false`. No quotations are necessary when declaring a boolean:
```liquid
{% raw %}
{% assign foo = true %}
{% assign bar = false %}
{% endraw %}
```
## Nil
Nil is a special empty value that is returned when Liquid code has no results. It is **not** a string with the characters "nil".
Nil is [treated as false](/basics/truthy-and-falsy) in the conditions of `if` blocks and other Liquid tags that check the truthfulness of a statement.
In the following example, if the user does not exist (that is, `user` returns `nil`), Liquid will not print the greeting:
```liquid
{% raw %}
{% if user %}
Hello {{ user.name }}!
{% endif %}
{% endraw %}
```
Tags or outputs that return `nil` will not print anything to the page.
```liquid
{% raw %}
The current user is {{ user.name }}
{% endraw %}
```
```text
The current user is
```
## Array
Arrays hold lists of variables of any type.
### Accessing items in arrays
To access all the items in an array, you can loop through each item in the array using an [iteration tag](/tags/iteration/).
```liquid
{% raw %}
<!-- if site.users = "Tobi", "Laura", "Tetsuro", "Adam" -->
{% for user in site.users %}
{{ user }}
{% endfor %}
{% endraw %}
```
```text
{% raw %}
Tobi Laura Tetsuro Adam
{% endraw %}
```
### Accessing specific items in arrays
You can use square bracket `[` `]` notation to access a specific item in an array. Array indexing starts at zero.
```liquid
{% raw %}
<!-- if site.users = "Tobi", "Laura", "Tetsuro", "Adam" -->
{{ site.users[0] }}
{{ site.users[1] }}
{{ site.users[3] }}
{% endraw %}
```
```text
Tobi
Laura
Adam
```
### Initializing arrays
You cannot initialize arrays using only Liquid.
You can, however, use the [split](/filters/split) filter to break a string into an array of substrings.
## EmptyDrop
An EmptyDrop object is returned if you try to access a deleted object by name. In the example below, `page_1`, `page_2` and `page_3` are all EmptyDrop objects.
```liquid
{% raw %}
{% assign variable = "hello" %}
{% assign page_1 = pages[variable] %}
{% assign page_2 = pages["does-not-exist"] %}
{% assign page_3 = pages.this-handle-does-not-exist %}
{% endraw %}
```
EmptyDrop objects only have one attribute, `empty?`, which is always *true*.
Collections and pages that *do* exist do not have an `empty?` attribute. Their `empty?` is "falsy", which means that calling it inside an if statement will return *false*. When using an `unless` statement on existing collections and pages, `empty?` will return `true`.
### Checking for emptiness
Using the `empty?` attribute, you can check to see if an object exists or not before you access any of its attributes.
```liquid
{% raw %}
{% unless pages.about.empty? %}
<!-- This will only print if the page with handle 'about' is not empty -->
<h1>{{ pages.frontpage.title }}</h1>
<div>{{ pages.frontpage.content }}</div>
{% endunless %}
{% endraw %}
```
If you don't check for emptiness first, Liquid might print empty HTML elements to the page:
```html
<h1></h1>
<div></div>
```
+46
View File
@@ -0,0 +1,46 @@
module ProductsFilter
def price(integer)
sprintf("$%.2d USD", integer / 100.0)
end
def prettyprint(text)
text.gsub( /\*(.*)\*/, '<b>\1</b>' )
end
def count(array)
array.size
end
def paragraph(p)
"<p>#{p}</p>"
end
end
class Servlet < LiquidServlet
def index
{ 'date' => Time.now }
end
def products
{ 'products' => products_list, 'more_products' => more_products_list, 'description' => description, 'section' => 'Snowboards', 'cool_products' => true}
end
private
def products_list
[{'name' => 'Arbor Draft', 'price' => 39900, 'description' => 'the *arbor draft* is a excellent product' },
{'name' => 'Arbor Element', 'price' => 40000, 'description' => 'the *arbor element* rocks for freestyling'},
{'name' => 'Arbor Diamond', 'price' => 59900, 'description' => 'the *arbor diamond* is a made up product because im obsessed with arbor and have no creativity'}]
end
def more_products_list
[{'name' => 'Arbor Catalyst', 'price' => 39900, 'description' => 'the *arbor catalyst* is an advanced drop-through for freestyle and flatground performance and versatility' },
{'name' => 'Arbor Fish', 'price' => 40000, 'description' => 'the *arbor fish* is a compact pin that features an extended wheelbase and time-honored teardrop shape'}]
end
def description
"List of Products ~ This is a list of products with price and description."
end
end
+29
View File
@@ -0,0 +1,29 @@
class LiquidServlet < WEBrick::HTTPServlet::AbstractServlet
def do_GET(req, res)
handle(:get, req, res)
end
def do_POST(req, res)
handle(:post, req, res)
end
private
def handle(type, req, res)
@request = req
@response = res
@request.path_info =~ /(\w+)\z/
@action = $1 || 'index'
@assigns = send(@action) if respond_to?(@action)
@response['Content-Type'] = "text/html"
@response.status = 200
@response.body = Liquid::Template.parse(read_template).render(@assigns, :filters => [ProductsFilter])
end
def read_template(filename = @action)
File.read( File.dirname(__FILE__) + "/templates/#{filename}.liquid" )
end
end
+14
View File
@@ -0,0 +1,14 @@
require 'webrick'
require 'rexml/document'
DIR = File.expand_path(File.dirname(__FILE__))
require DIR + '/../../lib/liquid'
require DIR + '/liquid_servlet'
require DIR + '/example_servlet'
# Setup webrick
server = WEBrick::HTTPServer.new( :Port => ARGV[1] || 3000 )
server.mount('/', Servlet)
trap("INT"){ server.shutdown }
server.start
+6
View File
@@ -0,0 +1,6 @@
<p>Hello world!</p>
<p>It is {{date}}</p>
<p>Check out the <a href="/products">Products</a> screen </p>
+49
View File
@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Language" content="en-us" />
<title>products</title>
<meta name="ROBOTS" content="ALL" />
<meta http-equiv="imagetoolbar" content="no" />
<meta name="MSSmartTagsPreventParsing" content="true" />
<meta name="Copyright" content="(c) 2005 Copyright content: Copyright design: Tobias Luetke" />
<!-- (c) Copyright 2005 by Tobias Luetke All Rights Reserved. -->
</head>
<body>
{% assign all_products = products | concat: more_products %}
<h1>{{ description | split: '~' | first }}</h1>
<h2>{{ description | split: '~' | last }}</h2>
<h2>There are currently {{all_products | count}} products in the {{section}} catalog</h2>
{% if cool_products %}
Cool products :)
{% else %}
Uncool products :(
{% endif %}
<ul id="products">
{% for product in all_products %}
<li>
<h2>{{product.name}}</h2>
Only {{product.price | price }}
{{product.description | prettyprint | paragraph }}
{{ 'it rocks!' | paragraph }}
</li>
{% endfor %}
</ul>
</body>
</html>
-30
View File
@@ -1,30 +0,0 @@
---
layout: null
---
<?xml version="1.0" encoding="UTF-8"?>
<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
<channel>
<title>{{ site.title | xml_escape }}</title>
<description>{{ site.description | xml_escape }}</description>
<link>{{ site.url }}{{ site.baseurl }}/</link>
<atom:link href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" rel="self" type="application/rss+xml"/>
<pubDate>{{ site.time | date_to_rfc822 }}</pubDate>
<lastBuildDate>{{ site.time | date_to_rfc822 }}</lastBuildDate>
<generator>Jekyll v{{ jekyll.version }}</generator>
{% for post in site.posts limit:10 %}
<item>
<title>{{ post.title | xml_escape }}</title>
<description>{{ post.content | xml_escape }}</description>
<pubDate>{{ post.date | date_to_rfc822 }}</pubDate>
<link>{{ post.url | prepend: site.baseurl | prepend: site.url }}</link>
<guid isPermaLink="true">{{ post.url | prepend: site.baseurl | prepend: site.url }}</guid>
{% for tag in post.tags %}
<category>{{ tag | xml_escape }}</category>
{% endfor %}
{% for cat in post.categories %}
<category>{{ cat | xml_escape }}</category>
{% endfor %}
</item>
{% endfor %}
</channel>
</rss>
-29
View File
@@ -1,29 +0,0 @@
---
title: append
---
Concatenates two strings and returns the concatenated value.
```liquid
{% raw %}
{{ "/my/fancy/url" | append: ".html" }}
{% endraw %}
```
```text
{{ "/my/fancy/url" | append: ".html" }}
```
`append` can also be used with variables:
```liquid
{% raw %}
{% assign filename = "/index.html" %}
{{ "website.com" | append: filename }}
{% endraw %}
```
```text
{% assign filename = "/index.html" %}
{{ "website.com" | append: filename }}
```
-27
View File
@@ -1,27 +0,0 @@
---
title: capitalize
---
Makes the first character of a string capitalized.
```liquid
{% raw %}
{{ "title" | capitalize }}
{% endraw %}
```
```text
Title
```
`capitalize` only capitalizes the first character of the string, so later words are not affected:
```liquid
{% raw %}
{{ "my great title" | capitalize }}
{% endraw %}
```
```text
My great title
```
-47
View File
@@ -1,47 +0,0 @@
---
title: ceil
---
Rounds the input up to the nearest whole number. Liquid tries to convert the input to a number before the filter is applied.
```liquid
{% raw %}
{{ 1.2 | ceil }}
{% endraw %}
```
```text
{{ 1.2 | ceil }}
```
```liquid
{% raw %}
{{ 2.0 | ceil }}
{% endraw %}
```
```text
{{ 2.0 | ceil }}
```
```liquid
{% raw %}
{{ 183.357 | ceil }}
{% endraw %}
```
```text
{{ 183.357 | ceil }}
```
Here the input value is a string:
```liquid
{% raw %}
{{ "3.5" | ceil }}
{% endraw %}
```
```text
{{ "3.5" | ceil }}
```
-37
View File
@@ -1,37 +0,0 @@
---
title: date
---
Converts a timestamp into another date format. The format for this syntax is the same as [`strftime`](//strftime.net).
```liquid
{% raw %}
{{ article.published_at | date: "%a, %b %d, %y" }}
{% endraw %}
```
```text
Fri, Jul 17, 15
```
```liquid
{% raw %}
{{ article.published_at | date: "%Y" }}
{% endraw %}
```
```text
2015
```
`date` works on strings if they contain well-formatted dates:
```liquid
{% raw %}
{{ "March 14, 2016" | date: "%b %d, %y" }}
{% endraw %}
```
```text
{{ "March 14, 2016" | date: "%b %d, %y" }}
```
-44
View File
@@ -1,44 +0,0 @@
---
title: default
---
Allows you to specify a fallback in case a value doesn't exist. `default` will show its value if the left side is `nil`, `false`, or empty.
In this example, `product_price` is not defined, so the default value is used.
```liquid
{% raw %}
{{ product_price | default: 2.99 }}
{% endraw %}
```
```text
2.99
```
In this example, `product_price` is defined, so the default value is not used.
```liquid
{% raw %}
{% assign product_price = 4.99 %}
{{ product_price | default: 2.99 }}
{% endraw %}
```
```text
4.99
```
In this example, `product_price` is empty, so the default value is used.
```liquid
{% raw %}
{% assign product_price = "" %}
{{ product_price | default: 2.99 }}
{% endraw %}
```
```text
2.99
```
-37
View File
@@ -1,37 +0,0 @@
---
title: divided_by
---
Divides a number by the specified number.
The result is rounded down to the nearest integer (that is, the [floor](/filters/floor)).
```liquid
{% raw %}
{{ 4 | divided_by: 2 }}
{% endraw %}
```
```text
{{ 4 | divided_by: 2 }}
```
```liquid
{% raw %}
{{ 16 | divided_by: 4 }}
{% endraw %}
```
```text
{{ 16 | divided_by: 4 }}
```
```liquid
{% raw %}
{{ 5 | divided_by: 3 }}
{% endraw %}
```
```text
{{ 5 | divided_by: 3 }}
```
-25
View File
@@ -1,25 +0,0 @@
---
title: downcase
---
Makes each character in a string lowercase. It has no effect on strings which are already all lowercase.
```liquid
{% raw %}
{{ "Parker Moore" | downcase }}
{% endraw %}
```
```text
{{ "Parker Moore" | downcase }}
```
```liquid
{% raw %}
{{ "apple" | downcase }}
{% endraw %}
```
```text
{{ "apple" | downcase }}
```
-25
View File
@@ -1,25 +0,0 @@
---
title: escape
---
Escapes a string by replacing characters with escape sequences (so that the string can be used in a URL, for example). It doesn't change strings that don't have anything to escape.
```liquid
{% raw %}
{{ "Have you read 'James & the Giant Peach'?" | escape }}
{% endraw %}
```
```text
{{ "Have you read 'James & the Giant Peach'?" | escape }}
```
```liquid
{% raw %}
{{ "Tetsuro Takara" | escape }}
{% endraw %}
```
```text
{{ "Tetsuro Takara" | escape }}
```
-25
View File
@@ -1,25 +0,0 @@
---
title: escape_once
---
Escapes a string without changing existing escaped entities. It doesn't change strings that don't have anything to escape.
```liquid
{% raw %}
{{ "1 < 2 & 3" | escape_once }}
{% endraw %}
```
```text
{{ "1 < 2 & 3" | escape_once }}
```
```liquid
{% raw %}
{{ "1 &lt; 2 &amp; 3" | escape_once }}
{% endraw %}
```
```text
{{ "1 &lt; 2 &amp; 3" | escape_once }}
```
-33
View File
@@ -1,33 +0,0 @@
---
title: first
---
Returns the first item of an array.
```liquid
{% raw %}
{% assign my_array = "apples, oranges, peaches, plums" | split: ", " %}
{{ my_array.first }}
{% endraw %}
```
```text
{% assign my_array = "apples, oranges, peaches, plums" | split: ", " %}
{{ my_array.first }}
```
```liquid
{% raw %}
{% assign my_array = "zebra, octopus, giraffe, tiger" | split: ", " %}
{{ my_array.first }}
{% endraw %}
```
```text
{% assign my_array = "zebra, octopus, giraffe, tiger" | split: ", " %}
{{ my_array.first }}
```
-47
View File
@@ -1,47 +0,0 @@
---
title: floor
---
Rounds a number down to the nearest whole number. Liquid tries to convert the input to a number before the filter is applied.
```liquid
{% raw %}
{{ 1.2 | floor }}
{% endraw %}
```
```text
{{ 1.2 | floor }}
```
```liquid
{% raw %}
{{ 2.0 | floor }}
{% endraw %}
```
```text
{{ 2.0 | floor }}
```
```liquid
{% raw %}
{{ 183.357 | floor }}
{% endraw %}
```
```text
{{ 183.357 | floor }}
```
Here the input value is a string:
```liquid
{% raw %}
{{ "3.5" | floor }}
{% endraw %}
```
```text
{{ "3.5" | floor }}
```
-10
View File
@@ -1,10 +0,0 @@
---
layout: default
---
{% for doc in site.collections["filters"].docs %}
<h2 id="{{ doc.title | slugify }}">{{ doc.title }}</h2>
<div class="content">
{{ doc.content }}
</div>
{% endfor %}
-19
View File
@@ -1,19 +0,0 @@
---
title: join
---
Combines the items in an array into a single string using the argument as a separator.
```liquid
{% raw %}
{% assign beatles = "John, Paul, George, Ringo" | split: ", " %}
{{ beatles | join: " and " }}
{% endraw %}
```
```text
{% assign beatles = "John, Paul, George, Ringo" | split: ", " %}
{{ beatles | join: " and " }}
```
-33
View File
@@ -1,33 +0,0 @@
---
title: last
---
Returns the last item of an array.
```liquid
{% raw %}
{% assign my_array = "apples, oranges, peaches, plums" | split: ", " %}
{{ my_array.last }}
{% endraw %}
```
```text
{% assign my_array = "apples, oranges, peaches, plums" | split: ", " %}
{{ my_array.last }}
```
```liquid
{% raw %}
{% assign my_array = "zebra, octopus, giraffe, tiger" | split: ", " %}
{{ my_array.last }}
{% endraw %}
```
```text
{% assign my_array = "zebra, octopus, giraffe, tiger" | split: ", " %}
{{ my_array.last }}
```
-15
View File
@@ -1,15 +0,0 @@
---
title: lstrip
---
Removes all whitespaces (tabs, spaces, and newlines) from the beginning of a string. The filter does not affect spaces between words.
```liquid
{% raw %}
{{ " So much room for activities! " | lstrip }}
{% endraw %}
```
```text
{{ " So much room for activities! " | lstrip }}
```
-25
View File
@@ -1,25 +0,0 @@
---
title: map
---
Creates an array of values by extracting the values of a named property from another object.
In this example, assume the object `site.pages` contains all the metadata for a website. Using `assign` with the `map` filter creates a variable that contains only the values of the `category` properties of everything in the `site.pages` object.
```liquid
{% raw %}
{% assign all_categories = site.pages | map: "category" %}
{% for item in all_categories %}
{{ item }}
{% endfor %}
{% endraw %}
```
```text
business
celebrities
lifestyle
sports
technology
```
-35
View File
@@ -1,35 +0,0 @@
---
title: minus
---
Subtracts a number from another number.
```liquid
{% raw %}
{{ 4 | minus: 2 }}
{% endraw %}
```
```text
{{ 4 | minus: 2 }}
```
```liquid
{% raw %}
{{ 16 | minus: 4 }}
{% endraw %}
```
```text
{{ 16 | minus: 4 }}
```
```liquid
{% raw %}
{{ 183.357 | minus: 12 }}
{% endraw %}
```
```text
{{ 183.357 | minus: 12 }}
```
-35
View File
@@ -1,35 +0,0 @@
---
title: modulo
---
Returns the remainder of a division operation.
```liquid
{% raw %}
{{ 3 | modulo: 2 }}
{% endraw %}
```
```text
{{ 3 | modulo: 2 }}
```
```liquid
{% raw %}
{{ 24 | modulo: 7 }}
{% endraw %}
```
```text
{{ 24 | modulo: 7 }}
```
```liquid
{% raw %}
{{ 183.357 | modulo: 12 }}
{% endraw %}
```
```text
{{ 183.357 | modulo: 12 }}
```
-25
View File
@@ -1,25 +0,0 @@
---
title: newline_to_br
---
Replaces every newline (`\n`) with an HTML line break (`<br>`).
```liquid
{% raw %}
{% capture string_with_newlines %}
Hello
there
{% endcapture %}
{{ string_with_newlines | newline_to_br }}
{% endraw %}
```
```html
{% capture string_with_newlines %}
Hello
there
{% endcapture %}
{{ string_with_newlines | newline_to_br }}
```
-35
View File
@@ -1,35 +0,0 @@
---
title: plus
---
Adds a number to another number.
```liquid
{% raw %}
{{ 4 | plus: 2 }}
{% endraw %}
```
```text
{{ 4 | plus: 2 }}
```
```liquid
{% raw %}
{{ 16 | plus: 4 }}
{% endraw %}
```
```text
{{ 16 | plus: 4 }}
```
```liquid
{% raw %}
{{ 183.357 | plus: 12 }}
{% endraw %}
```
```text
{{ 183.357 | plus: 12 }}
```
-31
View File
@@ -1,31 +0,0 @@
---
title: prepend
---
Adds the specified string to the beginning of another string.
```liquid
{% raw %}
{{ "apples, oranges, and bananas" | prepend: "Some fruit: " }}
{% endraw %}
```
```text
{{ "apples, oranges, and bananas" | prepend: "Some fruit: " }}
```
You can also `prepend` variables:
```liquid
{% raw %}
{% assign url = "liquidmarkup.com" %}
{{ "/index.html" | prepend: url }}
{% endraw %}
```
```text
{% assign url = "liquidmarkup.com" %}
{{ "/index.html" | prepend: url }}
```
-15
View File
@@ -1,15 +0,0 @@
---
title: remove
---
Removes every occurrence of the specified substring from a string.
```liquid
{% raw %}
{{ "I strained to see the train through the rain" | remove: "rain" }}
{% endraw %}
```
```text
{{ "I strained to see the train through the rain" | remove: "rain" }}
```
-15
View File
@@ -1,15 +0,0 @@
---
title: remove_first
---
Removes only the first occurrence of the specified substring from a string.
```liquid
{% raw %}
{{ "I strained to see the train through the rain" | remove_first: "rain" }}
{% endraw %}
```
```text
{{ "I strained to see the train through the rain" | remove_first: "rain" }}
```
-15
View File
@@ -1,15 +0,0 @@
---
title: replace
---
Replaces every occurrence of an argument in a string with the second argument.
```liquid
{% raw %}
{{ "Take my protein pills and put my helmet on" | replace: "my", "your" }}
{% endraw %}
```
```text
{{ "Take my protein pills and put my helmet on" | replace: "my", "your" }}
```
-17
View File
@@ -1,17 +0,0 @@
---
title: replace_first
---
Replaces only the first occurrence of the first argument in a string with the second argument.
```liquid
{% raw %}
{% assign my_string = "Take my protein pills and put my helmet on" %}
{{ my_string | replace_first: "my", "your" }}
{% endraw %}
```
```text
{% assign my_string = "Take my protein pills and put my helmet on" %}
{{ my_string | replace_first: "my", "your" }}
```
-31
View File
@@ -1,31 +0,0 @@
---
title: reverse
---
Reverses the order of the items in an array. `reverse` cannot reverse a string.
```liquid
{% raw %}
{% assign my_array = "apples, oranges, peaches, plums" | split: ", " %}
{{ my_array | reverse | join: ", " }}
{% endraw %}
```
```text
{% assign my_array = "apples, oranges, peaches, plums" | split: ", " %}
{{ my_array | reverse | join: ", " }}
```
`reverse` cannot be used directly on a string, but you can split a string into an array, reverse the array, and rejoin it by chaining together filters:
```liquid
{% raw %}
{{ "Ground control to Major Tom." | split: "" | reverse | join: "" }}
{% endraw %}
```
```text
{{ "Ground control to Major Tom." | split: "" | reverse | join: "" }}
```
-35
View File
@@ -1,35 +0,0 @@
---
title: round
---
Rounds an input number to the nearest integer or, if a number is specified as an argument, to that number of decimal places.
```liquid
{% raw %}
{{ 1.2 | round }}
{% endraw %}
```
```text
{{ 1.2 | round }}
```
```liquid
{% raw %}
{{ 2.7 | round }}
{% endraw %}
```
```text
{{ 2.7 | round }}
```
```liquid
{% raw %}
{{ 183.357 | round: 2 }}
{% endraw %}
```
```text
{{ 183.357 | round: 2 }}
```
-15
View File
@@ -1,15 +0,0 @@
---
title: rstrip
---
Removes all whitespace (tabs, spaces, and newlines) from the right side of a string.
```liquid
{% raw %}
{{ " So much room for activities! " | rstrip }}
{% endraw %}
```
```text
{{ " So much room for activities! " | rstrip }}
```
-39
View File
@@ -1,39 +0,0 @@
---
title: size
---
Returns the number of characters in a string or the number of items in an array. `size` can also be used with dot notation (for example, `{% raw %}{{ my_string.size }}{% endraw %}`). This allows you to use `size` inside tags such as conditionals.
```liquid
{% raw %}
{{ "Ground control to Major Tom." | size }}
{% endraw %}
```
```text
{{ "Ground control to Major Tom." | size }}
```
```liquid
{% raw %}
{% assign my_array = "apples, oranges, peaches, plums" | split: ", " %}
{{ my_array | size }}
{% endraw %}
```
```text
{% assign my_array = "apples, oranges, peaches, plums" | split: ", " %}
{{ my_array | size }}
```
Using dot notation:
```liquid
{% raw %}
{% if site.pages.size > 10 %}
This is a big website!
{% endif %}
{% endraw %}
```
-49
View File
@@ -1,49 +0,0 @@
---
title: slice
---
Returns a substring of 1 character beginning at the index specified by the argument passed in. An optional second argument specifies the length of the substring to be returned.
String indices are numbered starting from 0.
```liquid
{% raw %}
{{ "Liquid" | slice: 0 }}
{% endraw %}
```
```text
{{ "Liquid" | slice: 0 }}
```
```liquid
{% raw %}
{{ "Liquid" | slice: 2 }}
{% endraw %}
```
```text
{{ "Liquid" | slice: 2 }}
```
```liquid
{% raw %}
{{ "Liquid" | slice: 2, 5 }}
{% endraw %}
```
```text
{{ "Liquid" | slice: 2, 5 }}
```
If the first parameter is a negative number, the indices are counted from the end of the string:
```liquid
{% raw %}
{{ "Liquid" | slice: -3, 2 }}
{% endraw %}
```
```text
{{ "Liquid" | slice: -3, 2 }}
```
-19
View File
@@ -1,19 +0,0 @@
---
title: sort
---
Sorts items in an array by a property of an item in the array. The order of the sorted array is case-sensitive.
```liquid
{% raw %}
{% assign my_array = "zebra, octopus, giraffe, Sally Snake" | split: ", " %}
{{ my_array | sort | join: ", " }}
{% endraw %}
```
```text
{% assign my_array = "zebra, octopus, giraffe, Sally Snake" | split: ", " %}
{{ my_array | sort | join: ", " }}
```
-23
View File
@@ -1,23 +0,0 @@
---
title: split
---
Divides an input string into an array using the argument as a separator. `split` is commonly used to convert comma-separated items from a string to an array.
```liquid
{% raw %}
{% assign beatles = "John, Paul, George, Ringo" | split: ", " %}
{% for member in beatles %}
{{ member }}
{% endfor %}
{% endraw %}
```
```text
{% assign beatles = "John, Paul, George, Ringo" | split: ", " %}
{% for member in beatles %}
{{ member }}
{% endfor %}
```
-15
View File
@@ -1,15 +0,0 @@
---
title: strip
---
Removes all whitespace (tabs, spaces, and newlines) from both the left and right side of a string. It does not affect spaces between words.
```liquid
{% raw %}
{{ " So much room for activities! " | strip }}
{% endraw %}
```
```text
{{ " So much room for activities! " | strip }}
```
-15
View File
@@ -1,15 +0,0 @@
---
title: strip_html
---
Removes any HTML tags from a string.
```liquid
{% raw %}
{{ "Have <em>you</em> read <strong>Ulysses</strong>?" | strip_html }}
{% endraw %}
```
```text
{{ "Have <em>you</em> read <strong>Ulysses</strong>?" | strip_html }}
```
-26
View File
@@ -1,26 +0,0 @@
---
title: strip_newlines
---
Removes any newline characters (line breaks) from a string.
```liquid
{% raw %}
{% capture string_with_newlines %}
Hello
there
{% endcapture %}
{{ string_with_newlines | strip_newlines }}
{% endraw %}
```
```html
{% capture string_with_newlines %}
Hello
there
{% endcapture %}
{{ string_with_newlines | strip_newlines }}
```
-35
View File
@@ -1,35 +0,0 @@
---
title: times
---
Multiplies a number by another number.
```liquid
{% raw %}
{{ 3 | times: 2 }}
{% endraw %}
```
```text
{{ 3 | times: 2 }}
```
```liquid
{% raw %}
{{ 24 | times: 7 }}
{% endraw %}
```
```text
{{ 24 | times: 7 }}
```
```liquid
{% raw %}
{{ 183.357 | times: 12 }}
{% endraw %}
```
```text
{{ 183.357 | times: 12 }}
```
-15
View File
@@ -1,15 +0,0 @@
---
title: truncate
---
`truncate` shortens a string down to the number of characters passed as a parameter. If the number of characters specified is less than the length of the string, an ellipsis (...) is appended to the string and is included in the character count.
```liquid
{% raw %}
{{ "Ground control to Major Tom." | truncate: 20 }}
{% endraw %}
```
```text
{{ "Ground control to Major Tom." | truncate: 20 }}
```
-15
View File
@@ -1,15 +0,0 @@
---
title: truncatewords
---
Shortens a string down to the number of words passed as the argument. If the specified number of words is less than the number of words in the string, an ellipsis (...) is appended to the string.
```liquid
{% raw %}
{{ "Ground control to Major Tom." | truncatewords: 3 }}
{% endraw %}
```
```text
{{ "Ground control to Major Tom." | truncatewords: 3 }}
```
-19
View File
@@ -1,19 +0,0 @@
---
title: uniq
---
Removes any duplicate elements in an array.
```liquid
{% raw %}
{% assign my_array = "ants, bugs, bees, bugs, ants" | split: ", " %}
{{ my_array | uniq | join: ", " }}
{% endraw %}
```
```text
{% assign my_array = "ants, bugs, bees, bugs, ants" | split: ", " %}
{{ my_array | uniq | join: ", " }}
```
-25
View File
@@ -1,25 +0,0 @@
---
title: upcase
---
Makes each character in a string uppercase. It has no effect on strings which are already all uppercase.
```liquid
{% raw %}
{{ "Parker Moore" | upcase }}
{% endraw %}
```
```text
{{ "Parker Moore" | upcase }}
```
```liquid
{% raw %}
{{ "APPLE" | upcase }}
{% endraw %}
```
```text
{{ "APPLE" | upcase }}
```
-25
View File
@@ -1,25 +0,0 @@
---
title: url_encode
---
Converts any URL-unsafe characters in a string into percent-encoded characters.
```liquid
{% raw %}
{{ "john@liquid.com" | url_encode }}
{% endraw %}
```
```text
{{ "john@liquid.com" | url_encode }}
```
```liquid
{% raw %}
{{ "Tetsuro Takara" | url_encode }}
{% endraw %}
```
```text
{{ "Tetsuro Takara" | url_encode }}
```
Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

-16
View File
@@ -1,16 +0,0 @@
---
layout: default
---
{% include home-banner.html %}
## What is Liquid?
Liquid is an open-source template language created by [Shopify](https://www.shopify.com) and written in Ruby. It is the backbone of Shopify themes and is used to load dynamic content on storefronts.
Liquid has been in production use since June 2006 and is now used by many other hosted web applications.
## Who uses Liquid?
{% include home-users-grid.html %}
+76
View File
@@ -0,0 +1,76 @@
# Copyright (c) 2005 Tobias Luetke
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
# "Software"), to deal in the Software without restriction, including
# without limitation the rights to use, copy, modify, merge, publish,
# distribute, sublicense, and/or sell copies of the Software, and to
# permit persons to whom the Software is furnished to do so, subject to
# the following conditions:
#
# The above copyright notice and this permission notice shall be
# included in all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
module Liquid
FilterSeparator = /\|/
ArgumentSeparator = ','.freeze
FilterArgumentSeparator = ':'.freeze
VariableAttributeSeparator = '.'.freeze
TagStart = /\{\%/
TagEnd = /\%\}/
VariableSignature = /\(?[\w\-\.\[\]]\)?/
VariableSegment = /[\w\-]/
VariableStart = /\{\{/
VariableEnd = /\}\}/
VariableIncompleteEnd = /\}\}?/
QuotedString = /"[^"]*"|'[^']*'/
QuotedFragment = /#{QuotedString}|(?:[^\s,\|'"]|#{QuotedString})+/o
TagAttributes = /(\w+)\s*\:\s*(#{QuotedFragment})/o
AnyStartingTag = /\{\{|\{\%/
PartialTemplateParser = /#{TagStart}.*?#{TagEnd}|#{VariableStart}.*?#{VariableIncompleteEnd}/om
TemplateParser = /(#{PartialTemplateParser}|#{AnyStartingTag})/om
VariableParser = /\[[^\]]+\]|#{VariableSegment}+\??/o
singleton_class.send(:attr_accessor, :cache_classes)
self.cache_classes = true
end
require "liquid/version"
require 'liquid/lexer'
require 'liquid/parser'
require 'liquid/i18n'
require 'liquid/drop'
require 'liquid/extensions'
require 'liquid/errors'
require 'liquid/interrupts'
require 'liquid/strainer'
require 'liquid/expression'
require 'liquid/context'
require 'liquid/parser_switching'
require 'liquid/tag'
require 'liquid/block'
require 'liquid/block_body'
require 'liquid/document'
require 'liquid/variable'
require 'liquid/variable_lookup'
require 'liquid/range_lookup'
require 'liquid/file_system'
require 'liquid/resource_limits'
require 'liquid/template'
require 'liquid/standardfilters'
require 'liquid/condition'
require 'liquid/module_ex'
require 'liquid/utils'
require 'liquid/token'
# Load all the tags of the standard library
#
Dir[File.dirname(__FILE__) + '/liquid/tags/*.rb'].each { |f| require f }
+79
View File
@@ -0,0 +1,79 @@
module Liquid
class Block < Tag
def initialize(tag_name, markup, options)
super
@blank = true
end
def parse(tokens)
@body = BlockBody.new
while more = parse_body(@body, tokens)
end
end
def render(context)
@body.render(context)
end
def blank?
@blank
end
def nodelist
@body.nodelist
end
# warnings of this block and all sub-tags
def warnings
all_warnings = []
all_warnings.concat(@warnings) if @warnings
(nodelist || []).each do |node|
all_warnings.concat(node.warnings || []) if node.respond_to?(:warnings)
end
all_warnings
end
def unknown_tag(tag, params, tokens)
case tag
when 'else'.freeze
raise SyntaxError.new(options[:locale].t("errors.syntax.unexpected_else".freeze,
:block_name => block_name))
when 'end'.freeze
raise SyntaxError.new(options[:locale].t("errors.syntax.invalid_delimiter".freeze,
:block_name => block_name,
:block_delimiter => block_delimiter))
else
raise SyntaxError.new(options[:locale].t("errors.syntax.unknown_tag".freeze, :tag => tag))
end
end
def block_name
@tag_name
end
def block_delimiter
@block_delimiter ||= "end#{block_name}"
end
protected
def parse_body(body, tokens)
body.parse(tokens, options) do |end_tag_name, end_tag_params|
@blank &&= body.blank?
return false if end_tag_name == block_delimiter
unless end_tag_name
raise SyntaxError.new(@options[:locale].t("errors.syntax.tag_never_closed".freeze, :block_name => block_name))
end
# this tag is not registered with the system
# pass it to the current block for special handling or error reporting
unknown_tag(end_tag_name, end_tag_params, tokens)
end
true
end
end
end
+132
View File
@@ -0,0 +1,132 @@
module Liquid
class BlockBody
FullToken = /\A#{TagStart}\s*(\w+)\s*(.*)?#{TagEnd}\z/om
ContentOfVariable = /\A#{VariableStart}(.*)#{VariableEnd}\z/om
TAGSTART = "{%".freeze
VARSTART = "{{".freeze
attr_reader :nodelist
def initialize
@nodelist = []
@blank = true
end
def parse(tokens, options)
while token = tokens.shift
begin
unless token.empty?
case
when token.start_with?(TAGSTART)
if token =~ FullToken
tag_name = $1
markup = $2
# fetch the tag from registered blocks
if tag = Template.tags[tag_name]
markup = token.child(markup) if token.is_a?(Token)
new_tag = tag.parse(tag_name, markup, tokens, options)
new_tag.line_number = token.line_number if token.is_a?(Token)
@blank &&= new_tag.blank?
@nodelist << new_tag
else
# end parsing if we reach an unknown tag and let the caller decide
# determine how to proceed
return yield tag_name, markup
end
else
raise_missing_tag_terminator(token, options)
end
when token.start_with?(VARSTART)
new_var = create_variable(token, options)
new_var.line_number = token.line_number if token.is_a?(Token)
@nodelist << new_var
@blank = false
else
@nodelist << token
@blank &&= !!(token =~ /\A\s*\z/)
end
end
rescue SyntaxError => e
e.set_line_number_from_token(token)
raise
end
end
yield nil, nil
end
def blank?
@blank
end
def warnings
all_warnings = []
nodelist.each do |node|
all_warnings.concat(node.warnings || []) if node.respond_to?(:warnings)
end
all_warnings
end
def render(context)
@output ||= []
@output.clear
context.resource_limits.render_score += @nodelist.length
@nodelist.each do |token|
# Break out if we have any unhanded interrupts.
break if context.has_interrupt?
begin
# If we get an Interrupt that means the block must stop processing. An
# Interrupt is any command that stops block execution such as {% break %}
# or {% continue %}
if token.is_a?(Continue) or token.is_a?(Break)
context.push_interrupt(token.interrupt)
break
end
token_output = render_token(token, context)
unless token.is_a?(Block) && token.blank?
@output << token_output
end
rescue MemoryError => e
raise e
rescue ::StandardError => e
@output << context.handle_error(e, token)
end
end
@output.join
end
private
def render_token(token, context)
token_output = (token.respond_to?(:render) ? token.render(context) : token)
token_str = token_output.is_a?(Array) ? token_output.join : token_output.to_s
context.resource_limits.render_length += token_str.length
if context.resource_limits.reached?
raise MemoryError.new("Memory limits exceeded".freeze)
end
token_str
end
def create_variable(token, options)
token.scan(ContentOfVariable) do |content|
markup = token.is_a?(Token) ? token.child(content.first) : content.first
return Variable.new(markup, options)
end
raise_missing_variable_terminator(token, options)
end
def raise_missing_tag_terminator(token, options)
raise SyntaxError.new(options[:locale].t("errors.syntax.tag_termination".freeze, :token => token, :tag_end => TagEnd.inspect))
end
def raise_missing_variable_terminator(token, options)
raise SyntaxError.new(options[:locale].t("errors.syntax.variable_termination".freeze, :token => token, :tag_end => VariableEnd.inspect))
end
end
end
+131
View File
@@ -0,0 +1,131 @@
module Liquid
# Container for liquid nodes which conveniently wraps decision making logic
#
# Example:
#
# c = Condition.new(1, '==', 1)
# c.evaluate #=> true
#
class Condition #:nodoc:
@@operators = {
'=='.freeze => lambda { |cond, left, right| cond.send(:equal_variables, left, right) },
'!='.freeze => lambda { |cond, left, right| !cond.send(:equal_variables, left, right) },
'<>'.freeze => lambda { |cond, left, right| !cond.send(:equal_variables, left, right) },
'<'.freeze => :<,
'>'.freeze => :>,
'>='.freeze => :>=,
'<='.freeze => :<=,
'contains'.freeze => lambda { |cond, left, right|
left && right && left.respond_to?(:include?) ? left.include?(right) : false
}
}
def self.operators
@@operators
end
attr_reader :attachment
attr_accessor :left, :operator, :right
def initialize(left = nil, operator = nil, right = nil)
@left = left
@operator = operator
@right = right
@child_relation = nil
@child_condition = nil
end
def evaluate(context = Context.new)
result = interpret_condition(left, right, operator, context)
case @child_relation
when :or
result || @child_condition.evaluate(context)
when :and
result && @child_condition.evaluate(context)
else
result
end
end
def or(condition)
@child_relation = :or
@child_condition = condition
end
def and(condition)
@child_relation = :and
@child_condition = condition
end
def attach(attachment)
@attachment = attachment
end
def else?
false
end
def inspect
"#<Condition #{[@left, @operator, @right].compact.join(' '.freeze)}>"
end
private
def equal_variables(left, right)
if left.is_a?(Symbol)
if right.respond_to?(left)
return right.send(left.to_s)
else
return nil
end
end
if right.is_a?(Symbol)
if left.respond_to?(right)
return left.send(right.to_s)
else
return nil
end
end
left == right
end
def interpret_condition(left, right, op, context)
# If the operator is empty this means that the decision statement is just
# a single variable. We can just poll this variable from the context and
# return this as the result.
return context.evaluate(left) if op == nil
left = context.evaluate(left)
right = context.evaluate(right)
operation = self.class.operators[op] || raise(Liquid::ArgumentError.new("Unknown operator #{op}"))
if operation.respond_to?(:call)
operation.call(self, left, right)
elsif left.respond_to?(operation) and right.respond_to?(operation)
begin
left.send(operation, right)
rescue ::ArgumentError => e
raise Liquid::ArgumentError.new(e.message)
end
else
nil
end
end
end
class ElseCondition < Condition
def else?
true
end
def evaluate(context)
true
end
end
end
+206
View File
@@ -0,0 +1,206 @@
module Liquid
# Context keeps the variable stack and resolves variables, as well as keywords
#
# context['variable'] = 'testing'
# context['variable'] #=> 'testing'
# context['true'] #=> true
# context['10.2232'] #=> 10.2232
#
# context.stack do
# context['bob'] = 'bobsen'
# end
#
# context['bob'] #=> nil class Context
class Context
attr_reader :scopes, :registers, :environments, :resource_limits
attr_accessor :exception_handler
def initialize(environments = {}, outer_scope = {}, registers = {}, rethrow_errors = false, resource_limits = nil)
@environments = [environments].flatten
@scopes = [(outer_scope || {})]
@registers = registers
@resource_limits = resource_limits || ResourceLimits.new(Template.default_resource_limits)
squash_instance_assigns_with_environments
@this_stack_used = false
if rethrow_errors
self.exception_handler = ->(e) { true }
end
@interrupts = nil
@filters = []
end
def errors
@errors ||= []
end
def strainer
@strainer ||= Strainer.create(self, @filters)
end
# Adds filters to this context.
#
# Note that this does not register the filters with the main Template object. see <tt>Template.register_filter</tt>
# for that
def add_filters(filters)
filters = [filters].flatten.compact
@filters += filters
@strainer = nil
end
# are there any not handled interrupts?
def has_interrupt?
@interrupts && !@interrupts.empty?
end
# push an interrupt to the stack. this interrupt is considered not handled.
def push_interrupt(e)
(@interrupts ||= []).push(e)
end
# pop an interrupt from the stack
def pop_interrupt
@interrupts.pop if @interrupts
end
def handle_error(e, token=nil)
if e.is_a?(Liquid::Error)
e.set_line_number_from_token(token)
end
errors.push(e)
raise if exception_handler && exception_handler.call(e)
Liquid::Error.render(e)
end
def invoke(method, *args)
strainer.invoke(method, *args).to_liquid
end
# Push new local scope on the stack. use <tt>Context#stack</tt> instead
def push(new_scope={})
@scopes.unshift(new_scope)
raise StackLevelError, "Nesting too deep".freeze if @scopes.length > 100
end
# Merge a hash of variables in the current local scope
def merge(new_scopes)
@scopes[0].merge!(new_scopes)
end
# Pop from the stack. use <tt>Context#stack</tt> instead
def pop
raise ContextError if @scopes.size == 1
@scopes.shift
end
# Pushes a new local scope on the stack, pops it at the end of the block
#
# Example:
# context.stack do
# context['var'] = 'hi'
# end
#
# context['var] #=> nil
def stack(new_scope=nil)
old_stack_used = @this_stack_used
if new_scope
push(new_scope)
@this_stack_used = true
else
@this_stack_used = false
end
yield
ensure
pop if @this_stack_used
@this_stack_used = old_stack_used
end
def clear_instance_assigns
@scopes[0] = {}
end
# Only allow String, Numeric, Hash, Array, Proc, Boolean or <tt>Liquid::Drop</tt>
def []=(key, value)
unless @this_stack_used
@this_stack_used = true
push({})
end
@scopes[0][key] = value
end
# Look up variable, either resolve directly after considering the name. We can directly handle
# Strings, digits, floats and booleans (true,false).
# If no match is made we lookup the variable in the current scope and
# later move up to the parent blocks to see if we can resolve the variable somewhere up the tree.
# Some special keywords return symbols. Those symbols are to be called on the rhs object in expressions
#
# Example:
# products == empty #=> products.empty?
def [](expression)
evaluate(Expression.parse(expression))
end
def has_key?(key)
self[key] != nil
end
def evaluate(object)
object.respond_to?(:evaluate) ? object.evaluate(self) : object
end
# Fetches an object starting at the local scope and then moving up the hierachy
def find_variable(key)
# This was changed from find() to find_index() because this is a very hot
# path and find_index() is optimized in MRI to reduce object allocation
index = @scopes.find_index { |s| s.has_key?(key) }
scope = @scopes[index] if index
variable = nil
if scope.nil?
@environments.each do |e|
variable = lookup_and_evaluate(e, key)
unless variable.nil?
scope = e
break
end
end
end
scope ||= @environments.last || @scopes.last
variable ||= lookup_and_evaluate(scope, key)
variable = variable.to_liquid
variable.context = self if variable.respond_to?(:context=)
return variable
end
def lookup_and_evaluate(obj, key)
if (value = obj[key]).is_a?(Proc) && obj.respond_to?(:[]=)
obj[key] = (value.arity == 0) ? value.call : value.call(self)
else
value
end
end
private
def squash_instance_assigns_with_environments
@scopes.last.each_key do |k|
@environments.each do |env|
if env.has_key?(k)
scopes.last[k] = lookup_and_evaluate(env, k)
break
end
end
end
end # squash_instance_assigns_with_environments
end # Context
end # Liquid
+24
View File
@@ -0,0 +1,24 @@
module Liquid
class Document < BlockBody
def self.parse(tokens, options)
doc = new
doc.parse(tokens, options)
doc
end
def parse(tokens, options)
super do |end_tag_name, end_tag_params|
unknown_tag(end_tag_name, options) if end_tag_name
end
end
def unknown_tag(tag, options)
case tag
when 'else'.freeze, 'end'.freeze
raise SyntaxError.new(options[:locale].t("errors.syntax.unexpected_outer_tag".freeze, :tag => tag))
else
raise SyntaxError.new(options[:locale].t("errors.syntax.unknown_tag".freeze, :tag => tag))
end
end
end
end
+81
View File
@@ -0,0 +1,81 @@
require 'set'
module Liquid
# A drop in liquid is a class which allows you to export DOM like things to liquid.
# Methods of drops are callable.
# The main use for liquid drops is to implement lazy loaded objects.
# If you would like to make data available to the web designers which you don't want loaded unless needed then
# a drop is a great way to do that.
#
# Example:
#
# class ProductDrop < Liquid::Drop
# def top_sales
# Shop.current.products.find(:all, :order => 'sales', :limit => 10 )
# end
# end
#
# tmpl = Liquid::Template.parse( ' {% for product in product.top_sales %} {{ product.name }} {%endfor%} ' )
# tmpl.render('product' => ProductDrop.new ) # will invoke top_sales query.
#
# Your drop can either implement the methods sans any parameters or implement the before_method(name) method which is a
# catch all.
class Drop
attr_writer :context
EMPTY_STRING = ''.freeze
# Catch all for the method
def before_method(method)
nil
end
# called by liquid to invoke a drop
def invoke_drop(method_or_key)
if method_or_key && method_or_key != EMPTY_STRING && self.class.invokable?(method_or_key)
send(method_or_key)
else
before_method(method_or_key)
end
end
def has_key?(name)
true
end
def inspect
self.class.to_s
end
def to_liquid
self
end
def to_s
self.class.name
end
alias :[] :invoke_drop
private
# Check for method existence without invoking respond_to?, which creates symbols
def self.invokable?(method_name)
self.invokable_methods.include?(method_name.to_s)
end
def self.invokable_methods
unless @invokable_methods
blacklist = Liquid::Drop.public_instance_methods + [:each]
if include?(Enumerable)
blacklist += Enumerable.public_instance_methods
blacklist -= [:sort, :count, :first, :min, :max, :include?]
end
whitelist = [:to_liquid] + (public_instance_methods - blacklist)
@invokable_methods = Set.new(whitelist.map(&:to_s))
end
@invokable_methods
end
end
end
+60
View File
@@ -0,0 +1,60 @@
module Liquid
class Error < ::StandardError
attr_accessor :line_number
attr_accessor :markup_context
def to_s(with_prefix=true)
str = ""
str << message_prefix if with_prefix
str << super()
if markup_context
str << " "
str << markup_context
end
str
end
def set_line_number_from_token(token)
return unless token.respond_to?(:line_number)
return if self.line_number
self.line_number = token.line_number
end
def self.render(e)
if e.is_a?(Liquid::Error)
e.to_s
else
"Liquid error: #{e.to_s}"
end
end
private
def message_prefix
str = ""
if is_a?(SyntaxError)
str << "Liquid syntax error"
else
str << "Liquid error"
end
if line_number
str << " (line #{line_number})"
end
str << ": "
str
end
end
class ArgumentError < Error; end
class ContextError < Error; end
class FileSystemError < Error; end
class StandardError < Error; end
class SyntaxError < Error; end
class StackLevelError < Error; end
class TaintedError < Error; end
class MemoryError < Error; end
end
+33
View File
@@ -0,0 +1,33 @@
module Liquid
class Expression
LITERALS = {
nil => nil, 'nil'.freeze => nil, 'null'.freeze => nil, ''.freeze => nil,
'true'.freeze => true,
'false'.freeze => false,
'blank'.freeze => :blank?,
'empty'.freeze => :empty?
}
def self.parse(markup)
if LITERALS.key?(markup)
LITERALS[markup]
else
case markup
when /\A'(.*)'\z/m # Single quoted strings
$1
when /\A"(.*)"\z/m # Double quoted strings
$1
when /\A(-?\d+)\z/ # Integer and floats
$1.to_i
when /\A\((\S+)\.\.(\S+)\)\z/ # Ranges
RangeLookup.parse($1, $2)
when /\A(-?\d[\d\.]+)\z/ # Floats
$1.to_f
else
VariableLookup.parse(markup)
end
end
end
end
end
+62
View File
@@ -0,0 +1,62 @@
require 'time'
require 'date'
class String # :nodoc:
def to_liquid
self
end
end
class Array # :nodoc:
def to_liquid
self
end
end
class Hash # :nodoc:
def to_liquid
self
end
end
class Numeric # :nodoc:
def to_liquid
self
end
end
class Time # :nodoc:
def to_liquid
self
end
end
class DateTime < Date # :nodoc:
def to_liquid
self
end
end
class Date # :nodoc:
def to_liquid
self
end
end
class TrueClass
def to_liquid # :nodoc:
self
end
end
class FalseClass
def to_liquid # :nodoc:
self
end
end
class NilClass
def to_liquid # :nodoc:
self
end
end
+73
View File
@@ -0,0 +1,73 @@
module Liquid
# A Liquid file system is a way to let your templates retrieve other templates for use with the include tag.
#
# You can implement subclasses that retrieve templates from the database, from the file system using a different
# path structure, you can provide them as hard-coded inline strings, or any manner that you see fit.
#
# You can add additional instance variables, arguments, or methods as needed.
#
# Example:
#
# Liquid::Template.file_system = Liquid::LocalFileSystem.new(template_path)
# liquid = Liquid::Template.parse(template)
#
# This will parse the template with a LocalFileSystem implementation rooted at 'template_path'.
class BlankFileSystem
# Called by Liquid to retrieve a template file
def read_template_file(template_path)
raise FileSystemError, "This liquid context does not allow includes."
end
end
# This implements an abstract file system which retrieves template files named in a manner similar to Rails partials,
# ie. with the template name prefixed with an underscore. The extension ".liquid" is also added.
#
# For security reasons, template paths are only allowed to contain letters, numbers, and underscore.
#
# Example:
#
# file_system = Liquid::LocalFileSystem.new("/some/path")
#
# file_system.full_path("mypartial") # => "/some/path/_mypartial.liquid"
# file_system.full_path("dir/mypartial") # => "/some/path/dir/_mypartial.liquid"
#
# Optionally in the second argument you can specify a custom pattern for template filenames.
# The Kernel::sprintf format specification is used.
# Default pattern is "_%s.liquid".
#
# Example:
#
# file_system = Liquid::LocalFileSystem.new("/some/path", "%s.html")
#
# file_system.full_path("index") # => "/some/path/index.html"
#
class LocalFileSystem
attr_accessor :root
def initialize(root, pattern = "_%s.liquid".freeze)
@root = root
@pattern = pattern
end
def read_template_file(template_path)
full_path = full_path(template_path)
raise FileSystemError, "No such template '#{template_path}'" unless File.exists?(full_path)
File.read(full_path)
end
def full_path(template_path)
raise FileSystemError, "Illegal template name '#{template_path}'" unless template_path =~ /\A[^.\/][a-zA-Z0-9_\/]+\z/
full_path = if template_path.include?('/'.freeze)
File.join(root, File.dirname(template_path), @pattern % File.basename(template_path))
else
File.join(root, @pattern % template_path)
end
raise FileSystemError, "Illegal template path '#{File.expand_path(full_path)}'" unless File.expand_path(full_path) =~ /\A#{File.expand_path(root)}/
full_path
end
end
end
+39
View File
@@ -0,0 +1,39 @@
require 'yaml'
module Liquid
class I18n
DEFAULT_LOCALE = File.join(File.expand_path(File.dirname(__FILE__)), "locales", "en.yml")
class TranslationError < StandardError
end
attr_reader :path
def initialize(path = DEFAULT_LOCALE)
@path = path
end
def translate(name, vars = {})
interpolate(deep_fetch_translation(name), vars)
end
alias_method :t, :translate
def locale
@locale ||= YAML.load_file(@path)
end
private
def interpolate(name, vars)
name.gsub(/%\{(\w+)\}/) {
# raise TranslationError, "Undefined key #{$1} for interpolation in translation #{name}" unless vars[$1.to_sym]
"#{vars[$1.to_sym]}"
}
end
def deep_fetch_translation(name)
name.split('.'.freeze).reduce(locale) do |level, cur|
level[cur] or raise TranslationError, "Translation for #{name} does not exist in locale #{path}"
end
end
end
end
+17
View File
@@ -0,0 +1,17 @@
module Liquid
# An interrupt is any command that breaks processing of a block (ex: a for loop).
class Interrupt
attr_reader :message
def initialize(message=nil)
@message = message || "interrupt".freeze
end
end
# Interrupt that is thrown whenever a {% break %} is called.
class BreakInterrupt < Interrupt; end
# Interrupt that is thrown whenever a {% continue %} is called.
class ContinueInterrupt < Interrupt; end
end
+53
View File
@@ -0,0 +1,53 @@
require "strscan"
module Liquid
class Lexer
SPECIALS = {
'|'.freeze => :pipe,
'.'.freeze => :dot,
':'.freeze => :colon,
','.freeze => :comma,
'['.freeze => :open_square,
']'.freeze => :close_square,
'('.freeze => :open_round,
')'.freeze => :close_round,
'?'.freeze => :question,
'-'.freeze => :dash
}
IDENTIFIER = /[a-zA-Z_][\w-]*\??/
SINGLE_STRING_LITERAL = /'[^\']*'/
DOUBLE_STRING_LITERAL = /"[^\"]*"/
NUMBER_LITERAL = /-?\d+(\.\d+)?/
DOTDOT = /\.\./
COMPARISON_OPERATOR = /==|!=|<>|<=?|>=?|contains/
def initialize(input)
@ss = StringScanner.new(input.rstrip)
end
def tokenize
@output = []
while !@ss.eos?
@ss.skip(/\s*/)
tok = case
when t = @ss.scan(COMPARISON_OPERATOR) then [:comparison, t]
when t = @ss.scan(SINGLE_STRING_LITERAL) then [:string, t]
when t = @ss.scan(DOUBLE_STRING_LITERAL) then [:string, t]
when t = @ss.scan(NUMBER_LITERAL) then [:number, t]
when t = @ss.scan(IDENTIFIER) then [:id, t]
when t = @ss.scan(DOTDOT) then [:dotdot, t]
else
c = @ss.getch
if s = SPECIALS[c]
[s,c]
else
raise SyntaxError, "Unexpected character #{c}"
end
end
@output << tok
end
@output << [:end_of_string]
end
end
end
+23
View File
@@ -0,0 +1,23 @@
---
errors:
syntax:
assign: "Syntax Error in 'assign' - Valid syntax: assign [var] = [source]"
capture: "Syntax Error in 'capture' - Valid syntax: capture [var]"
case: "Syntax Error in 'case' - Valid syntax: case [condition]"
case_invalid_when: "Syntax Error in tag 'case' - Valid when condition: {% when [condition] [or condition2...] %}"
case_invalid_else: "Syntax Error in tag 'case' - Valid else condition: {% else %} (no parameters) "
cycle: "Syntax Error in 'cycle' - Valid syntax: cycle [name :] var [, var2, var3 ...]"
for: "Syntax Error in 'for loop' - Valid syntax: for [item] in [collection]"
for_invalid_in: "For loops require an 'in' clause"
for_invalid_attribute: "Invalid attribute in for loop. Valid attributes are limit and offset"
if: "Syntax Error in tag 'if' - Valid syntax: if [expression]"
include: "Error in tag 'include' - Valid syntax: include '[template]' (with|for) [object|collection]"
unknown_tag: "Unknown tag '%{tag}'"
invalid_delimiter: "'end' is not a valid delimiter for %{block_name} tags. use %{block_delimiter}"
unexpected_else: "%{block_name} tag does not expect 'else' tag"
unexpected_outer_tag: "Unexpected outer '%{tag}' tag"
tag_termination: "Tag '%{token}' was not properly terminated with regexp: %{tag_end}"
variable_termination: "Variable '%{token}' was not properly terminated with regexp: %{tag_end}"
tag_never_closed: "'%{block_name}' tag was never closed"
meta_syntax_error: "Liquid syntax error: #{e.message}"
table_row: "Syntax Error in 'table_row loop' - Valid syntax: table_row [item] in [collection] cols=3"

Some files were not shown because too many files have changed in this diff Show More