liquid 3.0.0.rc1 → 3.0.0

data/test/unit/tags/case_tag_unit_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class CaseTagUnitTest < Test::Unit::TestCase
+class CaseTagUnitTest < Minitest::Test
   include Liquid
 
   def test_case_nodelist

data/test/unit/tags/for_tag_unit_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ForTagUnitTest < Test::Unit::TestCase
+class ForTagUnitTest < Minitest::Test
   def test_for_nodelist
     template = Liquid::Template.parse('{% for item in items %}FOR{% endfor %}')
     assert_equal ['FOR'], template.root.nodelist[0].nodelist

data/test/unit/tags/if_tag_unit_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class IfTagUnitTest < Test::Unit::TestCase
+class IfTagUnitTest < Minitest::Test
   def test_if_nodelist
     template = Liquid::Template.parse('{% if true %}IF{% else %}ELSE{% endif %}')
     assert_equal ['IF', 'ELSE'], template.root.nodelist[0].nodelist

data/test/unit/template_unit_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class TemplateUnitTest < Test::Unit::TestCase
+class TemplateUnitTest < Minitest::Test
   include Liquid
 
   def test_sets_default_localization_in_document

data/test/unit/tokenizer_unit_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class TokenizerTest < Test::Unit::TestCase
+class TokenizerTest < Minitest::Test
   def test_tokenize_strings
     assert_equal [' '], tokenize(' ')
     assert_equal ['hello world'], tokenize('hello world')
@@ -21,6 +21,15 @@ class TokenizerTest < Test::Unit::TestCase
     assert_equal ['  ', '{% comment %}', ' ', '{% endcomment %}', ' '], tokenize("  {% comment %} {% endcomment %} ")
   end
 
+  def test_calculate_line_numbers_per_token_with_profiling
+    template = Liquid::Template.parse("", :profile => true)
+
+    assert_equal [1],       template.send(:tokenize, "{{funk}}").map(&:line_number)
+    assert_equal [1, 1, 1], template.send(:tokenize, " {{funk}} ").map(&:line_number)
+    assert_equal [1, 2, 2], template.send(:tokenize, "\n{{funk}}\n").map(&:line_number)
+    assert_equal [1, 1, 3], template.send(:tokenize, " {{\n funk \n}} ").map(&:line_number)
+  end
+
   private
 
   def tokenize(source)

data/test/unit/variable_unit_test.rb

@@ -1,129 +1,127 @@
 require 'test_helper'
 
-class VariableUnitTest < Test::Unit::TestCase
+class VariableUnitTest < Minitest::Test
   include Liquid
 
   def test_variable
     var = Variable.new('hello')
-    assert_equal 'hello', var.name
+    assert_equal VariableLookup.new('hello'), var.name
   end
 
   def test_filters
     var = Variable.new('hello | textileze')
-    assert_equal 'hello', var.name
-    assert_equal [["textileze",[]]], var.filters
+    assert_equal VariableLookup.new('hello'), var.name
+    assert_equal [['textileze',[]]], var.filters
 
     var = Variable.new('hello | textileze | paragraph')
-    assert_equal 'hello', var.name
-    assert_equal [["textileze",[]], ["paragraph",[]]], var.filters
+    assert_equal VariableLookup.new('hello'), var.name
+    assert_equal [['textileze',[]], ['paragraph',[]]], var.filters
 
     var = Variable.new(%! hello | strftime: '%Y'!)
-    assert_equal 'hello', var.name
-    assert_equal [["strftime",["'%Y'"]]], var.filters
+    assert_equal VariableLookup.new('hello'), var.name
+    assert_equal [['strftime',['%Y']]], var.filters
 
     var = Variable.new(%! 'typo' | link_to: 'Typo', true !)
-    assert_equal %!'typo'!, var.name
-    assert_equal [["link_to",["'Typo'", "true"]]], var.filters
+    assert_equal 'typo', var.name
+    assert_equal [['link_to',['Typo', true]]], var.filters
 
     var = Variable.new(%! 'typo' | link_to: 'Typo', false !)
