antlers 1.2.1 → 1.2.3
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 +8 -4
- data/lib/antlers/version.rb +1 -1
- data/lib/interfaces/lexeme.rb +3 -5
- data/lib/modules/variables.rb +15 -10
- data/lib/support/queries.rb +0 -9
- metadata +5 -5
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: bb164dc9fe0a7028143fb9ee9550231e3be407bb5561ab08e454a79d6f2bac35
|
|
4
|
+
data.tar.gz: 88d3a6d1ca5cc268b5f23498783d6cda88b363b4cb3ea5ef38f832b0220f3add
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 037fe04a5654399195cd96f73cd06223027e96625b77bb1f1701bdc9cb4f74a457aa61432a369f25d9af315ce8ff1ba691420d4b35c67492014c57bfe0b9f314
|
|
7
|
+
data.tar.gz: aa1c8ad96c830b9cb392c3630e3c5e0c83dff95d9e56ca2fa10c9f39ce2cd8d9de27d94ab551fc03ec7cd88e18417d46a5049cc53206cc99732f1d01c0d09fd3
|
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
|
|
data/lib/antlers/version.rb
CHANGED
data/lib/interfaces/lexeme.rb
CHANGED
|
@@ -12,11 +12,9 @@ module Antlers
|
|
|
12
12
|
|
|
13
13
|
private
|
|
14
14
|
|
|
15
|
-
|
|
16
|
-
|
|
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
|
data/lib/modules/variables.rb
CHANGED
|
@@ -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
|
|
12
|
-
# 2.
|
|
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
|
-
|
|
26
|
-
|
|
27
|
-
|
|
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
|
-
|
|
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
|
|
55
|
+
result&.send(method_call.to_sym)
|
|
51
56
|
end
|
|
52
57
|
end
|
|
53
58
|
end
|
data/lib/support/queries.rb
CHANGED
|
@@ -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.
|
|
4
|
+
version: 1.2.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- maedi
|
|
8
8
|
bindir: exe
|
|
9
9
|
cert_chain: []
|
|
10
|
-
date:
|
|
10
|
+
date: 1980-01-02 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:
|
|
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:
|
|
39
|
+
version: 0.7.0
|
|
40
40
|
- !ruby/object:Gem::Dependency
|
|
41
41
|
name: plugs
|
|
42
42
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
109
109
|
- !ruby/object:Gem::Version
|
|
110
110
|
version: '0'
|
|
111
111
|
requirements: []
|
|
112
|
-
rubygems_version:
|
|
112
|
+
rubygems_version: 4.0.6
|
|
113
113
|
specification_version: 4
|
|
114
114
|
summary: Templating language inside HTML inside Ruby
|
|
115
115
|
test_files: []
|