liquid 1.7.0 → 1.9.0

data/test/regexp_test.rb

@@ -31,9 +31,10 @@ class RegexpTest < Test::Unit::TestCase
   def test_variable_parser
     assert_equal ['var'],                 'var'.scan(VariableParser)
     assert_equal ['var', 'method'],       'var.method'.scan(VariableParser)
-    assert_equal ['var', 'method'],       'var[method]'.scan(VariableParser)
-    assert_equal ['var', 'method', '0'],  'var[method][0]'.scan(VariableParser)
-    assert_equal ['var', 'method', '0', 'method'],  'var[method][0].method'.scan(VariableParser)    
+    assert_equal ['var', '[method]'],       'var[method]'.scan(VariableParser)
+    assert_equal ['var', '[method]', '[0]'],  'var[method][0]'.scan(VariableParser)
+    assert_equal ['var', '["method"]', '[0]'],  'var["method"][0]'.scan(VariableParser)
+    assert_equal ['var', '[method]', '[0]', 'method'],  'var[method][0].method'.scan(VariableParser)    
   end
  
 end

data/test/standard_filter_test.rb

@@ -42,10 +42,16 @@ class StandardFiltersTest < Test::Unit::TestCase
     assert_equal '1234567890', @filters.truncate('1234567890')
   end
   
+  def test_escape
+    assert_equal '&lt;strong&gt;', @filters.escape('<strong>')
+    assert_equal '&lt;strong&gt;', @filters.h('<strong>')    
+  end
+  
   def test_truncatewords
     assert_equal 'one two three', @filters.truncatewords('one two three', 4)
     assert_equal 'one two...', @filters.truncatewords('one two three', 2)
-    assert_equal 'one two three', @filters.truncatewords('one two three')    
+    assert_equal 'one two three', @filters.truncatewords('one two three')
+    assert_equal 'Two small (13&#8221; x 5.5&#8221; x 10&#8221; high) baskets fit inside one large basket (13&#8221;...', @filters.truncatewords('Two small (13&#8221; x 5.5&#8221; x 10&#8221; high) baskets fit inside one large basket (13&#8221; x 16&#8221; x 10.5&#8221; high) with cover.', 15)    
   end
   
   def test_strip_html
@@ -78,6 +84,9 @@ class StandardFiltersTest < Test::Unit::TestCase
     assert_equal '2006-07-05 10:00:00', @filters.date("2006-07-05 10:00:00", nil)    
 
     assert_equal '07/05/2006', @filters.date("2006-07-05 10:00:00", "%m/%d/%Y")    
+    
+    assert_equal "07/16/2004", @filters.date("Fri Jul 16 01:00:00 EDT 2004", "%m/%d/%Y")
+    
     assert_equal nil, @filters.date(nil, "%B")    
   end
   
@@ -89,9 +98,25 @@ class StandardFiltersTest < Test::Unit::TestCase
     assert_equal nil, @filters.last([])    
   end
   
+  def test_replace
+    assert_equal 'b b b b', @filters.replace("a a a a", 'a', 'b')    
+    assert_equal 'b a a a', @filters.replace_first("a a a a", 'a', 'b')
+    assert_template_result 'b a a a', "{{ 'a a a a' | replace_first: 'a', 'b' }}"        
+  end
   
+  def test_remove
+    assert_equal '   ', @filters.remove("a a a a", 'a')    
+    assert_equal 'a a a', @filters.remove_first("a a a a", 'a ')        
+    assert_template_result 'a a a', "{{ 'a a a a' | remove_first: 'a ' }}"
+  end
+                                                                                     
+  def test_strip_newlines
+    assert_template_result 'abc', "{{ source | strip_newlines }}", 'source' => "a\nb\nc"
+  end
   
-  
+  def test_newlines_to_br
+    assert_template_result "a<br />\nb<br />\nc", "{{ source | newline_to_br }}", 'source' => "a\nb\nc"
+  end
   
   
   

data/test/standard_tag_test.rb

@@ -1,14 +1,14 @@
 require File.dirname(__FILE__) + '/helper'
 
 
-class TemplateTest < Test::Unit::TestCase
+class StandardTagTest < Test::Unit::TestCase
   include Liquid
   
   
   def test_tag 
-    tag = Tag.new([], [])
+    tag = Tag.new('tag', [], [])
     assert_equal 'liquid::tag', tag.name 
-    assert_equal '', tag.render(Context.new(Liquid::Template.new))    
+    assert_equal '', tag.render(Context.new)    
   end
   
   def test_no_transform
@@ -69,6 +69,10 @@ HERE
 HERE
     assert_template_result(expected,template,'array' => [1,2,3])
   end
+  
+  def test_for_with_range
+    assert_template_result(' 1  2  3 ','{%for item in (1..3) %} {{item}} {%endfor%}')    
+  end
 
   def test_for_with_variable
     assert_template_result(' 1  2  3 ','{%for item in array%} {{item}} {%endfor%}','array' => [1,2,3])
