liquid-tag-parser 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3ea6a7f6eeb0ef34a869786c7c4d131a49020ef
-  data.tar.gz: 0f46918e58b9a95ee759fe72e511ea09ba00b67d
+  metadata.gz: ed525307344e34bf3973bfdec1cafa204c415444
+  data.tar.gz: 738a4cfc00bddcd073551a21e2328f7930451ef5
 SHA512:
-  metadata.gz: f669d5adcdacba96e329474467f4edb7be5acd9ee333df5509539c5eb62912c65a77217588f2a9e31d23c6d5cd6775f5fd501e899f54b51d20d9e490f3b5982c
-  data.tar.gz: 4e71217fa8d2789934f09f96c003687740c1ee2d56dae3844164b9d8b7097e5a52785f8e59bd3515cc2b356b7ce114013a1ada912c759f6536be6956124fcd29
+  metadata.gz: 863073381e60b53b0390d588b65799bb38250411e5ce26dfb4a5aa89a4123705fe6feaacf611f6fe1ba33085cca1d65b8ba9a85d145dec039183f467d3bab5c6
+  data.tar.gz: 8e8e8004f69e6f085714ae6634bd5e41e2b323ff8d26120b24ffa0bd8c91ba0ca3a0b711411cdf474a6c0c75fa10415faf1424a294060b70217c5d1acf7a866e

data/lib/liquid/tag/parser.rb

@@ -26,13 +26,17 @@ module Liquid
       rb_delegate :args_with_indifferent_access, to: :@args, \
         alias_of: :with_indifferent_access
 
