antlers 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 375ebfb2e841c81843bb17b1025d8cd43dbe851f803f4845afb73f6d24f8ef30
-  data.tar.gz: a7db1372364cb6633b6ce6ae2492966ecf1c6d2a20f3d7af214ce14e18feda21
+  metadata.gz: 3c1e20787d49349b0f3df0f6df128650c7214ec53cd697ec66840d6f3884d9e8
+  data.tar.gz: 3048610d15b4fe61ff67123aba2b6f81a5ef9019e4ac03dea657995c30501b17
 SHA512:
-  metadata.gz: c0b9b231ebe71d01f50443bebcec9210c3f97fe238138d172974ef5c298d5c543af1371a3806f45e54cc8e5a6a8cb32d6e51e17547465ed96682a633393c0ca4
-  data.tar.gz: d7c42c19f7c1aa9a5bcb27d30fe2fe0118054897bb5e2388f266b7127bf6c89bdc35b7da4fa20e39f969a20f6a7a2ce9c6e8325ac32e0a9f78720b85a06bb21c
+  metadata.gz: bc0ff003117d8d08b22146b15a32f32288aef44191ba401080db525ed3125e6a7cc38fd278b64eb96eda1659d7b608cbf41f4b9a1879c8641eecf0f3fa4fc83d
+  data.tar.gz: e0a5d0d1c71721a4727b3f6134a1eafb40b75b34cff799cc5f2d94677cbf84b6e41dad3b6d8ad5bee5293ca1b1de10969d8e6af1d8cc19c6889b0dc0dbaca71b

data/lib/antlers/lexer.rb

@@ -73,7 +73,7 @@ module Antlers
 
       while (keyword = keywords.shift)
         keyword.strip!
-        value = keyword.end_with?(':') && value?(keywords.first.strip) ? keywords.shift.strip : nil
+        value = keyword.end_with?(':') && value?(keywords.first) ? keywords.shift.strip : nil
         key_values[keyword] = value
       end
 
@@ -81,7 +81,9 @@ module Antlers
     end
 
     def value?(string)
-      !(string.start_with?(':') || string.end_with?(':'))
+      # Support keywords without a value like "<{ form: }>" whose value will become an empty string.
+      string = string.to_s.strip
+      !string.empty? && !(string.start_with?(':') || string.end_with?(':'))
     end
 
     def brackets?(segments:)

data/lib/antlers/parser.rb

@@ -36,7 +36,13 @@ module Antlers
 
     def sub_branch(node:, sequence:, end_key:, end_name: nil)
       sub_sequence = []
-      sub_sequence << sequence.shift until sequence.first.is_a?(Hash) && sequence.first[end_key] == end_name
+
+      until sequence.first.is_a?(Hash) && sequence.first[end_key] == end_name
+        raise ParserError, "Missing end tag for #{node.class}" if sequence.empty?
+
+        sub_sequence << sequence.shift
+      end
+
       # Remove the end tag we just stopped before.
       sequence.shift
 

data/lib/antlers/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Antlers
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/lib/antlers.rb

@@ -7,7 +7,7 @@ require_relative 'antlers/parser'
 module Antlers
   module_function
 
-  DEFAULT_ELEMENTS = %i[root html form for if prop slot yield var]
+  DEFAULT_ELEMENTS = %i[root html form for if prop slot yield var].freeze
 
   def ast(template:, namespace: nil, elements: Elements[*DEFAULT_ELEMENTS])
     sequence = Lexer.new(lexeme_types: elements[:lexeme]).parse(template:)

data/lib/interfaces/lexeme.rb

@@ -2,7 +2,7 @@
 
 module Antlers
   module Lexeme
-    KEYWORDS = []
+    KEYWORDS = [].freeze
 
     def match?(name: nil, keywords: {}) = false
 

data/lib/lexemes/form_lexeme.rb

@@ -14,10 +14,7 @@ module Antlers
     end
 
     def lexeme(keywords:, **)
-      if keywords.key?('form:')
-        action = keywords['form:'] ? keywords['form:'][1...-1] : nil
-        return { form_def: action }
-      end
+      return { form_def: keywords['form:'] } if keywords.key?('form:')
 
       { form_end: 'level_1' }
     end

data/lib/lexemes/var_lexeme.rb

@@ -9,15 +9,12 @@ module Antlers
     extend Queries
     extend self
 
-    # Variables are special and are matched by the lexer.
+    # Variables are special and are matched by the lexer in a hard-coded fashion.
     def match?(**)
       false
     end
 
     def lexeme(segment:, raw:, **)