@@ -92,15 +96,7 @@ HERE
   
   def test_for_and_if
     assigns = {'array' => [1,2,3] }
-    assert_template_result(' yay     ',
-                           '{%for item in array%} {% if forloop.first %}yay{% endif %} {%endfor%}',
-                           assigns)
-    assert_template_result(' yay  boo  boo ',
-                          '{%for item in array%} {% if forloop.first %}yay{% else %}boo{% endif %} {%endfor%}',
-                          assigns)
-    assert_template_result('   boo  boo ',
-                          '{%for item in array%} {% if forloop.first %}{% else %}boo{% endif %} {%endfor%}',
-                          assigns)
+    assert_template_result('+--', '{%for item in array%}{% if forloop.first %}+{% else %}-{% endif %}{%endfor%}', assigns)
   end
   
   def test_limiting
@@ -185,20 +181,16 @@ HERE
   
   def test_pause_resume_BIG_offset
     assigns = {'array' => {'items' => [1,2,3,4,5,6,7,8,9,0]}}
-    markup = <<-MKUP
-      {%for i in array.items limit:3 %}{{i}}{%endfor%}
+    markup = %q({%for i in array.items limit:3 %}{{i}}{%endfor%}
       next
       {%for i in array.items offset:continue limit:3 %}{{i}}{%endfor%}
       next
-      {%for i in array.items offset:continue limit:3 offset:1000 %}{{i}}{%endfor%}
-      MKUP
-    expected = <<-XPCTD
-      123
+      {%for i in array.items offset:continue limit:3 offset:1000 %}{{i}}{%endfor%})
+    expected = %q(123
       next
       456
       next
-      
-      XPCTD
+      )
       assert_template_result(expected,markup,assigns)
   end
   
@@ -208,6 +200,12 @@ HERE
     
   end
 
+  def test_hyphenated_assign
+    assigns = {'a-b' => '1' }
+    assert_template_result('a-b:1 a-b:2','a-b:{{a-b}} {%assign a-b = 2 %}a-b:{{a-b}}',assigns)
+    
+  end
+
   def test_capture
     assigns = {'var' => 'content' }
     assert_template_result('content foo content foo ','{{ var2 }}{% capture var2 %}{{ var }} foo {% endcapture %}{{ var2 }}{{ var2 }}', assigns)
@@ -275,6 +273,55 @@ HERE
     assert_template_result('else',  '{% case NULL %}{% when true %}true{% when false %}false{% else %}else{% endcase %}', {})     
   end
   
+  def test_assign_from_case    
+    # Example from the shopify forums
+    code = %q({% case collection.handle %}{% when 'menswear-jackets' %}{% assign ptitle = 'menswear' %}{% when 'menswear-t-shirts' %}{% assign ptitle = 'menswear' %}{% else %}{% assign ptitle = 'womenswear' %}{% endcase %}{{ ptitle }})
+    template = Liquid::Template.parse(code)
+    assert_equal "menswear",   template.render("collection" => {'handle' => 'menswear-jackets'})
+    assert_equal "menswear",   template.render("collection" => {'handle' => 'menswear-t-shirts'})
+    assert_equal "womenswear", template.render("collection" => {'handle' => 'x'})
+    assert_equal "womenswear", template.render("collection" => {'handle' => 'y'})
+    assert_equal "womenswear", template.render("collection" => {'handle' => 'z'})
+  end
+
+  def test_case_when_or
+    code = '{% case condition %}{% when 1 or 2 or 3 %} its 1 or 2 or 3 {% when 4 %} its 4 {% endcase %}'
+    assert_template_result(' its 1 or 2 or 3 ', code, {'condition' => 1 })
+    assert_template_result(' its 1 or 2 or 3 ', code, {'condition' => 2 })
+    assert_template_result(' its 1 or 2 or 3 ', code, {'condition' => 3 })
+    assert_template_result(' its 4 ', code, {'condition' => 4 })
+    assert_template_result('', code, {'condition' => 5 })
+    
+    code = '{% case condition %}{% when 1 or "string" or null %} its 1 or 2 or 3 {% when 4 %} its 4 {% endcase %}'
+    assert_template_result(' its 1 or 2 or 3 ', code, {'condition' => 1 })
+    assert_template_result(' its 1 or 2 or 3 ', code, {'condition' => 'string' })
+    assert_template_result(' its 1 or 2 or 3 ', code, {'condition' => nil })
+    assert_template_result('', code, {'condition' => 'something else' })    
+  end
+
+  def test_case_when_comma
+    code = '{% case condition %}{% when 1, 2, 3 %} its 1 or 2 or 3 {% when 4 %} its 4 {% endcase %}'
+    assert_template_result(' its 1 or 2 or 3 ', code, {'condition' => 1 })
+    assert_template_result(' its 1 or 2 or 3 ', code, {'condition' => 2 })
+    assert_template_result(' its 1 or 2 or 3 ', code, {'condition' => 3 })
+    assert_template_result(' its 4 ', code, {'condition' => 4 })
+    assert_template_result('', code, {'condition' => 5 })
+    
+    code = '{% case condition %}{% when 1, "string", null %} its 1 or 2 or 3 {% when 4 %} its 4 {% endcase %}'
+    assert_template_result(' its 1 or 2 or 3 ', code, {'condition' => 1 })
+    assert_template_result(' its 1 or 2 or 3 ', code, {'condition' => 'string' })
+    assert_template_result(' its 1 or 2 or 3 ', code, {'condition' => nil })
+    assert_template_result('', code, {'condition' => 'something else' })    
+  end
+  
+  def test_assign
+    assert_equal 'variable', Liquid::Template.parse( '{% assign a = "variable"%}{{a}}'  ).render            
+  end
+  
+  def test_assign_is_global
+    assert_equal 'variable', Liquid::Template.parse( '{%for i in (1..2) %}{% assign a = "variable"%}{% endfor %}{{a}}'  ).render        
+  end  
+  
   def test_case_detects_bad_syntax
     assert_raise(SyntaxError) do
       assert_template_result('',  '{% case false %}{% when %}true{% endcase %}', {})     

