liquid-tag-parser 1.9.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95964cbed02140b5f9a010ffbf65a105e56f90f84802e9db66e261dfa076990b
-  data.tar.gz: 187f06b17685649c3413b2a6b5b04685b32bf4d1c2a4bc51077b9526020fa79f
+  metadata.gz: 3f793bd6e940a4bb73c68c1db50d5e702526e46e37c1b2cea3be739ec6b077df
+  data.tar.gz: ac8132ca543f70e5a2f5624e3f32b27941463180330a21676097a7daa79e2a71
 SHA512:
-  metadata.gz: 7b3217969525dcb1a7909678eae91124b2ab0e794be553fcfa7e3a7faa24b2137f918fa24b6988cdc8f88a38ea158458c37aa00a7c155f25468eb062f3e432bc
-  data.tar.gz: 0ab6f3201ad06af9145bf3e94274b0e85946633707450d7af2bb2991869d08e54732d42b1aafcacb9ef7ef2a96c1735e8de62daf96fac621acffd923b735c67f
+  metadata.gz: def93bb9961d3281023246070b8d4fa8bfe7d402b19d1678ba3ab31c191ae6fca4343596287c2782c793c9ca0309cdb16977751fcb531c57065a777c420ad02e
+  data.tar.gz: fcaa8a00be1c9ef020d3d8eb5a51ad0cb3e2f3d9957d2cfb287e897c30b815865c1c4e4e4a56838fbbf11850e92f30687631bac2e155b54d0f6acf0c953d5471

data/Gemfile

@@ -1,10 +1,11 @@
 # Frozen-string-literal: true
-# Copyright: 2017 Jordon Bedwell - MIT License
+# Copyright: 2017 - 2020 - ISC License
+# Author: Jordon Bedwell
 # Encoding: utf-8
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 gemspec
 
-if ENV["LIQUID_VERSION"]
-  gem "liquid", ENV["LIQUID_VERSION"]
+if ENV.key?('LIQUID_VERSION')
+  gem 'liquid', ENV['LIQUID_VERSION']
 end

data/lib/liquid-tag-parser.rb

@@ -0,0 +1,6 @@
+# Frozen-string-literal: true
+# Copyright: 2017 - 2020 - ISC License
+# Author: Jordon Bedwell
+# Encoding: utf-8
+
+require_relative 'liquid/tag/parser'

data/lib/liquid/tag/parser.rb

@@ -1,58 +1,51 @@
 # Frozen-string-literal: true
-# Copyright: 2017 - 2018 - MIT License
+# Copyright: 2017 - 2020 - ISC License
 # Author: Jordon Bedwell
 # Encoding: utf-8
 
-require "extras/hash"
-require "forwardable/extended"
-require "liquid"
+require 'extras/hash'
+require 'liquid'
 
 module Liquid
   class Tag
     class Parser
       attr_reader :args
-      extend Forwardable::Extended
       alias raw_args args
