antlers 1.2.1 → 1.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f686ef1d7e193fd0f89d1193b2eaca591adeb32b4d3ab4921b8f720b344b4d1c
4
- data.tar.gz: 39c5d31434df9e67ad4ba47e8f3e3af3598baa61a5c4faffee4645361f3a2d44
3
+ metadata.gz: 418d2a128f90c866b14dbe4b0141aadfdd5c5e8cc1f52dc6bae38306b91be598
4
+ data.tar.gz: 8af5a64067ab89aa7d554e75005b42f1dec893788c000642cbcc89a9b1f54b7e
5
5
  SHA512:
6
- metadata.gz: f4b39cece90d9435ef99132ea4c0fa1e013876343c50266502e2e4a53dfc7116d8a371f2d6ff69a791e01a622ad85ef3c15ecf62e69541630ddbafc51f8a59f7
7
- data.tar.gz: 8afff52daeebd8f5546d64b0db202e2b75f452cece2d3395873ddf6fac8b1855ba032b433ff876344538dd9a068bb6aed6ce425eb13a43ae2f7e30fdbdef4104
6
+ metadata.gz: b3e1b9a04c8d86e64480fd176364b5efcca374858f8eaed06a5f58853a06cf3cb76380f7f1ca97ad7c5f0fee77e283156d20889f9df0d35a2f3b93074bdbd84a
7
+ data.tar.gz: e1434fa1503d07c7754b68baaf8c8c7e60c29c9e46c29ea17f384dde53e311b4776c59a7f8685a2abb22740d937525e0e59c9588fc5ff5ceaefcdcbf0f5e7bb1
data/lib/antlers/lexer.rb CHANGED
@@ -6,6 +6,9 @@ module Antlers
6
6
  class LexerError < StandardError; end
7
7
 
8
8
  class Lexer