-    assert_equal %!'typo'!, var.name
-    assert_equal [["link_to",["'Typo'", "false"]]], var.filters
+    assert_equal 'typo', var.name
+    assert_equal [['link_to',['Typo', false]]], var.filters
 
     var = Variable.new(%! 'foo' | repeat: 3 !)
-    assert_equal %!'foo'!, var.name
-    assert_equal [["repeat",["3"]]], var.filters
+    assert_equal 'foo', var.name
+    assert_equal [['repeat',[3]]], var.filters
 
     var = Variable.new(%! 'foo' | repeat: 3, 3 !)
-    assert_equal %!'foo'!, var.name
-    assert_equal [["repeat",["3","3"]]], var.filters
+    assert_equal 'foo', var.name
+    assert_equal [['repeat',[3,3]]], var.filters
 
     var = Variable.new(%! 'foo' | repeat: 3, 3, 3 !)
-    assert_equal %!'foo'!, var.name
-    assert_equal [["repeat",["3","3","3"]]], var.filters
+    assert_equal 'foo', var.name
+    assert_equal [['repeat',[3,3,3]]], var.filters
 
     var = Variable.new(%! hello | strftime: '%Y, okay?'!)
-    assert_equal 'hello', var.name
-    assert_equal [["strftime",["'%Y, okay?'"]]], var.filters
+    assert_equal VariableLookup.new('hello'), var.name
+    assert_equal [['strftime',['%Y, okay?']]], var.filters
 
     var = Variable.new(%! hello | things: "%Y, okay?", 'the other one'!)
-    assert_equal 'hello', var.name
-    assert_equal [["things",["\"%Y, okay?\"","'the other one'"]]], var.filters
+    assert_equal VariableLookup.new('hello'), var.name
+    assert_equal [['things',['%Y, okay?','the other one']]], var.filters
   end
 
   def test_filter_with_date_parameter
-
     var = Variable.new(%! '2006-06-06' | date: "%m/%d/%Y"!)
-    assert_equal "'2006-06-06'", var.name
-    assert_equal [["date",["\"%m/%d/%Y\""]]], var.filters
-
+    assert_equal '2006-06-06', var.name
+    assert_equal [['date',['%m/%d/%Y']]], var.filters
   end
 
   def test_filters_without_whitespace
     var = Variable.new('hello | textileze | paragraph')
-    assert_equal 'hello', var.name
-    assert_equal [["textileze",[]], ["paragraph",[]]], var.filters
+    assert_equal VariableLookup.new('hello'), var.name
+    assert_equal [['textileze',[]], ['paragraph',[]]], var.filters
 
     var = Variable.new('hello|textileze|paragraph')
-    assert_equal 'hello', var.name
-    assert_equal [["textileze",[]], ["paragraph",[]]], var.filters
+    assert_equal VariableLookup.new('hello'), var.name
+    assert_equal [['textileze',[]], ['paragraph',[]]], var.filters
 
     var = Variable.new("hello|replace:'foo','bar'|textileze")
-    assert_equal 'hello', var.name
-    assert_equal [["replace", ["'foo'", "'bar'"]], ["textileze", []]], var.filters
+    assert_equal VariableLookup.new('hello'), var.name
+    assert_equal [['replace', ['foo', 'bar']], ['textileze', []]], var.filters
   end
 
   def test_symbol
     var = Variable.new("http://disney.com/logo.gif | image: 'med' ", :error_mode => :lax)
-    assert_equal "http://disney.com/logo.gif", var.name
-    assert_equal [["image",["'med'"]]], var.filters
+    assert_equal VariableLookup.new('http://disney.com/logo.gif'), var.name
+    assert_equal [['image',['med']]], var.filters
   end
 
   def test_string_to_filter
     var = Variable.new("'http://disney.com/logo.gif' | image: 'med' ")
-    assert_equal "'http://disney.com/logo.gif'", var.name
-    assert_equal [["image",["'med'"]]], var.filters
+    assert_equal 'http://disney.com/logo.gif', var.name
+    assert_equal [['image',['med']]], var.filters
   end
 
   def test_string_single_quoted
     var = Variable.new(%| "hello" |)