-      # String is already interpolated or not depending on user input on the template layer, now we store it without those template quotes.
-      segment = segment[1..-2] if Queries.user_defined_string?(segment)
-
       return { raw_var: segment } if raw
 
       { var: segment }

data/lib/modules/props.rb

@@ -22,7 +22,7 @@ module Antlers
       evaluated_props = {}
 
       props.each do |name, value|
-        evaluated_props[name] = evaluate(name: value, current_binding:) || fallback(value)
+        evaluated_props[name] = evaluate(value:, current_binding:)
       end
 
       evaluated_props

data/lib/modules/variables.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'erb'
 require_relative '../support/queries'
 
 module Antlers
@@ -7,28 +8,29 @@ module Antlers
     extend Queries
 
     # Evaluation limited to the following for security and to stop a templating language becoming a programming language.
-    #  1. An instance variable
-    #  2. A method call/local variable
-    #  3. A method chain
-    #  4. A static string
-    def evaluate(name:, current_binding:)
-      return name.to_s unless current_binding
+    #  1. A static string
+    #  2. An instance variable
+    #  3. A method call/local variable
+    #  4. A method chain
+    def evaluate(value:, current_binding:, escape: true)
+      result = result(value:, current_binding:)
 
-      name, *chain = name.split('.')
+      return ERB::Util.html_escape(result) if escape
+
+      result
+    end
+
+    def result(value:, current_binding:)
+      return value[1..-2] if Queries.user_defined_string?(value)
+      return value unless current_binding
+
+      name, *chain = value.split('.')
 
       result = method_var(name:, current_binding:)
       return method_chain(result:, chain:) if chain.count > 0
       return result if result
 
       nil
-    rescue StandardError
-      nil
-    end
-
-    def fallback(value)
-      return value[1..-2] if Queries.user_defined_string?(value)
-
-      value
     end
 
     private

data/lib/nodes/for_node.rb

@@ -23,7 +23,7 @@ module Antlers
     def render(current_binding: nil, parent_binding: nil, slot_node: nil, metadata: {})
       output = ''
 
-      evaluate(name: @items, current_binding:).each do |value|
+      evaluate(value: @items, current_binding:, escape: false).each do |value|
         key, value = value if @key
 
         # TODO: Parallelize by creating new bindings and ensuring children have any args they need via RenderEvent.

data/lib/nodes/form_node.rb

@@ -20,7 +20,7 @@ module Antlers
     end
 
     def render(current_binding: nil, parent_binding: nil, slot_node: nil, metadata: {})
-      output = "<form action='#{@action}' method='#{@method}'>"
+      output = "<form action='#{action(current_binding:)}' method='#{@method}'>"
 
       @children.each do |child|
         output += child.render(current_binding:, parent_binding:, slot_node:, metadata:) || ''
@@ -30,9 +30,17 @@ module Antlers
       output
     end
 
+    private
+
+    def action(current_binding:)
+      return if @action.nil?
+
+      evaluate(value: @action, current_binding:)
+    end
+
     class << self
       def match?(segment:)
-        segment[DEF_KEY]
+        segment.is_a?(Hash) && segment.key?(DEF_KEY)
       end
 
       def build(segment:, **)

data/lib/nodes/if_node.rb

@@ -21,7 +21,7 @@ module Antlers
     def render(current_binding: nil, parent_binding: nil, slot_node: nil, metadata: {})
       output = ''.dup
 
-      if evaluate(name: @value, current_binding:)
+      if evaluate(value: @value, current_binding:, escape: false)
         @children.each do |child|
           output += child.render(current_binding:, parent_binding:, slot_node:, metadata:) || ''
         end

data/lib/nodes/var_node.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'erb'
-
 require_relative '../interfaces/leaf_node'
 require_relative '../modules/variables'
 
@@ -19,11 +17,7 @@ module Antlers
     end
 
     def render(current_binding: nil, parent_binding: nil, slot_node: nil, metadata: {})
-      result = evaluate(name: @value, current_binding:) || fallback(@value)
-
-      return result if @raw
-
-      ERB::Util.html_escape(result)
+      evaluate(value: @value, current_binding:, escape: !@raw)
     end
 
     class << self
@@ -32,7 +26,7 @@ module Antlers
       end
 
       def build(segment:, **)
-        new(value: segment[:var] || segment[:raw_var], raw: !!segment[:raw_var])
+        new(value: segment[:var] || segment[:raw_var], raw: !segment[:raw_var].nil?)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: antlers
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - maedi