-
-      # --
-      rb_delegate :each,              to: :@args
-      rb_delegate :key?,              to: :@args
-      rb_delegate :to_h,              to: :@args
-      rb_delegate :each_key,          to: :@args
-      rb_delegate :each_with_object,  to: :@args
-      rb_delegate :each_value,        to: :@args
-      rb_delegate :values_at,         to: :@args
-      rb_delegate :to_enum,           to: :@args
-      rb_delegate :map,               to: :@args
-      rb_delegate :[]=,               to: :@args
-      rb_delegate :[],                to: :@args
-      rb_delegate :merge,             to: :@args
-      rb_delegate :merge!,            to: :@args
-      rb_delegate :deep_merge,        to: :@args
-      rb_delegate :deep_merge!,       to: :@args
-      rb_delegate :select,            to: :@args
-      rb_delegate :args_with_indifferent_access, {
-        to: :@args, alias_of: :with_indifferent_access
-      }
-
-      # --
-      FALSE = "!"
-      FLOAT = %r!\A\d+\.\d+\Z!
-      QUOTE = %r!("|')([^\1]*)(\1)!
-      SPECIAL = %r{(?<!\\)(@|!|:|=)}
-      BOOL = %r{\A(?<!\\)(!|@)([\w:]+)\Z}
-      UNQUOTED_SPECIAL = %r{(?<!\\)(://)}
-      SPECIAL_ESCAPED = %r{\\(@|!|:|=)}
-      KEY = %r{\b(?<!\\):}
-      INT = %r!^\d+$!
-      TRUE = "@"
-
-      # This is taken from Ruby 2.4 standard library.
-      SHELLSPLIT = %r!\G\s*(?>([^\s\\\'\"]+)|'([^\']*)'|"((?:[^\"\\]|
-        \\.)*)"|(\\.?)|(\S))(\s|\z)?!mx
-
-      # --
-      def initialize(raw, defaults: {}, sep: "=")
+      extend Forwardable
+
+      def_delegator :@args, :each
+      def_delegator :@args, :key?
+      def_delegator :@args, :to_h
+      def_delegator :@args, :each_key
+      def_delegator :@args, :each_with_object
+      def_delegator :@args, :each_value
+      def_delegator :@args, :values_at
+      def_delegator :@args, :to_enum
+      def_delegator :@args, :map
+      def_delegator :@args, :[]=
+      def_delegator :@args, :[]
+      def_delegator :@args, :merge
+      def_delegator :@args, :merge!
+      def_delegator :@args, :deep_merge
+      def_delegator :@args, :deep_merge!
+      def_delegator :@args, :update
+      def_delegator :@args, :select
+      def_delegator :@args, :find
+      def_delegator :@args, :dig
+
+      # --
+      FALSE = '!'
+      FLOAT = %r!\A\d+\.\d+\Z!.freeze
+      QUOTE = %r!(["'])([^\1]*)(\1)!.freeze
+      SPECIAL = %r{(?<!\\)([@!:=])}.freeze
+      BOOL = %r{\A(?<!\\)([!@])([\w:]+)\z}.freeze
+      UNQUOTED_SPECIAL = %r{(?<!\\)(://)}.freeze
+      SPECIAL_ESCAPED = %r{\\([@!:=])}.freeze
+      KEY = %r{\b(?<!\\):}.freeze
+      INT = %r!^\d+$!.freeze
+      TRUE = '@'
+
+      def initialize(raw, defaults: {}, sep: '=')
         @sep = sep
         @unescaped_sep = sep
         @rsep = Regexp.escape(sep)
@@ -65,84 +58,107 @@ module Liquid
         parse
       end
 
-      # --
+      #
       # Consumes a block and wraps around reusably on arguments.
       # @return [Hash<Symbol,Object>,Array<String>]
-      # --
+      #
       def skippable_loop(skip: [], hash: false)
-        @args.each_with_object(hash ? {} : []) do |(k, v), o|
-          skip_in_html?(k: k, v: v, skips: skip) ? next : yield([k, v], o)
+        @args.each_with_object(hash ? {} : []) do |(key, val), obj|
+          next obj if skip_in_html?(key: key, val: val, skips: skip)
+          yield(
+            [
+              key,
+              val
+            ],
+            obj
+          )
         end
       end
 
-      # --
+      #
       # @param [Array<Symbol>] skip keys to skip.
       # Converts the arguments into an HTML attribute string.
       # @return [String]
-      # --
+      #
       def to_html(skip: [])
         skippable_loop(skip: skip, hash: false) do |(k, v), o|
           o << (v == true ? k.to_s : "#{k}=\"#{v}\"")
-        end.join(" ")
+        end.join(' ')
       end
 
-      # --
+      #
+      # indifferent args as a hash
+      # @note this will require you to have ActiveSupport
+      # @return [HashWithIndifferentAccess]
+      #
+      def args_with_indifferent_access
+        @args.send(
+          :with_indifferent_access
+        )
+      end
+
+      #
       # @param [Array<Symbol>] skip keys to skip.
-      # @param [true,false] for_html skip non-html values.
+      # @param [true,false] html skip non-html values.
       # Converts arguments into an HTML hash (or to arguments).
-      # @return [Hash]
-      # --
+      # @return [Hash<Object>,Array<String>]
+      #
       def to_h(skip: [], html: false)
         return @args unless html
+
         skippable_loop(skip: skip, hash: true) do |(k, v), o|
           o[k] = v
         end
       end
 
-      # --
-      # @param [String] k the key
-      # @param [Object] v the value
+      #
+      # @param [String] key the key
+      # @param [Object] val the value
       # @param [Array<Symbol>] skips personal skips.
       # Determines if we should skip in HTML.
       # @return [true,false]
-      # --
+      #
       private
-      def skip_in_html?(k:, v:, skips: [])
-        k == :argv1 || v.is_a?(Array) || skips.include?(k) \
-          || v.is_a?(Hash) || v == false
+      def skip_in_html?(key:, val:, skips: [])
+        key == :argv1 || val.is_a?(Array) || skips.include?(key) \
+          || val.is_a?(Hash) || val == false
       end
 
-      # --
+      #
       # @return [true,nil] a truthy value.
-      # @param [Integer] i the current iteration.
+      # @param [Integer] idx the current iteration.
       # @param [String] keys the keys that will be split.
       # @param [String] val the value.
-      # --
+      #
       private
-      def argv1(i:, k:, v:)
-        if i.zero? && k.empty? && v !~ BOOL && v !~ @sep_regexp
-          @args[:argv1] = unescape(convert(v))
+      def argv1(idx:, keys:, val:)
+        if idx.zero? && keys.empty? && val !~ BOOL && val !~ @sep_regexp
+          @args[:argv1] = unescape(
+            convert(
+              val
+            )
+          )
         end
       end
 
-      # --
+      #
       # @return [Array<String,true|false>]
       # Allows you to flip a value based on condition.
-      # @param [String] v the value.
-      # --
+      # @param [String] val the value.
+      #
       private
-      def flip_kv_bool(v)
+      def flip_kv_bool(val)
         [
-          v.gsub(BOOL, "\\2"),
-          v.start_with?(TRUE) ? true : false,
+          val.gsub(BOOL, '\2'),
+          val.start_with?(TRUE) ? true : false
         ]
       end
 
-      # --
+      #
       # @param [Array<Symbol>] keys the keys.
       # Builds a sub-hash or returns parent hash.
       # @return [Hash]
-      # --
+      #
       private
       def build_hash(keys)
         out = @args
@@ -160,86 +176,62 @@ module Liquid
       private
       def unescape(val)
         return unless val
+
         val.gsub(@escaped_sep_regexp, @unescaped_sep).gsub(
-          SPECIAL_ESCAPED, "\\1")
+          SPECIAL_ESCAPED, '\1')
       end
 
-      # --
       private
       def parse
         from_shellwords.each_with_index do |k, i|
           keys, _, val = k.rpartition(@sep_regexp)
-          next if argv1(i: i, k: keys, v: val)
+          next if argv1(idx: i, keys: keys, val: val)
 
           val = unescape(val)
           keys, val = flip_kv_bool(val) if val =~ BOOL && keys.empty?
           keys, val = val, nil if keys.empty?
           keys = keys.split(KEY).map(&:to_sym)
 
-          set_val({
-            v: convert(val),
+          set_val(
+            val: convert(val),
             hash: build_hash(keys),
-            k: keys.last,
-          })
+            key: keys.last
+          )
         end
       end
 
-      # --
       private
-      def set_val(k:, v:, hash:)
-        hash[k] << v if hash[k].is_a?(Array)
-        hash[k] = [hash[k]].flatten << v if hash[k] && !hash[k].is_a?(Array)
-        hash[k] = v unless hash[k]
+      def set_val(key:, val:, hash:)
+        hash[key] << val if hash[key].is_a?(Array)
+        hash[key] = [hash[key]].flatten << val if hash[key] && !hash[key].is_a?(Array)
+        hash[key] = val unless hash[key]
       end
 
-      # --
+      #
       # @return [true,false,Float,Integer]
       # Convert a value to a native value.
-      # --
+      #
       private
       def convert(val)
+        return if val.nil?
+        return val if [true, false].include?(val)
         return val.to_f if val =~ FLOAT
         return val.to_i if val =~ INT
+
         val
       end
 
-      # --
+      #
       # Wraps into `#shellsplit`, and first substitutes some values.
       # @return [Array<String>]
-      # --
+      #
       private
       def from_shellwords
-        shellsplit(
-          @raw.gsub(SPECIAL, "\\\\\\1")
-              .gsub(UNQUOTED_SPECIAL, "\\\\\\1")
+        Shellwords.shellsplit(
+          @raw.gsub(SPECIAL, '\1')
+              .gsub(UNQUOTED_SPECIAL, '\1')
               .gsub(@sep_regexp, @escaped_sep))
       end
-
-      # --
-      # @see Shellwords.shellsplit
-      # 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 = [], ""
-
-        # rubocop:disable Metrics/ParameterLists
-        line.scan(SHELLSPLIT) do |w, s, d, e, g, se|
-          raise ArgumentError, "Unmatched double quote: #{line.inspect}" if g
-          field = field + (w || s || (d&.gsub(%r!\\([$`"\\\n])!,
-            '\\1')) || e.gsub(%r!\\(.)!, '\\1'))
-
-          if se
-            out << field
-            field = ""
-          end
-        end
-
-        out
-      end
     end
   end
 end

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

@@ -1,12 +1,12 @@
 # Frozen-string-literal: true
-# Copyright: 2017 - 2018 - MIT License
+# Copyright: 2017 - 2020 - ISC License
 # Author: Jordon Bedwell
 # Encoding: utf-8
 
 module Liquid
   class Tag
     class Parser
-      VERSION = "1.9.0"
+      VERSION = '2.0.0'
     end
   end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: liquid-tag-parser
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Jordon Bedwell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-12 00:00:00.000000000 Z
+date: 2020-03-10 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -39,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.11'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +72,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
+- !ruby/object:Gem::Dependency
+  name: envygeeks-rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: luna-rspec-formatters
   requirement: !ruby/object:Gem::Requirement
@@ -142,6 +142,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
+- lib/liquid-tag-parser.rb
 - lib/liquid/tag/parser.rb
 - lib/liquid/tag/parser/version.rb
 homepage: http://github.com/envygeeks/liquid-tag-parser
@@ -163,8 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Parse liquid tags like a professional