-    assert_equal '"hello"', var.name
+    assert_equal 'hello', var.name
   end
 
   def test_string_double_quoted
     var = Variable.new(%| 'hello' |)
-    assert_equal "'hello'", var.name
+    assert_equal 'hello', var.name
   end
 
   def test_integer
     var = Variable.new(%| 1000 |)
-    assert_equal "1000", var.name
+    assert_equal 1000, var.name
   end
 
   def test_float
     var = Variable.new(%| 1000.01 |)
-    assert_equal "1000.01", var.name
+    assert_equal 1000.01, var.name
   end
 
   def test_string_with_special_chars
     var = Variable.new(%| 'hello! $!@.;"ddasd" ' |)
-    assert_equal %|'hello! $!@.;"ddasd" '|, var.name
+    assert_equal 'hello! $!@.;"ddasd" ', var.name
   end
 
   def test_string_dot
     var = Variable.new(%| test.test |)
-    assert_equal 'test.test', var.name
+    assert_equal VariableLookup.new('test.test'), var.name
   end
 
   def test_filter_with_keyword_arguments
     var = Variable.new(%! hello | things: greeting: "world", farewell: 'goodbye'!)
-    assert_equal 'hello', var.name
-    assert_equal [['things',["greeting: \"world\"","farewell: 'goodbye'"]]], var.filters
+    assert_equal VariableLookup.new('hello'), var.name
+    assert_equal [['things', [], { 'greeting' => 'world', 'farewell' => 'goodbye' }]], var.filters
   end
 
   def test_lax_filter_argument_parsing
     var = Variable.new(%! number_of_comments | pluralize: 'comment': 'comments' !, :error_mode => :lax)
-    assert_equal 'number_of_comments', var.name
-    assert_equal [['pluralize',["'comment'","'comments'"]]], var.filters
+    assert_equal VariableLookup.new('number_of_comments'), var.name
+    assert_equal [['pluralize',['comment','comments']]], var.filters
   end
 
   def test_strict_filter_argument_parsing
@@ -133,4 +131,9 @@ class VariableUnitTest < Test::Unit::TestCase
       end
     end
   end
+
+  def test_output_raw_source_of_variable
+    var = Variable.new(%! name_of_variable | upcase !)
+    assert_equal " name_of_variable | upcase ", var.raw
+  end
 end

metadata

@@ -1,27 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: liquid
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc1
+  version: 3.0.0
 platform: ruby
 authors:
 - Tobias Luetke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -33,12 +47,18 @@ extra_rdoc_files:
 - History.md
 - README.md
 files:
+- History.md
+- MIT-LICENSE
+- README.md
+- lib/liquid.rb
 - lib/liquid/block.rb
+- lib/liquid/block_body.rb
 - lib/liquid/condition.rb
 - lib/liquid/context.rb
 - lib/liquid/document.rb
 - lib/liquid/drop.rb
 - lib/liquid/errors.rb
+- lib/liquid/expression.rb
 - lib/liquid/extensions.rb
 - lib/liquid/file_system.rb
 - lib/liquid/i18n.rb
@@ -47,6 +67,10 @@ files:
 - lib/liquid/locales/en.yml
 - lib/liquid/module_ex.rb
 - lib/liquid/parser.rb
+- lib/liquid/parser_switching.rb
+- lib/liquid/profiler.rb
+- lib/liquid/profiler/hooks.rb
+- lib/liquid/range_lookup.rb
 - lib/liquid/standardfilters.rb
 - lib/liquid/strainer.rb
 - lib/liquid/tag.rb
@@ -67,13 +91,11 @@ files:
 - lib/liquid/tags/table_row.rb
 - lib/liquid/tags/unless.rb
 - lib/liquid/template.rb
+- lib/liquid/token.rb
 - lib/liquid/utils.rb
 - lib/liquid/variable.rb
+- lib/liquid/variable_lookup.rb
 - lib/liquid/version.rb
-- lib/liquid.rb
-- MIT-LICENSE
-- README.md
-- History.md
 - test/fixtures/en_locale.yml
 - test/integration/assign_test.rb
 - test/integration/blank_test.rb