data/test/test_helper.rb

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift(File.dirname(__FILE__)+ '/extra')
+
+require 'test/unit'
+require 'test/unit/assertions'
+require 'caller'
+require 'breakpoint'
+require File.dirname(__FILE__) + '/../lib/liquid'
+
+
+module Test
+  module Unit
+    module Assertions
+        include Liquid
+        def assert_template_result(expected, template, assigns={}, message=nil)
+          assert_equal expected, Template.parse(template).render(assigns)
+        end 
+    end
+  end
+end

data/test/unless_else_test.rb

@@ -16,4 +16,12 @@ class UnlessElseTest < Test::Unit::TestCase
     assert_template_result(' YES ','{% unless "foo" %} NO {% else %} YES {% endunless %}')
   end
 
+  def test_unless_in_loop
+    assert_template_result '23', '{% for i in choices %}{% unless i %}{{ forloop.index }}{% endunless %}{% endfor %}', 'choices' => [1, nil, false]
+  end
+
+  def test_unless_else_in_loop
+    assert_template_result ' TRUE  2  3 ', '{% for i in choices %}{% unless i %} {{ forloop.index }} {% else %} TRUE {% endunless %}{% endfor %}', 'choices' => [1, nil, false]
+  end
+
 end

metadata

@@ -1,39 +1,42 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
-specification_version: 1
 name: liquid
 version: !ruby/object:Gem::Version 
-  version: 1.7.0
-date: 2006-10-09 00:00:00 -04:00
-summary: A secure non evaling end user template engine with aesthetic markup.
-require_paths: 
-- lib
-- test
-email: tobi@leetsoft.com
-homepage: http://home.leetsoft.com/liquid
-rubyforge_project: liquid
-description: 
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 1.9.0
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Tobias Luetke
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-05-04 00:00:00 -04:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.5.1
+    version: 
+description: A secure non evaling end user template engine with aesthetic markup.
+email: tobi@leetsoft.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- History.txt
+- Manifest.txt
+- README.txt
 files: 
 - CHANGELOG
+- History.txt
 - MIT-LICENSE
 - Manifest.txt
-- README
+- README.txt
 - Rakefile
 - example/server/example_servlet.rb
 - example/server/liquid_servlet.rb
@@ -52,6 +55,7 @@ files:
 - lib/liquid/extensions.rb
 - lib/liquid/file_system.rb
 - lib/liquid/htmltags.rb
+- lib/liquid/module_ex.rb
 - lib/liquid/standardfilters.rb
 - lib/liquid/strainer.rb
 - lib/liquid/tag.rb
@@ -68,6 +72,7 @@ files:
 - lib/liquid/template.rb
 - lib/liquid/variable.rb
 - test/block_test.rb
+- test/condition_test.rb
 - test/context_test.rb
 - test/drop_test.rb
 - test/error_handling_test.rb
@@ -79,6 +84,7 @@ files:
 - test/html_tag_test.rb
 - test/if_else_test.rb
 - test/include_tag_test.rb
+- test/module_ex_test.rb
 - test/output_test.rb
 - test/parsing_quirks_test.rb
 - test/regexp_test.rb
@@ -88,27 +94,35 @@ files:
 - test/statements_test.rb
 - test/strainer_test.rb
 - test/template_test.rb
+- test/test_helper.rb
 - test/unless_else_test.rb
 - test/variable_test.rb
-test_files: []
-
-rdoc_options: []
-
-extra_rdoc_files: []
-
-executables: []
-
-extensions: []
-
+has_rdoc: true
+homepage: http://www.liquidmarkup.org
+post_install_message: 
+rdoc_options: 
+- --main
+- README.txt
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.1.0
-    version: 
+rubyforge_project: liquid
+rubygems_version: 1.1.0
+signing_key: 
+specification_version: 2
+summary: A secure non evaling end user template engine with aesthetic markup.
+test_files: 
+- test/test_helper.rb