antlers 1.5.0 → 1.5.1
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 +4 -4
- data/lib/antlers/lexer.rb +11 -7
- data/lib/antlers/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: b7caf18802ef4881de424f56a12f669b0387734b11594a92ca4da432e56452d5
|
|
4
|
+
data.tar.gz: e2774b94f9e0332661e9b7bf5ff9f2c6a37eb70f9eec6cf666945b8411edcb96
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 47227e6ee158c6a3415e3664a13c9ea89c69e25cdcee5bbd0c674d1d166f2f6eda5fdc5be9bfc7273f2eada55678a6541faca7239efe04626090d1ec70e7a12b
|
|
7
|
+
data.tar.gz: 199174ab2082ede0fdebe181125c7600bc594bdb1b34420aeb3f23b1bb5eb2d08dc8eec12c89247857c2463e37a0caef283f302d2f1bc456cfe40f4f1150c538
|
data/lib/antlers/lexer.rb
CHANGED
|
@@ -8,15 +8,19 @@ module Antlers
|
|
|
8
8
|
class Lexer
|
|
9
9
|
# Only matches when the rest of the segment has balanced quotes, so title='A title = good' isn't split inside its quotes.
|
|
10
10
|
OUTSIDE_QUOTES = /(?=(?:[^'"]|'[^']*'|"[^"]*")*\z)/
|
|
11
|
+
PROPS = /(=)#{OUTSIDE_QUOTES}|\s+#{OUTSIDE_QUOTES}/
|
|
12
|
+
DELIMITERS = /(#{Regexp.union('<{', '}>')})/
|
|
13
|
+
VAR_DELIMITERS = /(#{Regexp.union('<{', '}>', '{', '}')})/
|
|
14
|
+
# Keywords are compiled once for each set of lexemes, as a lexer's made for each template.
|
|
15
|
+
KEYWORDS = Hash.new { |keywords, words| keywords[words] = /(?<!\S)(#{Regexp.union(words)})(?!\S)#{OUTSIDE_QUOTES}/ }
|
|
11
16
|
|
|
12
17
|
def initialize(lexeme_types:)
|
|
13
18
|
@lexeme_types = lexeme_types.to_a
|
|
14
19
|
@var_lexeme = @lexeme_types.find { it == VarLexeme }
|
|
15
20
|
|
|
16
|
-
@delimiters =
|
|
17
|
-
@delimiters =
|
|
18
|
-
|
|
19
|
-
@keywords = @lexeme_types.flat_map { |lexeme| lexeme.const_get(:KEYWORDS) }
|
|
21
|
+
@delimiters = DELIMITERS
|
|
22
|
+
@delimiters = VAR_DELIMITERS if @var_lexeme
|
|
23
|
+
@keywords = KEYWORDS[@lexeme_types.flat_map { |lexeme| lexeme.const_get(:KEYWORDS) }]
|
|
20
24
|
@cursor = 0
|
|
21
25
|
end
|
|
22
26
|
|
|
@@ -26,7 +30,7 @@ module Antlers
|
|
|
26
30
|
|
|
27
31
|
# Split on delimiters and retain capture groups.
|
|
28
32
|
# Whitespace inside the template is kept, but not around it, like the indentation of a template in a method body.
|
|
29
|
-
segments = template.strip.split(
|
|
33
|
+
segments = template.strip.split(@delimiters)
|
|
30
34
|
|
|
31
35
|
until segments[@cursor].nil?
|
|
32
36
|
if (segment = antlers_segment(segments:))
|
|
@@ -71,8 +75,8 @@ module Antlers
|
|
|
71
75
|
# Keywords are whole words, so a name like "Plain::Card" isn't split on the "in:" in it.
|
|
72
76
|
# Props are split into tokens like ['title', '=', "'A title'", 'size', '=', '2'].
|
|
73
77
|
def parse_antlers_segment(segment:)
|
|
74
|
-
name_and_props, *keywords = segment.split(
|
|
75
|
-
name, *props = name_and_props.split(
|
|
78
|
+
name_and_props, *keywords = segment.split(@keywords)
|
|
79
|
+
name, *props = name_and_props.split(PROPS).reject(&:empty?)
|
|
76
80
|
[name, props, parse_keywords(keywords:)]
|
|
77
81
|
end
|
|
78
82
|
|
data/lib/antlers/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: antlers
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.5.
|
|
4
|
+
version: 1.5.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- maedi
|
|
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
96
96
|
- !ruby/object:Gem::Version
|
|
97
97
|
version: '0'
|
|
98
98
|
requirements: []
|
|
99
|
-
rubygems_version: 4.0.
|
|
99
|
+
rubygems_version: 4.0.20
|
|
100
100
|
specification_version: 4
|
|
101
101
|
summary: Templating language inside HTML inside Ruby
|
|
102
102
|
test_files: []
|