@@ -85,6 +107,7 @@ files:
 - test/integration/hash_ordering_test.rb
 - test/integration/output_test.rb
 - test/integration/parsing_quirks_test.rb
+- test/integration/render_profiling_test.rb
 - test/integration/security_test.rb
 - test/integration/standard_filter_test.rb
 - test/integration/tags/break_tag_test.rb
@@ -128,62 +151,63 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.7
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A secure, non-evaling end user template engine with aesthetic markup.
 test_files:
-- test/fixtures/en_locale.yml
-- test/integration/assign_test.rb
-- test/integration/blank_test.rb
-- test/integration/capture_test.rb
-- test/integration/context_test.rb
-- test/integration/drop_test.rb
-- test/integration/error_handling_test.rb
-- test/integration/filter_test.rb
-- test/integration/hash_ordering_test.rb
-- test/integration/output_test.rb
-- test/integration/parsing_quirks_test.rb
-- test/integration/security_test.rb
-- test/integration/standard_filter_test.rb
-- test/integration/tags/break_tag_test.rb
-- test/integration/tags/continue_tag_test.rb
+- test/unit/tags/for_tag_unit_test.rb
+- test/unit/tags/if_tag_unit_test.rb
+- test/unit/tags/case_tag_unit_test.rb
+- test/unit/parser_unit_test.rb
+- test/unit/condition_unit_test.rb
+- test/unit/file_system_unit_test.rb
+- test/unit/regexp_unit_test.rb
+- test/unit/tag_unit_test.rb
+- test/unit/i18n_unit_test.rb
+- test/unit/tokenizer_unit_test.rb
+- test/unit/strainer_unit_test.rb
+- test/unit/template_unit_test.rb
+- test/unit/module_ex_unit_test.rb
+- test/unit/lexer_unit_test.rb
+- test/unit/block_unit_test.rb
+- test/unit/context_unit_test.rb
+- test/unit/variable_unit_test.rb
+- test/test_helper.rb
 - test/integration/tags/for_tag_test.rb
 - test/integration/tags/if_else_tag_test.rb
 - test/integration/tags/include_tag_test.rb
-- test/integration/tags/increment_tag_test.rb
+- test/integration/tags/continue_tag_test.rb
 - test/integration/tags/raw_tag_test.rb
-- test/integration/tags/standard_tag_test.rb
-- test/integration/tags/statements_test.rb
 - test/integration/tags/table_row_test.rb
+- test/integration/tags/standard_tag_test.rb
+- test/integration/tags/increment_tag_test.rb
 - test/integration/tags/unless_else_tag_test.rb
+- test/integration/tags/statements_test.rb
+- test/integration/tags/break_tag_test.rb
+- test/integration/filter_test.rb
+- test/integration/render_profiling_test.rb
+- test/integration/parsing_quirks_test.rb
+- test/integration/drop_test.rb
+- test/integration/hash_ordering_test.rb
+- test/integration/capture_test.rb
+- test/integration/assign_test.rb
+- test/integration/output_test.rb
+- test/integration/error_handling_test.rb
+- test/integration/blank_test.rb
 - test/integration/template_test.rb
+- test/integration/security_test.rb
 - test/integration/variable_test.rb
-- test/test_helper.rb
-- test/unit/block_unit_test.rb
-- test/unit/condition_unit_test.rb
-- test/unit/context_unit_test.rb
-- test/unit/file_system_unit_test.rb
-- test/unit/i18n_unit_test.rb
-- test/unit/lexer_unit_test.rb
-- test/unit/module_ex_unit_test.rb
-- test/unit/parser_unit_test.rb
-- test/unit/regexp_unit_test.rb
-- test/unit/strainer_unit_test.rb
-- test/unit/tag_unit_test.rb
-- test/unit/tags/case_tag_unit_test.rb
-- test/unit/tags/for_tag_unit_test.rb
-- test/unit/tags/if_tag_unit_test.rb
-- test/unit/template_unit_test.rb
-- test/unit/tokenizer_unit_test.rb
-- test/unit/variable_unit_test.rb
+- test/integration/standard_filter_test.rb
+- test/integration/context_test.rb
+- test/fixtures/en_locale.yml