RubyGems - liquid - Versions diffs - 1.9.0 → 2.0.0 - Mend

liquid 1.9.0 → 2.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (48) hide show

data/Manifest.txt +0 -31
data/Rakefile +1 -1
data/lib/extras/liquid_view.rb +15 -2
data/lib/liquid.rb +15 -15
data/lib/liquid/block.rb +1 -2
data/lib/liquid/context.rb +89 -99
data/lib/liquid/drop.rb +6 -4
data/lib/liquid/errors.rb +1 -0
data/lib/liquid/standardfilters.rb +56 -11
data/lib/liquid/strainer.rb +1 -1
data/lib/liquid/tags/assign.rb +1 -1
data/lib/liquid/tags/case.rb +2 -2
data/lib/liquid/tags/cycle.rb +3 -4
data/lib/liquid/tags/for.rb +53 -35
data/lib/liquid/tags/if.rb +3 -3
data/lib/liquid/template.rb +8 -7
data/lib/liquid/variable.rb +10 -11
metadata +5 -35
data/example/server/example_servlet.rb +0 -37
data/example/server/liquid_servlet.rb +0 -28
data/example/server/server.rb +0 -12
data/example/server/templates/index.liquid +0 -6
data/example/server/templates/products.liquid +0 -45
data/test/block_test.rb +0 -58
data/test/condition_test.rb +0 -109
data/test/context_test.rb +0 -418
data/test/drop_test.rb +0 -141
data/test/error_handling_test.rb +0 -78
data/test/extra/breakpoint.rb +0 -547
data/test/extra/caller.rb +0 -80
data/test/file_system_test.rb +0 -30
data/test/filter_test.rb +0 -98
data/test/helper.rb +0 -20
data/test/html_tag_test.rb +0 -31
data/test/if_else_test.rb +0 -127
data/test/include_tag_test.rb +0 -114
data/test/module_ex_test.rb +0 -89
data/test/output_test.rb +0 -121
data/test/parsing_quirks_test.rb +0 -29
data/test/regexp_test.rb +0 -40
data/test/security_test.rb +0 -41
data/test/standard_filter_test.rb +0 -126
data/test/standard_tag_test.rb +0 -383
data/test/statements_test.rb +0 -137
data/test/strainer_test.rb +0 -16
data/test/template_test.rb +0 -26
data/test/unless_else_test.rb +0 -27
data/test/variable_test.rb +0 -135

data/example/server/example_servlet.rb DELETED

@@ -1,37 +0,0 @@
-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, '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
-end

data/example/server/liquid_servlet.rb DELETED

@@ -1,28 +0,0 @@
-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, @response = req, res
-    @request.path_info =~ /(\w+)$/
-    @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

data/example/server/server.rb DELETED

@@ -1,12 +0,0 @@
-require 'webrick'
-require 'rexml/document'
-require File.dirname(__FILE__) + '/../../lib/liquid'
-require File.dirname(__FILE__) + '/liquid_servlet'
-require File.dirname(__FILE__) + '/example_servlet'
-# Setup webrick
-server = WEBrick::HTTPServer.new( :Port => ARGV[1] || 3000 )
-server.mount('/', Servlet)
-trap("INT"){ server.shutdown }
-server.start

data/example/server/templates/index.liquid DELETED

@@ -1,6 +0,0 @@
-<p>Hello world!</p>
-<p>It is {{date}}</p>
-<p>Check out the <a href="http://localhost:3000/products">Products</a> screen </p>

data/example/server/templates/products.liquid DELETED