-      # --
-      BOOLEAN_REGEXP = /^(?<!\\)(\!|@)/
-      NEGATIVE_BOOLEAN_REGEXP = /^(?<!\\)\!/
-      POSITIVE_BOOLEAN_REGEXP = /^(?<!\\)\@/
-      KEY_REGEXP = /\b(?<!\\):/
+      FLOAT = /^\d+\.\d+$/
+      BOOLEAN = /^(?<!\\)(\!|@)/
+      NEGATIVE_BOOLEAN = /^(?<!\\)\!/
+      BOOLEAN_QUOTE_REPLACEMENT = "\\1\\\\\\2"
+      SHELLSPLIT = /\G\s*(?>([^\s\\\'\"]+)|'([^\']*)'|"((?:[^\"\\]|\\.)*)"|(\\.?)|(\S))(\s|\z)?/m
+      BOOLEAN_QUOTE = /^('|")((?<!\\)@|(?<!\\)\!)/
+      POSITIVE_BOOLEAN = /^(?<!\\)\@/
+      ESCAPED_BOOLEAN = /\\(@|\!)/
+      KEY = /\b(?<!\\):/
+      INT = /^\d+$/
 
-      # --
       def initialize(raw, defaults: {}, sep: "=")
         @sep = sep
         @rsep = Regexp.escape(sep)
@@ -46,12 +50,13 @@ module Liquid
         parse
       end
 
-      # --
       def to_html(skip: [], hash: false)
         out = @args.each_with_object(hash ? {} : []) do |(k, v), o|
-          next if k == :argv1 || skip.include?(k) ||
-            v == false || v.is_a?(Hash) ||
-            v.is_a?(Array)
+          next if k == :argv1
+          next if v.is_a?(Array)
+          next if skip.include?(k)
+          next if v.is_a?(Hash)
+          next if v == false
 
           o[k] = v if hash
           unless hash
@@ -62,28 +67,32 @@ module Liquid
         hash ? out : out.join(" ")
       end
 
-      # --
       private
-      def parse
-        args, hash = from_shellwords, {}
-        if args.first !~ BOOLEAN_REGEXP && args.first !~ KEY_REGEXP \
-        && args.first !~ @sep_regexp
+      def argv1(args)
+        val = args[0]
+        hash = {}
 
+        # !"@true" && !"key1:key2=val" but "argv1 @true key1:key2=val"
+        if val !~ BOOLEAN && val !~ KEY && val !~ @sep_regexp
           hash = {
-            :argv1 => args.delete_at(0)
+            argv1: args.delete_at(0)
           }
         end
 
+        return args, hash
+      end
+
+      private
+      def parse
+        args, hash = argv1(from_shellwords)
         @args = @defaults.deep_merge(args.each_with_object(hash) do |k, h, out = h|
           keys, _, val = k.rpartition(@sep_regexp)
 
-          val  = val.gsub(@escaped_sep_regexp, @sep)
-          if keys.empty? && val =~ BOOLEAN_REGEXP
-            # @true, @false will not map right.
-            keys = val.gsub(BOOLEAN_REGEXP, "")
-          end
+          val  = val.gsub(@escaped_sep_regexp, @sep) # Unescape \\=
+          keys = val.gsub(BOOLEAN, "") if keys.empty? && val =~ BOOLEAN # @true
+          keys,  val = val, nil if keys.empty? # key val
+          keys = keys.split(KEY).map(&:to_sym)
 
-          keys = keys.split(KEY_REGEXP).map(&:to_sym)
           if keys.size > 1
             h = h[keys[0]] ||= {}
             keys[1...-1].each do |sk|
@@ -91,29 +100,54 @@ module Liquid
             end
           end
 
-          val = false if val == "false"
-          val = val.to_f if val =~ /^\d+\.\d+$/
-          val = false if val =~ NEGATIVE_BOOLEAN_REGEXP
-          val = true  if val =~ POSITIVE_BOOLEAN_REGEXP
-          val = val.to_i if val =~ /^\d+$/
-          val = true if val == "true"
+          val = val.to_i if val =~ INT # key=1
+          val = val.to_f if val =~ FLOAT # key=0.1
+          val = false    if val == "false" # key=false
+          val = false    if val =~ NEGATIVE_BOOLEAN # !false
+          val = true     if val =~ POSITIVE_BOOLEAN # @true
+          val = true     if val == "true" # key=true
+
+          if val.is_a?(String)
+            then val = val.gsub(ESCAPED_BOOLEAN, "\\1")
+          end
 
           key = keys.last.to_sym
           h[key] << val if h[key].is_a?(Array)
-          h[key] = [h[key]] << val if h[key]
+          h[key] = [h[key]].flatten << val if h[key] && !h[key].is_a?(Array)
           h[key] = val unless h[key]
 
           out
         end)
       end
 
-      # --
       private
       def from_shellwords
-        Shellwords.shellwords(@raw.gsub(/('|")([^\1]+)\1/) do |v|
-          v.gsub(@sep_regexp, @escaped_sep)
+        shellsplit(@raw.gsub(/('|")([^\1]+)\1/) do |v|
+          v.gsub(BOOLEAN_QUOTE, BOOLEAN_QUOTE_REPLACEMENT).gsub(@sep_regexp, @escaped_sep)
         end)
       end
+
+      # Because Shellwords.shellwords on < 2.4 has problems
+      # with quotes and \\, we ported this back, this pretty
+      # much the same thing except we replace some of the
+      # questionable code like `String.new`
+      private
+      def shellsplit(line)
+        out, field = [], ""
+
+        line.scan(SHELLSPLIT) do |w, s, d, e, g, se|
+          raise ArgumentError, "Unmatched double quote: #{line.inspect}" if g
+            field = field + (w || s || (d && d.gsub(/\\([$`"\\\n])/, '\\1')) \
+            || e.gsub(/\\(.)/, '\\1'))
+
+          if se
+            out << field
+            field = ""
+          end
+        end
+
+        out
+      end
     end
   end
 end

data/lib/liquid/tag/parser/version.rb

@@ -5,7 +5,7 @@
 module Liquid
   class Tag
     class Parser
-      VERSION = "1.3.0"
+      VERSION = "1.4.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: liquid-tag-parser
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Jordon Bedwell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-07 00:00:00.000000000 Z
+date: 2017-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Parse liquid tags like a professional