liquid 2.6.3 → 5.4.0

data/lib/liquid/variable.rb

@@ -1,5 +1,6 @@
-module Liquid
+# frozen_string_literal: true
 
+module Liquid
   # Holds variables. Variables are only loaded "just in time"
   # and are not evaluated as part of the render stage
   #
@@ -11,46 +12,141 @@ module Liquid
   #   {{ user | link }}
   #
   class Variable
-    FilterParser = /(?:#{FilterSeparator}|(?:\s*(?:#{QuotedFragment}|#{ArgumentSeparator})\s*)+)/o
-    attr_accessor :filters, :name
+    FilterMarkupRegex        = /#{FilterSeparator}\s*(.*)/om
+    FilterParser             = /(?:\s+|#{QuotedFragment}|#{ArgumentSeparator})+/o
+    FilterArgsRegex          = /(?:#{FilterArgumentSeparator}|#{ArgumentSeparator})\s*((?:\w+\s*\:\s*)?#{QuotedFragment})/o
+    JustTagAttributes        = /\A#{TagAttributes}\z/o
+    MarkupWithQuotedFragment = /(#{QuotedFragment})(.*)/om
+
+    attr_accessor :filters, :name, :line_number
+    attr_reader :parse_context
+    alias_method :options, :parse_context
+
+    include ParserSwitching
+
+    def initialize(markup, parse_context)
+      @markup        = markup
+      @name          = nil
+      @parse_context = parse_context
+      @line_number   = parse_context.line_number
+
+      strict_parse_with_error_mode_fallback(markup)
+    end
+
+    def raw
+      @markup
+    end
+
+    def markup_context(markup)
+      "in \"{{#{markup}}}\""
+    end
 
-    def initialize(markup)
-      @markup  = markup
-      @name    = nil
+    def lax_parse(markup)
       @filters = []
-      if match = markup.match(/\s*(#{QuotedFragment})(.*)/o)
-        @name = match[1]
-        if match[2].match(/#{FilterSeparator}\s*(.*)/o)
-          filters = Regexp.last_match(1).scan(FilterParser)
-          filters.each do |f|
-            if matches = f.match(/\s*(\w+)/)
-              filtername = matches[1]
-              filterargs = f.scan(/(?:#{FilterArgumentSeparator}|#{ArgumentSeparator})\s*((?:\w+\s*\:\s*)?#{QuotedFragment})/o).flatten
-              @filters << [filtername, filterargs]
-            end
-          end
+      return unless markup =~ MarkupWithQuotedFragment
+
+      name_markup   = Regexp.last_match(1)
+      filter_markup = Regexp.last_match(2)
+      @name         = parse_context.parse_expression(name_markup)
+      if filter_markup =~ FilterMarkupRegex
+        filters = Regexp.last_match(1).scan(FilterParser)
+        filters.each do |f|
+          next unless f =~ /\w+/
+          filtername = Regexp.last_match(0)
+          filterargs = f.scan(FilterArgsRegex).flatten
+          @filters << parse_filter_expressions(filtername, filterargs)
         end
       end
     end
 
+    def strict_parse(markup)
+      @filters = []
+      p = Parser.new(markup)
+
+      return if p.look(:end_of_string)
+
+      @name = parse_context.parse_expression(p.expression)
+      while p.consume?(:pipe)
+        filtername = p.consume(:id)
+        filterargs = p.consume?(:colon) ? parse_filterargs(p) : []
+        @filters << parse_filter_expressions(filtername, filterargs)
+      end
+      p.consume(:end_of_string)
+    end
+
+    def parse_filterargs(p)
+      # first argument
+      filterargs = [p.argument]
+      # followed by comma separated others
+      filterargs << p.argument while p.consume?(:comma)
+      filterargs
+    end
+
     def render(context)
-      return '' if @name.nil?
-      @filters.inject(context[@name]) do |output, filter|
-        filterargs = []
-        keyword_args = {}
-        filter[1].to_a.each do |a|
-          if matches = a.match(/\A#{TagAttributes}\z/o)
-            keyword_args[matches[1]] = context[matches[2]]
-          else
-            filterargs << context[a]
-          end
+      obj = context.evaluate(@name)
+
+      @filters.each do |filter_name, filter_args, filter_kwargs|
+        filter_args = evaluate_filter_expressions(context, filter_args, filter_kwargs)
+        obj = context.invoke(filter_name, obj, *filter_args)
+      end
+
+      context.apply_global_filter(obj)
+    end
+
+    def render_to_output_buffer(context, output)
+      obj = render(context)
+
+      if obj.is_a?(Array)
+        output << obj.join
+      elsif obj.nil?
+      else
+        output << obj.to_s
+      end
+
+      output
+    end
+
+    def disabled?(_context)
+      false
+    end
+
+    def disabled_tags
+      []
+    end
+
+    private
+
+    def parse_filter_expressions(filter_name, unparsed_args)
+      filter_args  = []
+      keyword_args = nil
+      unparsed_args.each do |a|
+        if (matches = a.match(JustTagAttributes))
+          keyword_args           ||= {}
+          keyword_args[matches[1]] = parse_context.parse_expression(matches[2])
+        else
+          filter_args << parse_context.parse_expression(a)
         end
-        filterargs << keyword_args unless keyword_args.empty?
-        begin
-          output = context.invoke(filter[0], output, *filterargs)
-        rescue FilterNotFound
-          raise FilterNotFound, "Error - filter '#{filter[0]}' in '#{@markup.strip}' could not be found."
+      end
+      result = [filter_name, filter_args]
+      result << keyword_args if keyword_args
+      result
+    end
+
+    def evaluate_filter_expressions(context, filter_args, filter_kwargs)
+      parsed_args = filter_args.map { |expr| context.evaluate(expr) }
+      if filter_kwargs
+        parsed_kwargs = {}
+        filter_kwargs.each do |key, expr|
+          parsed_kwargs[key] = context.evaluate(expr)
         end
+        parsed_args << parsed_kwargs
+      end
+      parsed_args
+    end
+
+    class ParseTreeVisitor < Liquid::ParseTreeVisitor
+      def children
+        [@node.name] + @node.filters.flatten
       end
     end
   end

data/lib/liquid/variable_lookup.rb

@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+
+module Liquid
+  class VariableLookup
+    COMMAND_METHODS = ['size', 'first', 'last'].freeze
+
+    attr_reader :name, :lookups
+
+    def self.parse(markup)
+      new(markup)
+    end
+
+    def initialize(markup)
+      lookups = markup.scan(VariableParser)
+
+      name = lookups.shift
+      if name&.start_with?('[') && name&.end_with?(']')
+        name = Expression.parse(name[1..-2])
+      end
+      @name = name
+
+      @lookups       = lookups
+      @command_flags = 0
+
+      @lookups.each_index do |i|
+        lookup = lookups[i]
+        if lookup&.start_with?('[') && lookup&.end_with?(']')
+          lookups[i] = Expression.parse(lookup[1..-2])
+        elsif COMMAND_METHODS.include?(lookup)
+          @command_flags |= 1 << i
+        end
+      end
+    end
+
+    def lookup_command?(lookup_index)
+      @command_flags & (1 << lookup_index) != 0
+    end
+
+    def evaluate(context)
+      name   = context.evaluate(@name)
+      object = context.find_variable(name)
+
+      @lookups.each_index do |i|
+        key = context.evaluate(@lookups[i])
+
+        # Cast "key" to its liquid value to enable it to act as a primitive value
+        key = Liquid::Utils.to_liquid_value(key)
+
+        # If object is a hash- or array-like object we look for the
+        # presence of the key and if its available we return it
+        if object.respond_to?(:[]) &&
+            ((object.respond_to?(:key?) && object.key?(key)) ||
+             (object.respond_to?(:fetch) && key.is_a?(Integer)))
+
+          # if its a proc we will replace the entry with the proc
+          res    = context.lookup_and_evaluate(object, key)
+          object = res.to_liquid
+
+          # Some special cases. If the part wasn't in square brackets and
+          # no key with the same name was found we interpret following calls
+          # as commands and call them on the current object
+        elsif lookup_command?(i) && object.respond_to?(key)
+          object = object.send(key).to_liquid
+
+          # No key was present with the desired value and it wasn't one of the directly supported
+          # keywords either. The only thing we got left is to return nil or
+          # raise an exception if `strict_variables` option is set to true
+        else
+          return nil unless context.strict_variables
+          raise Liquid::UndefinedVariable, "undefined variable #{key}"
+        end
+
+        # If we are dealing with a drop here we have to
+        object.context = context if object.respond_to?(:context=)
+      end
+
+      object
+    end
+
+    def ==(other)
+      self.class == other.class && state == other.state
+    end
+
+    protected
+
+    def state
+      [@name, @lookups, @command_flags]
+    end
+
+    class ParseTreeVisitor < Liquid::ParseTreeVisitor
+      def children
+        @node.lookups
+      end
+    end
+  end
+end

data/lib/liquid/version.rb

@@ -1,4 +1,6 @@
 # encoding: utf-8
+# frozen_string_literal: true
+
 module Liquid
-  VERSION = "2.6.3"
+  VERSION = "5.4.0"
 end

data/lib/liquid.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2005 Tobias Luetke
 #
 # Permission is hereby granted, free of charge, to any person obtaining
@@ -24,8 +26,10 @@ module Liquid
   ArgumentSeparator           = ','
   FilterArgumentSeparator     = ':'
   VariableAttributeSeparator  = '.'
+  WhitespaceControl           = '-'
   TagStart                    = /\{\%/
   TagEnd                      = /\%\}/
+  TagName                     = /#|\w+/
   VariableSignature           = /\(?[\w\-\.\[\]]\)?/
   VariableSegment             = /[\w\-]/
   VariableStart               = /\{\{/
@@ -33,37 +37,56 @@ module Liquid
   VariableIncompleteEnd       = /\}\}?/
   QuotedString                = /"[^"]*"|'[^']*'/
   QuotedFragment              = /#{QuotedString}|(?:[^\s,\|'"]|#{QuotedString})+/o
-  StrictQuotedFragment        = /"[^"]+"|'[^']+'|[^\s|:,]+/
-  FirstFilterArgument         = /#{FilterArgumentSeparator}(?:#{StrictQuotedFragment})/o
-  OtherFilterArgument         = /#{ArgumentSeparator}(?:#{StrictQuotedFragment})/o
-  SpacelessFilter             = /^(?:'[^']+'|"[^"]+"|[^'"])*#{FilterSeparator}(?:#{StrictQuotedFragment})(?:#{FirstFilterArgument}(?:#{OtherFilterArgument})*)?/o
-  Expression                  = /(?:#{QuotedFragment}(?:#{SpacelessFilter})*)/o
-  TagAttributes               = /(\w+)\s*\:\s*(#{QuotedFragment})/o
-  AnyStartingTag              = /\{\{|\{\%/
-  PartialTemplateParser       = /#{TagStart}.*?#{TagEnd}|#{VariableStart}.*?#{VariableIncompleteEnd}/o
-  TemplateParser              = /(#{PartialTemplateParser}|#{AnyStartingTag})/o
+  TagAttributes               = /(\w[\w-]*)\s*\:\s*(#{QuotedFragment})/o
+  AnyStartingTag              = /#{TagStart}|#{VariableStart}/o
+  PartialTemplateParser       = /#{TagStart}.*?#{TagEnd}|#{VariableStart}.*?#{VariableIncompleteEnd}/om
+  TemplateParser              = /(#{PartialTemplateParser}|#{AnyStartingTag})/om
   VariableParser              = /\[[^\]]+\]|#{VariableSegment}+\??/o
+
+  RAISE_EXCEPTION_LAMBDA = ->(_e) { raise }
+
+  singleton_class.send(:attr_accessor, :cache_classes)
+  self.cache_classes = true
 end
 
 require "liquid/version"
+require 'liquid/parse_tree_visitor'
+require 'liquid/lexer'
+require 'liquid/parser'
+require 'liquid/i18n'
 require 'liquid/drop'
+require 'liquid/tablerowloop_drop'
+require 'liquid/forloop_drop'
 require 'liquid/extensions'
 require 'liquid/errors'
 require 'liquid/interrupts'
-require 'liquid/strainer'
+require 'liquid/strainer_template'
+require 'liquid/strainer_factory'
+require 'liquid/expression'
 require 'liquid/context'
+require 'liquid/parser_switching'
 require 'liquid/tag'
+require 'liquid/tag/disabler'
+require 'liquid/tag/disableable'
 require 'liquid/block'
+require 'liquid/block_body'
 require 'liquid/document'
 require 'liquid/variable'
+require 'liquid/variable_lookup'
+require 'liquid/range_lookup'
 require 'liquid/file_system'
+require 'liquid/resource_limits'
 require 'liquid/template'
-require 'liquid/htmltags'
 require 'liquid/standardfilters'
 require 'liquid/condition'
-require 'liquid/module_ex'
 require 'liquid/utils'
+require 'liquid/tokenizer'
+require 'liquid/parse_context'
+require 'liquid/partial_cache'
+require 'liquid/usage'
+require 'liquid/registers'
+require 'liquid/template_factory'
 
 # Load all the tags of the standard library
 #
-Dir[File.dirname(__FILE__) + '/liquid/tags/*.rb'].each { |f| require f }
+Dir["#{__dir__}/liquid/tags/*.rb"].each { |f| require f }

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: liquid
 version: !ruby/object:Gem::Version
-  version: 2.6.3
+  version: 5.4.0
 platform: ruby
 authors:
-- Tobias Luetke
+- Tobias Lütke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
-dependencies: []
+date: 2022-07-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.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: 
 email:
 - tobi@leetsoft.com
@@ -20,24 +48,41 @@ extra_rdoc_files:
 - README.md
 files:
 - History.md
-- MIT-LICENSE
+- LICENSE
 - README.md
-- lib/extras/liquid_view.rb
 - 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/htmltags.rb
+- lib/liquid/forloop_drop.rb
+- lib/liquid/i18n.rb
 - lib/liquid/interrupts.rb
-- lib/liquid/module_ex.rb
+- lib/liquid/lexer.rb
+- lib/liquid/locales/en.yml
+- lib/liquid/parse_context.rb
+- lib/liquid/parse_tree_visitor.rb
+- lib/liquid/parser.rb
+- lib/liquid/parser_switching.rb
+- lib/liquid/partial_cache.rb
+- lib/liquid/profiler.rb
+- lib/liquid/profiler/hooks.rb
+- lib/liquid/range_lookup.rb
+- lib/liquid/registers.rb
+- lib/liquid/resource_limits.rb
 - lib/liquid/standardfilters.rb
-- lib/liquid/strainer.rb
+- lib/liquid/strainer_factory.rb
+- lib/liquid/strainer_template.rb
+- lib/liquid/tablerowloop_drop.rb
 - lib/liquid/tag.rb
+- lib/liquid/tag/disableable.rb
+- lib/liquid/tag/disabler.rb
 - lib/liquid/tags/assign.rb
 - lib/liquid/tags/break.rb
 - lib/liquid/tags/capture.rb
@@ -46,51 +91,30 @@ files:
 - lib/liquid/tags/continue.rb
 - lib/liquid/tags/cycle.rb
 - lib/liquid/tags/decrement.rb
+- lib/liquid/tags/echo.rb
 - lib/liquid/tags/for.rb
 - lib/liquid/tags/if.rb
 - lib/liquid/tags/ifchanged.rb
 - lib/liquid/tags/include.rb
 - lib/liquid/tags/increment.rb
+- lib/liquid/tags/inline_comment.rb
 - lib/liquid/tags/raw.rb
+- lib/liquid/tags/render.rb
+- lib/liquid/tags/table_row.rb
 - lib/liquid/tags/unless.rb
 - lib/liquid/template.rb
+- lib/liquid/template_factory.rb
+- lib/liquid/tokenizer.rb
+- lib/liquid/usage.rb
 - lib/liquid/utils.rb
 - lib/liquid/variable.rb
+- lib/liquid/variable_lookup.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
-- test/test_helper.rb
 homepage: http://www.liquidmarkup.org
-licenses: []
-metadata: {}
+licenses:
+- MIT
+metadata:
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -99,47 +123,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.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: 3.3.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/test_helper.rb
+test_files: []

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