kemko/liquid
1
0
Fork 0
mirror of https://github.com/kemko/liquid.git synced 2026-01-01 15:55:40 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge old Shopify/liquid

Browse Source
This commit is contained in:
Jonathan Rudenberg
2011-06-13 09:14:14 -04:00
parent bc55c4d348 4087a94d88
commit 17922273e1
17 changed files with 651 additions and 595 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/liquid/block.rb
View File

@@ -95,7 +95,7 @@ module Liquid
rescue ::StandardError => e
context.handle_error(e)
end
end
end.join
end
end
end

5
lib/liquid/file_system.rb
View File

@@ -14,7 +14,7 @@ module Liquid
# 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(context, template_name)
def read_template_file(template_path, context)
raise FileSystemError, "This liquid context does not allow includes."
end
end
@@ -38,8 +38,7 @@ module Liquid
@root = root
end
def read_template_file(context, template_name)
template_path = context[template_name]
def read_template_file(template_path, context)
full_path = full_path(template_path)
raise FileSystemError, "No such template '#{template_path}'" unless File.exists?(full_path)

9
lib/liquid/htmltags.rb
View File

@@ -33,7 +33,7 @@ module Liquid
row = 1
col = 0
result = ["<tr class=\"row1\">\n"]
result = "<tr class=\"row1\">\n"
context.stack do
collection.each_with_index do |item, index|
@@ -56,17 +56,18 @@ module Liquid
col += 1
result << ["<td class=\"col#{col}\">"] + render_all(@nodelist, context) + ['</td>']
result << "<td class=\"col#{col}\">" << render_all(@nodelist, context) << '</td>'
if col == cols and not (index == length - 1)
col = 0
row += 1
result << ["</tr>\n<tr class=\"row#{row}\">"]
result << "</tr>\n<tr class=\"row#{row}\">"
end
end
end
result + ["</tr>\n"]
result << "</tr>\n"
result
end
end

2
lib/liquid/tags/capture.rb
View File

@@ -26,7 +26,7 @@ module Liquid
def render(context)
output = super
context.scopes.last[@to] = output.join
context.scopes.last[@to] = output
''
end
end

12
lib/liquid/tags/case.rb
View File

@@ -31,20 +31,16 @@ module Liquid
context.stack do
execute_else_block = true
@blocks.inject([]) do |output, block|
output = ''
@blocks.each do |block|
if block.else?
return render_all(block.attachment, context) if execute_else_block
elsif block.evaluate(context)
execute_else_block = false
output += render_all(block.attachment, context)
output << render_all(block.attachment, context)
end
output
end
output
end
end

2
lib/liquid/tags/for.rb
View File

@@ -85,7 +85,7 @@ module Liquid
segment.reverse! if @reversed
result = []
result = ''
length = segment.length

33
lib/liquid/tags/include.rb
View File

@@ -20,14 +20,12 @@ module Liquid
super
end
def parse(tokens)
def parse(tokens)
end
def render(context)
file_system = context.registers[:file_system] || Liquid::Template.file_system
source = file_system.read_template_file(context, @template_name)
partial = Liquid::Template.parse(source)
def render(context)
source = _read_template_from_file_system(context)
partial = Liquid::Template.parse(source)
variable = context[@variable_name || @template_name[1..-2]]
context.stack do
@@ -36,20 +34,31 @@ module Liquid
end
if variable.is_a?(Array)
variable.collect do |variable|
variable.collect do |variable|
context[@template_name[1..-2]] = variable
partial.render(context)
end
else
context[@template_name[1..-2]] = variable
partial.render(context)
end
end
end
private
def _read_template_from_file_system(context)
file_system = context.registers[:file_system] || Liquid::Template.file_system
# make read_template_file call backwards-compatible.
case file_system.method(:read_template_file).arity
when 1
file_system.read_template_file(context[@template_name])
when 2
file_system.read_template_file(context[@template_name], context)
else
raise ArgumentError, "file_system.read_template_file expects two parameters: (template_name, context)"
end
end
end
Template.register_tag('include', Include)

21
lib/liquid/tags/raw.rb Normal file
View File

@@ -0,0 +1,21 @@
module Liquid
class Raw < Block
def parse(tokens)
@nodelist ||= []
@nodelist.clear
while token = tokens.shift
if token =~ FullToken
if block_delimiter == $1
end_tag
return
end
end
@nodelist << token if not token.empty?
end
end
end
Template.register_tag('raw', Raw)
end

10
lib/liquid/tags/unless.rb
View File

