liquid 2.6.3 → 3.0.0.rc1

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: liquid
 version: !ruby/object:Gem::Version
-  version: 2.6.3
+  version: 3.0.0.rc1
 platform: ruby
 authors:
 - Tobias Luetke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
-dependencies: []
+date: 2014-07-24 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'
 description: 
 email:
 - tobi@leetsoft.com
@@ -19,11 +33,6 @@ extra_rdoc_files:
 - History.md
 - README.md
 files:
-- History.md
-- MIT-LICENSE
-- README.md
-- lib/extras/liquid_view.rb
-- lib/liquid.rb
 - lib/liquid/block.rb
 - lib/liquid/condition.rb
 - lib/liquid/context.rb
@@ -32,9 +41,12 @@ files:
 - lib/liquid/errors.rb
 - lib/liquid/extensions.rb
 - lib/liquid/file_system.rb
-- lib/liquid/htmltags.rb
+- lib/liquid/i18n.rb
 - lib/liquid/interrupts.rb
+- lib/liquid/lexer.rb
+- lib/liquid/locales/en.yml
 - lib/liquid/module_ex.rb
+- lib/liquid/parser.rb
 - lib/liquid/standardfilters.rb
 - lib/liquid/strainer.rb
 - lib/liquid/tag.rb
@@ -52,44 +64,63 @@ files:
 - lib/liquid/tags/include.rb
 - lib/liquid/tags/increment.rb
 - lib/liquid/tags/raw.rb
+- lib/liquid/tags/table_row.rb
 - lib/liquid/tags/unless.rb
 - lib/liquid/template.rb
 - lib/liquid/utils.rb
 - lib/liquid/variable.rb
 - lib/liquid/version.rb
-- test/liquid/assign_test.rb
-- test/liquid/block_test.rb
-- test/liquid/capture_test.rb
-- test/liquid/condition_test.rb
-- test/liquid/context_test.rb
-- test/liquid/drop_test.rb
-- test/liquid/error_handling_test.rb
-- test/liquid/file_system_test.rb
-- test/liquid/filter_test.rb
-- test/liquid/hash_ordering_test.rb
-- test/liquid/module_ex_test.rb
-- test/liquid/output_test.rb
-- test/liquid/parsing_quirks_test.rb
-- test/liquid/regexp_test.rb
-- test/liquid/security_test.rb
-- test/liquid/standard_filter_test.rb
-- test/liquid/strainer_test.rb
-- test/liquid/tags/break_tag_test.rb
-- test/liquid/tags/continue_tag_test.rb
-- test/liquid/tags/for_tag_test.rb
-- test/liquid/tags/html_tag_test.rb
-- test/liquid/tags/if_else_tag_test.rb
-- test/liquid/tags/include_tag_test.rb
-- test/liquid/tags/increment_tag_test.rb
-- test/liquid/tags/raw_tag_test.rb
-- test/liquid/tags/standard_tag_test.rb
-- test/liquid/tags/statements_test.rb
-- test/liquid/tags/unless_else_tag_test.rb
-- test/liquid/template_test.rb
-- test/liquid/variable_test.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
+- 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/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/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/unless_else_tag_test.rb
+- test/integration/template_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
 homepage: http://www.liquidmarkup.org
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -97,49 +128,62 @@ 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.2.3
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A secure, non-evaling end user template engine with aesthetic markup.
 test_files:
-- test/liquid/assign_test.rb
-- test/liquid/block_test.rb
-- test/liquid/capture_test.rb
-- test/liquid/condition_test.rb
-- test/liquid/context_test.rb
-- test/liquid/drop_test.rb
-- test/liquid/error_handling_test.rb
-- test/liquid/file_system_test.rb
-- test/liquid/filter_test.rb
-- test/liquid/hash_ordering_test.rb
-- test/liquid/module_ex_test.rb
-- test/liquid/output_test.rb
-- test/liquid/parsing_quirks_test.rb
-- test/liquid/regexp_test.rb
-- test/liquid/security_test.rb
-- test/liquid/standard_filter_test.rb
-- test/liquid/strainer_test.rb
-- test/liquid/tags/break_tag_test.rb
-- test/liquid/tags/continue_tag_test.rb
-- test/liquid/tags/for_tag_test.rb
-- test/liquid/tags/html_tag_test.rb
-- test/liquid/tags/if_else_tag_test.rb
-- test/liquid/tags/include_tag_test.rb
-- test/liquid/tags/increment_tag_test.rb
-- test/liquid/tags/raw_tag_test.rb
-- test/liquid/tags/standard_tag_test.rb
-- test/liquid/tags/statements_test.rb
-- test/liquid/tags/unless_else_tag_test.rb
-- test/liquid/template_test.rb
-- test/liquid/variable_test.rb
+- 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/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/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/unless_else_tag_test.rb
+- test/integration/template_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