9
+ # Only matches when the rest of the segment has balanced quotes, so title='A title = good' isn't split inside its quotes.
10
+ OUTSIDE_QUOTES = /(?=(?:[^'"]|'[^']*'|"[^"]*")*\z)/
11
+
9
12
  def initialize(lexeme_types:)
10
13
  @lexeme_types = lexeme_types.to_a
11
14
  @var_lexeme = @lexeme_types.find { it == VarLexeme }
@@ -52,10 +55,10 @@ module Antlers
52
55
 
53
56
  def antlers_lexeme(segment:, segments:)
54
57
  segment = segment.strip
55
- name, props, keywords = parse_antlers_segment(segment:)
56
-
57
58
  return @var_lexeme.lexeme(segment:, raw: false) if @var_lexeme && brackets?(segments:)
58
59
 
60
+ name, props, keywords = parse_antlers_segment(segment:)
61
+
59
62
  lexeme = @lexeme_types.find { it.match?(name:, keywords:) }
60
63
  return lexeme.lexeme(name:, props:, keywords:) if lexeme
61
64
 
@@ -65,9 +68,10 @@ module Antlers
65
68
  end
66
69
 
67
70
  # Keywords are whole words, so a name like "Plain::Card" isn't split on the "in:" in it.
71
+ # Props are split into tokens like ['title', '=', "'A title'", 'size', '=', '2'].
68
72
  def parse_antlers_segment(segment:)
69
- name_and_props, *keywords = segment.split(/(?<!\S)(#{Regexp.union(@keywords)})(?!\S)/)
70
- name, *props = name_and_props.split(' ')
73
+ name_and_props, *keywords = segment.split(/(?<!\S)(#{Regexp.union(@keywords)})(?!\S)#{OUTSIDE_QUOTES}/)
74
+ name, *props = name_and_props.split(/(=)#{OUTSIDE_QUOTES}|\s+#{OUTSIDE_QUOTES}/).reject(&:empty?)
71
75
  [name, props, parse_keywords(keywords:)]
72
76
  end
73
77
 
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Antlers
4
- VERSION = '1.2.1'
4
+ VERSION = '1.2.2'
5
5
  end
@@ -12,11 +12,9 @@ module Antlers
12
12
 
13
13
  private
14
14
 
15
- def props(props)
16
- odd_props = props.join(' ').split(/(=)|\s/)
17
-
18
- return {} unless odd_props.any?
19
-
15
+ # Takes tokens already split by the lexer, like ['title', '=', "'A title'", 'size', '=', '2'].
16
+ def props(tokens)
17
+ odd_props = tokens.dup
20
18
  props = {}
21
19
  until odd_props.empty?
22
20
  prop = odd_props.shift
@@ -1,6 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  require 'erb'
4
+ require 'lowkey'
4
5
  require_relative '../support/queries'
5
6
 
6
7
  module Antlers
@@ -8,8 +9,8 @@ module Antlers
8
9
  extend Queries
9
10
 
10
11
  # Evaluation limited to the following for security and to stop a templating language becoming a programming language.
11
- # 1. A static string
12
- # 2. A number, like 3 or 1.5
12
+ # 1. A value ('string', 3, 1.5, true, nil or :symbol)
13
+ # 2. Invalid string ("Hi #{name}", 'it's', 'a' + 'b')
13
14
  # 3. An instance variable
14
15
  # 4. A method call/local variable
15
16
  # 5. A method chain
@@ -22,21 +23,25 @@ module Antlers
22
23
  end
23
24
 
24
25
  def result(value:, current_binding:)
25
- return value[1..-2] if Queries.user_defined_string?(value)
26
- return Queries.number(value) if Queries.number?(value)
27
- return value unless current_binding
26
+ Lowkey::ValueParser.parse(value) do
27
+ next value[1..-2] if Queries.user_defined_string?(value)
28
+ next value unless current_binding
28
29
 
30
+ variable(value:, current_binding:)
31
+ end
32
+ end
33
+
34
+ private
35
+
36
+ def variable(value:, current_binding:)
29
37
  name, *chain = value.split('.')
30
38
 
31
39
  result = method_var(name:, current_binding:)
32
40
  return method_chain(result:, chain:) if chain.count > 0
33
- return result if result
34
41
 
35
- nil
42
+ result
36
43
  end
37
44
 
38
- private
39
-
40
45
  def method_var(name:, current_binding:)
41
46
  return current_binding.receiver.instance_variable_get(name) if name.start_with?('@')
42
47
  return current_binding.local_variable_get(name) if current_binding.local_variable_defined?(name)
@@ -47,7 +52,7 @@ module Antlers
47
52
 
48
53
  def method_chain(result:, chain:)
49
54
  chain.reduce(result) do |result, method_call|
50
- result.send(method_call.to_sym)
55
+ result&.send(method_call.to_sym)
51
56
  end
52
57
  end
53
58
  end
@@ -7,15 +7,6 @@ module Antlers
7
7
  wrapped_in?(string, "'") || wrapped_in?(string, '"')
8
8
  end
9
9
 
10
- # A number literal, like 3, -2 or 1.5, rather than a variable or method name.
11
- def number?(string)
12
- string.match?(/\A-?\d+(\.\d+)?\z/)
13
- end
14
-
15
- def number(string)
16
- string.include?('.') ? string.to_f : string.to_i
17
- end
18
-
19
10
  def wrapped_in?(string, delimeter)
20
11
  string[0] == delimeter && string[-1] == delimeter
21
12
  end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: antlers
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.1
4
+ version: 1.2.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - maedi
8
8
  bindir: exe
9
9
  cert_chain: []
10
- date: 2026-10-19 00:00:00.000000000 Z
10
+ date: 2026-10-20 00:00:00.000000000 Z
11
11
  dependencies:
12
12
  - !ruby/object:Gem::Dependency
13
13
  name: erb
@@ -29,14 +29,14 @@ dependencies:
29
29
  requirements:
30
30
  - - ">="
31
31
  - !ruby/object:Gem::Version
32
- version: '0'
32
+ version: 0.7.0
33
33
  type: :runtime
34
34
  prerelease: false
35
35
  version_requirements: !ruby/object:Gem::Requirement
36
36
  requirements:
37
37
  - - ">="
38
38
  - !ruby/object:Gem::Version
39
- version: '0'
39
+ version: 0.7.0
40
40
  - !ruby/object:Gem::Dependency
41
41
  name: plugs
42
42
  requirement: !ruby/object:Gem::Requirement