@@ -1,45 +0,0 @@
-<?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>
-	  <h1>There are currently {{products | count}} products in the {{section}} catalog</h1>
-    {% if cool_products %}
-      Cool products :)
-    {% else %}
-      Uncool products :(
-    {% endif %}
-    <ul id="products">
-      {% for product in products %}
-        <li>
-          <h2>{{product.name}}</h2>
-          Only {{product.price | price }}
-          {{product.description | prettyprint | paragraph }}
-          {{ 'it rocks!' | paragraph }}
-        </li>
-      {% endfor %}
-    </ul>
-	</body>
-</html>

data/test/block_test.rb DELETED

@@ -1,58 +0,0 @@
-require File.dirname(__FILE__) + '/helper'
-class VariableTest < Test::Unit::TestCase
-  include Liquid
-  def test_blankspace
-    template = Liquid::Template.parse("  ")
-    assert_equal ["  "], template.root.nodelist
-  end
-  def test_variable_beginning
-    template = Liquid::Template.parse("{{funk}}  ")
-    assert_equal 2, template.root.nodelist.size
-    assert_equal Variable, template.root.nodelist[0].class
-    assert_equal String, template.root.nodelist[1].class
-  end
-  def test_variable_end
-    template = Liquid::Template.parse("  {{funk}}")
-    assert_equal 2, template.root.nodelist.size
-    assert_equal String, template.root.nodelist[0].class
-    assert_equal Variable, template.root.nodelist[1].class
-  end
-  def test_variable_middle
-    template = Liquid::Template.parse("  {{funk}}  ")
-    assert_equal 3, template.root.nodelist.size
-    assert_equal String, template.root.nodelist[0].class
-    assert_equal Variable, template.root.nodelist[1].class
-    assert_equal String, template.root.nodelist[2].class
-  end
-  def test_variable_many_embedded_fragments
-    template = Liquid::Template.parse("  {{funk}} {{so}} {{brother}} ")
-    assert_equal 7, template.root.nodelist.size
-    assert_equal [String, Variable, String, Variable, String, Variable, String], block_types(template.root.nodelist)
-  end
-  def test_with_block
-    template = Liquid::Template.parse("  {% comment %} {% endcomment %} ")
-    assert_equal [String, Comment, String], block_types(template.root.nodelist)
-    assert_equal 3, template.root.nodelist.size
-  end
-  def test_with_custom_tag
-    Liquid::Template.register_tag("testtag", Block)
-    assert_nothing_thrown do
-      template = Liquid::Template.parse( "{% testtag %} {% endtesttag %}")
-    end
-  end
-  private
-  def block_types(nodelist)
-    nodelist.collect { |node| node.class }
-  end
-end

data/test/condition_test.rb DELETED

@@ -1,109 +0,0 @@
-require File.dirname(__FILE__) + '/helper'
-class ConditionTest < Test::Unit::TestCase
-  include Liquid
-  def test_basic_condition
-    assert_equal false, Condition.new('1', '==', '2').evaluate
-    assert_equal true,  Condition.new('1', '==', '1').evaluate
-  end
-  def test_default_operators_evalute_true
-    assert_evalutes_true '1', '==', '1'
-    assert_evalutes_true '1', '!=', '2'
-    assert_evalutes_true '1', '<>', '2'
-    assert_evalutes_true '1', '<', '2'
-    assert_evalutes_true '2', '>', '1'
-    assert_evalutes_true '1', '>=', '1'
-    assert_evalutes_true '2', '>=', '1'
-    assert_evalutes_true '1', '<=', '2'
-    assert_evalutes_true '1', '<=', '1'
-  end
-  def test_default_operators_evalute_false
-    assert_evalutes_false '1', '==', '2'
-    assert_evalutes_false '1', '!=', '1'
-    assert_evalutes_false '1', '<>', '1'
-    assert_evalutes_false '1', '<', '0'
-    assert_evalutes_false '2', '>', '4'
-    assert_evalutes_false '1', '>=', '3'
-    assert_evalutes_false '2', '>=', '4'
-    assert_evalutes_false '1', '<=', '0'
-    assert_evalutes_false '1', '<=', '0'
-  end
-  def test_contains_works_on_strings
-    assert_evalutes_true "'bob'", 'contains', "'o'"
-    assert_evalutes_true "'bob'", 'contains', "'b'"
-    assert_evalutes_true "'bob'", 'contains', "'bo'"
-    assert_evalutes_true "'bob'", 'contains', "'ob'"
-    assert_evalutes_true "'bob'", 'contains', "'bob'"
-    assert_evalutes_false "'bob'", 'contains', "'bob2'"
-    assert_evalutes_false "'bob'", 'contains', "'a'"
-    assert_evalutes_false "'bob'", 'contains', "'---'"
-  end
-  def test_contains_works_on_arrays
-    @context = Liquid::Context.new
-    @context['array'] = [1,2,3,4,5]
-    assert_evalutes_false "array", 'contains', '0'
-    assert_evalutes_true "array", 'contains', '1'
-    assert_evalutes_true "array", 'contains', '2'
-    assert_evalutes_true "array", 'contains', '3'
-    assert_evalutes_true "array", 'contains', '4'
-    assert_evalutes_true "array", 'contains', '5'
-    assert_evalutes_false "array", 'contains', '6'
-    assert_evalutes_false "array", 'contains', '"1"'
-  end
-  def test_or_condition
-    condition = Condition.new('1', '==', '2')
-    assert_equal false, condition.evaluate
-    condition.or Condition.new('2', '==', '1')
-    assert_equal false, condition.evaluate
-    condition.or Condition.new('1', '==', '1')
-    assert_equal true, condition.evaluate
-  end
-  def test_and_condition
-    condition = Condition.new('1', '==', '1')
-    assert_equal true, condition.evaluate
-    condition.and Condition.new('2', '==', '2')
-    assert_equal true, condition.evaluate
-    condition.and Condition.new('2', '==', '1')
-    assert_equal false, condition.evaluate
-  end
-  def test_should_allow_custom_proc_operator
-    Condition.operators['starts_with'] = Proc.new { |cond, left, right| left =~ %r{^#{right}}}
-    assert_evalutes_true "'bob'", 'starts_with', "'b'"
-    assert_evalutes_false "'bob'", 'starts_with', "'o'"
-  ensure
-    Condition.operators.delete 'starts_with'
-  end
-  private
-    def assert_evalutes_true(left, op, right)
-      assert Condition.new(left, op, right).evaluate(@context || Liquid::Context.new), "Evaluated false: #{left} #{op} #{right}"
-    end
-    def assert_evalutes_false(left, op, right)
-      assert !Condition.new(left, op, right).evaluate(@context || Liquid::Context.new), "Evaluated true: #{left} #{op} #{right}"
-    end
-end

data/test/context_test.rb DELETED

@@ -1,418 +0,0 @@
-require File.dirname(__FILE__) + '/helper'
-class HundredCentes
-  def to_liquid
-    100
-  end
-end
-class CentsDrop < Liquid::Drop
-  def amount
-    HundredCentes.new
-  end
-  def non_zero?
-    true
-  end
-end
-class ContextSensitiveDrop < Liquid::Drop
-  def test
-    @context['test']
-  end
-end
-class Category < Liquid::Drop
-  attr_accessor :name
-  def initialize(name)
-    @name = name
-  end
-  def to_liquid
-    CategoryDrop.new(self)
-  end
-end
-class CategoryDrop
-  attr_accessor :category, :context
-  def initialize(category)
-    @category = category
-  end
-end
-class ContextTest < Test::Unit::TestCase
-  include Liquid
-  def setup
-    @template = Liquid::Template.new
-    @context = Liquid::Context.new(@template.assigns, @template.registers)
-  end
-  def test_variables
-    @context['string'] = 'string'
-    assert_equal 'string', @context['string']
-    @context['num'] = 5
-    assert_equal 5, @context['num']
-    @context['time'] = Time.parse('2006-06-06 12:00:00')
-    assert_equal Time.parse('2006-06-06 12:00:00'), @context['time']
-    @context['date'] = Date.today
-    assert_equal Date.today, @context['date']
-    now = DateTime.now
-    @context['datetime'] = now
-    assert_equal now, @context['datetime']
-    @context['bool'] = true
-    assert_equal true, @context['bool']
-    @context['bool'] = false
-    assert_equal false, @context['bool']
-    @context['nil'] = nil
-    assert_equal nil, @context['nil']
-    assert_equal nil, @context['nil']
-  end
-  def test_variables_not_existing
-    assert_equal nil, @context['does_not_exist']
-  end
-  def test_scoping
-    assert_nothing_raised do
-      @context.push
-      @context.pop
-    end
-    assert_raise(Liquid::ContextError) do
-      @context.pop
-    end
-    assert_raise(Liquid::ContextError) do
-      @context.push
-      @context.pop
-      @context.pop
-    end
-  end
-  def test_length_query
-    @context['numbers'] = [1,2,3,4]
-    assert_equal 4, @context['numbers.size']
-    @context['numbers'] = {1 => 1,2 => 2,3 => 3,4 => 4}
-    assert_equal 4, @context['numbers.size']
-    @context['numbers'] = {1 => 1,2 => 2,3 => 3,4 => 4, 'size' => 1000}
-    assert_equal 1000, @context['numbers.size']
-  end
-  def test_hyphenated_variable
-    @context['oh-my'] = 'godz'
-    assert_equal 'godz', @context['oh-my']
-  end
-  def test_add_filter
-    filter = Module.new do
-      def hi(output)
-        output + ' hi!'
-      end
-    end
-    context = Context.new(@template)
-    context.add_filters(filter)
-    assert_equal 'hi? hi!', context.invoke(:hi, 'hi?')
-    context = Context.new(@template)
-    assert_equal 'hi?', context.invoke(:hi, 'hi?')
-    context.add_filters(filter)
-    assert_equal 'hi? hi!', context.invoke(:hi, 'hi?')
-  end
-  def test_override_global_filter
-    global = Module.new do
-      def notice(output)
-        "Global #{output}"
-      end
-    end
-    local = Module.new do
-      def notice(output)
-        "Local #{output}"
-      end
-    end
-    Template.register_filter(global)
-    assert_equal 'Global test', Template.parse("{{'test' | notice }}").render
-    assert_equal 'Local test', Template.parse("{{'test' | notice }}").render({}, :filters => [local])
-  end
-  def test_only_intended_filters_make_it_there
-    filter = Module.new do
-      def hi(output)
-        output + ' hi!'
-      end
-    end
-    context = Context.new(@template)
-    methods = context.strainer.methods
-    context.add_filters(filter)
-    assert_equal (methods + ['hi']).sort, context.strainer.methods.sort
-  end
-  def test_add_item_in_outer_scope
-    @context['test'] = 'test'
-    @context.push
-    assert_equal 'test', @context['test']
-    @context.pop
-    assert_equal 'test', @context['test']
-  end
-  def test_add_item_in_inner_scope
-    @context.push
-    @context['test'] = 'test'
-    assert_equal 'test', @context['test']
-    @context.pop
-    assert_equal nil, @context['test']
-  end
-  def test_hierachical_data
-    @context['hash'] = {"name" => 'tobi'}
-    assert_equal 'tobi', @context['hash.name']
-  end
-  def test_keywords
-    assert_equal true, @context['true']
-    assert_equal false, @context['false']
-  end
-  def test_digits
-    assert_equal 100, @context['100']
-    assert_equal 100.00, @context['100.00']
-  end
-  def test_strings
-    assert_equal "hello!", @context['"hello!"']
-    assert_equal "hello!", @context["'hello!'"]
-  end
-  def test_merge
-    @context.merge({ "test" => "test" })
-    assert_equal 'test', @context['test']
-    @context.merge({ "test" => "newvalue", "foo" => "bar" })
-    assert_equal 'newvalue', @context['test']
-    assert_equal 'bar', @context['foo']
-  end
-  def test_array_notation
-    @context['test'] = [1,2,3,4,5]
-    assert_equal 1, @context['test[0]']
-    assert_equal 2, @context['test[1]']
-    assert_equal 3, @context['test[2]']
-    assert_equal 4, @context['test[3]']
-    assert_equal 5, @context['test[4]']
-  end
-  def test_recoursive_array_notation
-    @context['test'] = {'test' => [1,2,3,4,5]}
-    assert_equal 1, @context['test.test[0]']
-    @context['test'] = [{'test' => 'worked'}]
-    assert_equal 'worked', @context['test[0].test']
-  end
-  def test_hash_to_array_transition
-    @context['colors'] = {
-     'Blue'    => ['003366','336699', '6699CC', '99CCFF'],
-     'Green'   => ['003300','336633', '669966', '99CC99'],
-     'Yellow'  => ['CC9900','FFCC00', 'FFFF99', 'FFFFCC'],
-     'Red'     => ['660000','993333', 'CC6666', 'FF9999']
-    }
-    assert_equal '003366', @context['colors.Blue[0]']
-    assert_equal 'FF9999', @context['colors.Red[3]']
-  end
-  def test_try_first
-    @context['test'] = [1,2,3,4,5]
-    assert_equal 1, @context['test.first']
-    assert_equal 5, @context['test.last']
-    @context['test'] = {'test' => [1,2,3,4,5]}
-    assert_equal 1, @context['test.test.first']
-    assert_equal 5, @context['test.test.last']
-    @context['test'] = [1]
-    assert_equal 1, @context['test.first']
-    assert_equal 1, @context['test.last']
-  end
-  def test_access_hashes_with_hash_notation
-    @context['products'] = {'count' => 5, 'tags' => ['deepsnow', 'freestyle'] }
-    @context['product'] = {'variants' => [ {'title' => 'draft151cm'}, {'title' => 'element151cm'}  ]}
-    assert_equal 5, @context['products["count"]']
-    assert_equal 'deepsnow', @context['products["tags"][0]']
-    assert_equal 'deepsnow', @context['products["tags"].first']
-    assert_equal 'draft151cm', @context['product["variants"][0]["title"]']
-    assert_equal 'element151cm', @context['product["variants"][1]["title"]']
-    assert_equal 'draft151cm', @context['product["variants"][0]["title"]']
-    assert_equal 'element151cm', @context['product["variants"].last["title"]']
-  end
-  def test_access_variable_with_hash_notation
-    @context['foo'] = 'baz'
-    @context['bar'] = 'foo'
-    assert_equal 'baz', @context['["foo"]']
-    assert_equal 'baz', @context['[bar]']
-  end
-  def test_access_hashes_with_hash_access_variables
-    @context['var'] = 'tags'
-    @context['nested'] = {'var' => 'tags'}
-    @context['products'] = {'count' => 5, 'tags' => ['deepsnow', 'freestyle'] }
-    assert_equal 'deepsnow', @context['products[var].first']
-    assert_equal 'freestyle', @context['products[nested.var].last']
-  end
-  def test_first_can_appear_in_middle_of_callchain
-    @context['product'] = {'variants' => [ {'title' => 'draft151cm'}, {'title' => 'element151cm'}  ]}
-    assert_equal 'draft151cm', @context['product.variants[0].title']
-    assert_equal 'element151cm', @context['product.variants[1].title']
-    assert_equal 'draft151cm', @context['product.variants.first.title']
-    assert_equal 'element151cm', @context['product.variants.last.title']
-  end
-  def test_cents
-    @context.merge( "cents" => HundredCentes.new )
-    assert_equal 100, @context['cents']
-  end
-  def test_nested_cents
-    @context.merge( "cents" => { 'amount' => HundredCentes.new} )
-    assert_equal 100, @context['cents.amount']
-    @context.merge( "cents" => { 'cents' => { 'amount' => HundredCentes.new} } )
-    assert_equal 100, @context['cents.cents.amount']
-  end
-  def test_cents_through_drop
-    @context.merge( "cents" => CentsDrop.new )
-    assert_equal 100, @context['cents.amount']
-  end
-  def test_nested_cents_through_drop
-    @context.merge( "vars" => {"cents" => CentsDrop.new} )
-    assert_equal 100, @context['vars.cents.amount']
-  end
-  def test_drop_methods_with_question_marks
-    @context.merge( "cents" => CentsDrop.new )
-    assert @context['cents.non_zero?']
-  end
-  def test_context_from_within_drop
-    @context.merge( "test" => '123', "vars" => ContextSensitiveDrop.new )
-    assert_equal '123', @context['vars.test']
-  end
-  def test_nested_context_from_within_drop
-    @context.merge( "test" => '123', "vars" => {"local" => ContextSensitiveDrop.new }  )
-    assert_equal '123', @context['vars.local.test']
-  end
-  def test_ranges
-    @context.merge( "test" => '5' )
-    assert_equal (1..5), @context['(1..5)']
-    assert_equal (1..5), @context['(1..test)']
-    assert_equal (5..5), @context['(test..test)']
-  end
-  def test_cents_through_drop_nestedly
-    @context.merge( "cents" => {"cents" => CentsDrop.new} )
-    assert_equal 100, @context['cents.cents.amount']
-    @context.merge( "cents" => { "cents" => {"cents" => CentsDrop.new}} )
-    assert_equal 100, @context['cents.cents.cents.amount']
-  end
-  def test_proc_as_variable
-    @context['dynamic'] = Proc.new { 'Hello' }
-    assert_equal 'Hello', @context['dynamic']
-  end
-  def test_lambda_as_variable
-    @context['dynamic'] = lambda { 'Hello' }
-    assert_equal 'Hello', @context['dynamic']
-  end
-  def test_nested_lambda_as_variable
-    @context['dynamic'] = { "lambda" => lambda { 'Hello' } }
-    assert_equal 'Hello', @context['dynamic.lambda']
-  end
-  def test_lambda_is_called_once
-    @context['callcount'] = lambda { @global ||= 0; @global += 1; @global.to_s }
-    assert_equal '1', @context['callcount']
-    assert_equal '1', @context['callcount']
-    assert_equal '1', @context['callcount']
-    @global = nil
-  end
-  def test_nested_lambda_is_called_once
-    @context['callcount'] = { "lambda" => lambda { @global ||= 0; @global += 1; @global.to_s } }
-    assert_equal '1', @context['callcount.lambda']
-    assert_equal '1', @context['callcount.lambda']
-    assert_equal '1', @context['callcount.lambda']
-    @global = nil
-  end
-  def test_access_to_context_from_proc
-    @context.registers[:magic] = 345392
-    @context['magic'] = lambda { @context.registers[:magic] }
-    assert_equal 345392, @context['magic']
-  end
-  def test_to_liquid_and_context_at_first_level
-    @context['category'] = Category.new("foobar")
-    assert_kind_of CategoryDrop, @context['category']
-    assert_equal @context, @context['category'].context
-  end
-end