data/lib/extras/liquid_view.rb

@@ -1,51 +0,0 @@
-# LiquidView is a action view extension class. You can register it with rails
-# and use liquid as an template system for .liquid files
-#
-# Example
-#
-#   ActionView::Base::register_template_handler :liquid, LiquidView
-class LiquidView
-  PROTECTED_ASSIGNS = %w( template_root response _session template_class action_name request_origin session template
-                          _response url _request _cookies variables_added _flash params _headers request cookies
-                          ignore_missing_templates flash _params logger before_filter_chain_aborted headers )
-  PROTECTED_INSTANCE_VARIABLES = %w( @_request @controller @_first_render @_memoized__pick_template @view_paths
-                                     @helpers @assigns_added @template @_render_stack @template_format @assigns )
-
-  def self.call(template)
-    "LiquidView.new(self).render(template, local_assigns)"
-  end
-
-  def initialize(view)
-    @view = view
-  end
-
-  def render(template, local_assigns = nil)
-    @view.controller.headers["Content-Type"] ||= 'text/html; charset=utf-8'
-
-    # Rails 2.2 Template has source, but not locals
-    if template.respond_to?(:source) && !template.respond_to?(:locals)
-      assigns = (@view.instance_variables - PROTECTED_INSTANCE_VARIABLES).inject({}) do |hash, ivar|
-                  hash[ivar[1..-1]] = @view.instance_variable_get(ivar)
-                  hash
-                end
-    else
-      assigns = @view.assigns.reject{ |k,v| PROTECTED_ASSIGNS.include?(k) }
-    end
-
-    source = template.respond_to?(:source) ? template.source : template
-    local_assigns = (template.respond_to?(:locals) ? template.locals : local_assigns) || {}
-
-    if content_for_layout = @view.instance_variable_get("@content_for_layout")
-      assigns['content_for_layout'] = content_for_layout
-    end
-    assigns.merge!(local_assigns.stringify_keys)
-
-    liquid = Liquid::Template.parse(source)
-    liquid.render(assigns, :filters => [@view.controller.master_helper_module], :registers => {:action_view => @view, :controller => @view.controller})
-  end
-
-  def compilable?
-    false
-  end
-
-end

data/lib/liquid/htmltags.rb