@@ -13,19 +13,19 @@ module Liquid
# First condition is interpreted backwards ( if not )
block = @blocks.first
unless block.evaluate(context)
return render_all(block.attachment, context)
return render_all(block.attachment, context)
end
# After the first condition unless works just like if
@blocks[1..-1].each do |block|
if block.evaluate(context)
return render_all(block.attachment, context)
if block.evaluate(context)
return render_all(block.attachment, context)
end
end
end
''
end
end
end
end

3
lib/liquid/template.rb
View File

@@ -121,7 +121,8 @@ module Liquid
begin
# render the nodelist.
# for performance reasons we get a array back here. join will make a string out of it
@root.render(context).join
result = @root.render(context)
result.respond_to?(:join) ? result.join : result
ensure
@errors = context.errors
end

2
lib/liquid/variable.rb
View File

@@ -37,7 +37,7 @@ module Liquid
return '' if @name.nil?
@filters.inject(context[@name]) do |output, filter|
filterargs = filter[1].to_a.collect do |a|
context[a]
context[a]
end
begin
output = context.invoke(filter[0], output, *filterargs)

8
performance/shopify/paginate.rb
View File

@@ -52,17 +52,17 @@ class Paginate < Liquid::Block
hellip_break = false
if page_count > 2
1.upto(page_count-1) do |page|
1.upto(page_count-1) do |page|
if current_page == page
pagination['parts'] << no_link(page)
pagination['parts'] << no_link(page)
elsif page == 1
pagination['parts'] << link(page, page)
elsif page == page_count -1
pagination['parts'] << link(page, page)
elsif page <= current_page - @attributes['window_size'] or page >= current_page + @attributes['window_size']
next if hellip_break
pagination['parts'] << no_link('&hellip;')
pagination['parts'] << no_link('&hellip;')
hellip_break = true
next
else
@@ -73,7 +73,7 @@ class Paginate < Liquid::Block
end
end
render_all(@nodelist, context)
render_all(@nodelist, context)
end
end

1094
test/extra/breakpoint.rb
View File

File diff suppressed because it is too large Load Diff

2
test/lib/liquid/file_system_test.rb
View File

@@ -5,7 +5,7 @@ class FileSystemTest < Test::Unit::TestCase
def test_default
assert_raise(FileSystemError) do
BlankFileSystem.new.read_template_file({'dummy'=>'smarty'}, "dummy")
BlankFileSystem.new.read_template_file("dummy", {'dummy'=>'smarty'})
end
end

20
test/lib/liquid/include_tag_test.rb
View File

@@ -1,8 +1,7 @@
require 'test_helper'
class TestFileSystem
def read_template_file(context, template_name)
template_path = context[template_name]
def read_template_file(template_path, context)
case template_path
when "product"
"Product: {{ product.title }} "
@@ -35,8 +34,7 @@ class TestFileSystem
end
class OtherFileSystem
def read_template_file(context, template_name)
template_path = context[template_name]
def read_template_file(template_path, context)
'from OtherFileSystem'
end
end
@@ -106,7 +104,7 @@ class IncludeTagTest < Test::Unit::TestCase
def test_recursively_included_template_does_not_produce_endless_loop
infinite_file_system = Class.new do
def read_template_file(context, template_name)
def read_template_file(template_path, context)
"-{% include 'loop' %}"
end
end
@@ -119,6 +117,18 @@ class IncludeTagTest < Test::Unit::TestCase
end
def test_backwards_compatability_support_for_overridden_read_template_file
infinite_file_system = Class.new do
def read_template_file(template_path) # testing only one argument here.
"- hi mom"
end
end
Liquid::Template.file_system = infinite_file_system.new
Template.parse("{% include 'hi_mom' %}").render!
end
def test_dynamically_choosen_template
assert_equal "Test123", Template.parse("{% include template %}").render("template" => 'Test123')

15
test/lib/liquid/tags/raw_test.rb Normal file
View File

@@ -0,0 +1,15 @@
require 'test_helper'
class RawTest < Test::Unit::TestCase
include Liquid
def test_tag_in_raw
assert_template_result '{% comment %} test {% endcomment %}',
'{% raw %}{% comment %} test {% endcomment %}{% endraw %}'
end
def test_output_in_raw
assert_template_result '{{ test }}',
'{% raw %}{{ test }}{% endraw %}'
end
end

6
test/test_helper.rb
View File

@@ -7,7 +7,11 @@ require 'test/unit'
require 'test/unit/assertions'
require 'caller'
require 'breakpoint'
require 'ruby-debug'
begin
require 'ruby-debug'
rescue LoadError
puts "Couldn't load ruby-debug. gem install ruby-debug if you need it."
end
require File.join(File.dirname(__FILE__), '..', 'lib', 'liquid')