@@ -1,73 +0,0 @@
-module Liquid
-  class TableRow < Block
-    Syntax = /(\w+)\s+in\s+(#{QuotedFragment}+)/o
-
-    def initialize(tag_name, markup, tokens)
-      if markup =~ Syntax
-        @variable_name = $1
-        @collection_name = $2
-        @attributes = {}
-        markup.scan(TagAttributes) do |key, value|
-          @attributes[key] = value
-        end
-      else
-        raise SyntaxError.new("Syntax Error in 'table_row loop' - Valid syntax: table_row [item] in [collection] cols=3")
-      end
-
-      super
-    end
-
-    def render(context)
-      collection = context[@collection_name] or return ''
-
-      from = @attributes['offset'] ? context[@attributes['offset']].to_i : 0
-      to = @attributes['limit'] ? from + context[@attributes['limit']].to_i : nil
-
-      collection = Utils.slice_collection_using_each(collection, from, to)
-
-      length = collection.length
-
-      cols = context[@attributes['cols']].to_i
-
-      row = 1
-      col = 0
-
-      result = "<tr class=\"row1\">\n"
-      context.stack do
-
-        collection.each_with_index do |item, index|
-          context[@variable_name] = item
-          context['tablerowloop'] = {
-            'length'  => length,
-            'index'   => index + 1,
-            'index0'  => index,
-            'col'     => col + 1,
-            'col0'    => col,
-            'rindex'  => length - index,
-            'rindex0' => length - index - 1,
-            'first'   => (index == 0),
-            'last'    => (index == length - 1),
-            'col_first' => (col == 0),
-            'col_last'  => (col == cols - 1)
-          }
-
-
-          col += 1
-
-          result << "<td class=\"col#{col}\">" << render_all(@nodelist, context) << '</td>'
-
-          if col == cols and (index != length - 1)
-            col  = 0
-            row += 1
-            result << "</tr>\n<tr class=\"row#{row}\">"
-          end
-
-        end
-      end
-      result << "</tr>\n"
-      result
-    end
-  end
-
-  Template.register_tag('tablerow', TableRow)
-end

data/test/liquid/drop_test.rb

@@ -1,180 +0,0 @@
-require 'test_helper'
-
-class ContextDrop < Liquid::Drop
-  def scopes
-    @context.scopes.size
-  end
-
-  def scopes_as_array
-    (1..@context.scopes.size).to_a
-  end
-
-  def loop_pos
-    @context['forloop.index']
-  end
-
-  def before_method(method)
-    return @context[method]
-  end
-end
-
-class ProductDrop < Liquid::Drop
-
-  class TextDrop < Liquid::Drop
-    def array
-      ['text1', 'text2']
-    end
-
-    def text
-      'text1'
-    end
-  end
-
-  class CatchallDrop < Liquid::Drop
-    def before_method(method)
-      return 'method: ' << method.to_s
-    end
-  end
-
-  def texts
-    TextDrop.new
-  end
-
-  def catchall
-    CatchallDrop.new
-  end
-
-  def context
-    ContextDrop.new
-  end
-
-  protected
-    def callmenot
-      "protected"
-    end
-end
-
-class EnumerableDrop < Liquid::Drop
-
-  def size
-    3
-  end
-
-  def each
-    yield 1
-    yield 2
-    yield 3
-  end
-end
-
-class DropsTest < Test::Unit::TestCase
-  include Liquid
-
-  def test_product_drop
-    assert_nothing_raised do
-      tpl = Liquid::Template.parse( '  '  )
-      tpl.render('product' => ProductDrop.new)
-    end
-  end
-
-  def test_drop_does_only_respond_to_whitelisted_methods
-    assert_equal "", Liquid::Template.parse("{{ product.inspect }}").render('product' => ProductDrop.new)
-    assert_equal "", Liquid::Template.parse("{{ product.pretty_inspect }}").render('product' => ProductDrop.new)
-    assert_equal "", Liquid::Template.parse("{{ product.whatever }}").render('product' => ProductDrop.new)
-    assert_equal "", Liquid::Template.parse('{{ product | map: "inspect" }}').render('product' => ProductDrop.new)
-    assert_equal "", Liquid::Template.parse('{{ product | map: "pretty_inspect" }}').render('product' => ProductDrop.new)
-    assert_equal "", Liquid::Template.parse('{{ product | map: "whatever" }}').render('product' => ProductDrop.new)
-  end
-
-  def test_drops_respond_to_to_liquid
-    assert_equal "text1", Liquid::Template.parse("{{ product.to_liquid.texts.text }}").render('product' => ProductDrop.new)
-    assert_equal "text1", Liquid::Template.parse('{{ product | map: "to_liquid" | map: "texts" | map: "text" }}').render('product' => ProductDrop.new)
-  end
-
-  def test_text_drop
-    output = Liquid::Template.parse( ' {{ product.texts.text }} '  ).render('product' => ProductDrop.new)
-    assert_equal ' text1 ', output
-  end
-
-  def test_unknown_method
-    output = Liquid::Template.parse( ' {{ product.catchall.unknown }} '  ).render('product' => ProductDrop.new)
-    assert_equal ' method: unknown ', output
-  end
-
-  def test_integer_argument_drop
-    output = Liquid::Template.parse( ' {{ product.catchall[8] }} '  ).render('product' => ProductDrop.new)
-    assert_equal ' method: 8 ', output
-  end
-
-  def test_text_array_drop
-    output = Liquid::Template.parse( '{% for text in product.texts.array %} {{text}} {% endfor %}'  ).render('product' => ProductDrop.new)
-    assert_equal ' text1  text2 ', output
-  end
-
-  def test_context_drop
-    output = Liquid::Template.parse( ' {{ context.bar }} '  ).render('context' => ContextDrop.new, 'bar' => "carrot")
-    assert_equal ' carrot ', output
-  end
-
-  def test_nested_context_drop
-    output = Liquid::Template.parse( ' {{ product.context.foo }} '  ).render('product' => ProductDrop.new, 'foo' => "monkey")
-    assert_equal ' monkey ', output
-  end
-
-  def test_protected
-    output = Liquid::Template.parse( ' {{ product.callmenot }} '  ).render('product' => ProductDrop.new)
-    assert_equal '  ', output
-  end
-
-  def test_object_methods_not_allowed
-    [:dup, :clone, :singleton_class, :eval, :class_eval, :inspect].each do |method|
-      output = Liquid::Template.parse(" {{ product.#{method} }} ").render('product' => ProductDrop.new)
-      assert_equal '  ', output
-    end
-  end
-
-  def test_scope
-    assert_equal '1', Liquid::Template.parse( '{{ context.scopes }}'  ).render('context' => ContextDrop.new)
-    assert_equal '2', Liquid::Template.parse( '{%for i in dummy%}{{ context.scopes }}{%endfor%}'  ).render('context' => ContextDrop.new, 'dummy' => [1])
-    assert_equal '3', Liquid::Template.parse( '{%for i in dummy%}{%for i in dummy%}{{ context.scopes }}{%endfor%}{%endfor%}'  ).render('context' => ContextDrop.new, 'dummy' => [1])
-  end
-
-  def test_scope_though_proc
-    assert_equal '1', Liquid::Template.parse( '{{ s }}'  ).render('context' => ContextDrop.new, 's' => Proc.new{|c| c['context.scopes'] })
-    assert_equal '2', Liquid::Template.parse( '{%for i in dummy%}{{ s }}{%endfor%}'  ).render('context' => ContextDrop.new, 's' => Proc.new{|c| c['context.scopes'] }, 'dummy' => [1])
-    assert_equal '3', Liquid::Template.parse( '{%for i in dummy%}{%for i in dummy%}{{ s }}{%endfor%}{%endfor%}'  ).render('context' => ContextDrop.new, 's' => Proc.new{|c| c['context.scopes'] }, 'dummy' => [1])
-  end
-
-  def test_scope_with_assigns
-    assert_equal 'variable', Liquid::Template.parse( '{% assign a = "variable"%}{{a}}'  ).render('context' => ContextDrop.new)
-    assert_equal 'variable', Liquid::Template.parse( '{% assign a = "variable"%}{%for i in dummy%}{{a}}{%endfor%}'  ).render('context' => ContextDrop.new, 'dummy' => [1])
-    assert_equal 'test', Liquid::Template.parse( '{% assign header_gif = "test"%}{{header_gif}}'  ).render('context' => ContextDrop.new)
-    assert_equal 'test', Liquid::Template.parse( "{% assign header_gif = 'test'%}{{header_gif}}"  ).render('context' => ContextDrop.new)
-  end
-
-  def test_scope_from_tags
-    assert_equal '1', Liquid::Template.parse( '{% for i in context.scopes_as_array %}{{i}}{% endfor %}'  ).render('context' => ContextDrop.new, 'dummy' => [1])
-    assert_equal '12', Liquid::Template.parse( '{%for a in dummy%}{% for i in context.scopes_as_array %}{{i}}{% endfor %}{% endfor %}'  ).render('context' => ContextDrop.new, 'dummy' => [1])
-    assert_equal '123', Liquid::Template.parse( '{%for a in dummy%}{%for a in dummy%}{% for i in context.scopes_as_array %}{{i}}{% endfor %}{% endfor %}{% endfor %}'  ).render('context' => ContextDrop.new, 'dummy' => [1])
-  end
-
-  def test_access_context_from_drop
-    assert_equal '123', Liquid::Template.parse( '{%for a in dummy%}{{ context.loop_pos }}{% endfor %}'  ).render('context' => ContextDrop.new, 'dummy' => [1,2,3])
-  end
-
-  def test_enumerable_drop
-    assert_equal '123', Liquid::Template.parse( '{% for c in collection %}{{c}}{% endfor %}').render('collection' => EnumerableDrop.new)
-  end
-
-  def test_enumerable_drop_size
-    assert_equal '3', Liquid::Template.parse( '{{collection.size}}').render('collection' => EnumerableDrop.new)
-  end
-
-  def test_empty_string_value_access
-    assert_equal '', Liquid::Template.parse('{{ product[value] }}').render('product' => ProductDrop.new, 'value' => '')
-  end
-
-  def test_nil_value_access
-    assert_equal '', Liquid::Template.parse('{{ product[value] }}').render('product' => ProductDrop.new, 'value' => nil)
-  end
-end # DropsTest