lm_docstache 1.3.8 → 1.3.9
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +3 -0
- data/lib/lm_docstache/document.rb +3 -4
- data/lib/lm_docstache/renderer.rb +6 -5
- data/lib/lm_docstache/version.rb +1 -1
- data/spec/integration_spec.rb +1 -0
- 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: a232c835166c36e1ec8b49e14881d256a648831dd6fe799453cd8472ad43314e
|
4
|
+
data.tar.gz: 518e61a524ecdb2b8e74b504f02c5411979ebea4b18d10675ebc02c7e654bb31
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: dd072339bf46460c662552c68a4cfff8dcfacc68ffd65b97bd612adeccc46015a036c3635ad93d1e5306e3072d9b602f38935e68d6bfde5d1c36d08fbf89765b
|
7
|
+
data.tar.gz: 97506e402af04f22899a1dcc3df6250c5bbdaf2eae39cd62f3dafa430b6aba2bdc3f91d2569938766d4b542cf81eba8979277bc063df25e305dd14dc301c40cc
|
data/CHANGELOG.md
CHANGED
@@ -26,7 +26,7 @@ module LMDocstache
|
|
26
26
|
|
27
27
|
def usable_role_tags
|
28
28
|
@documents.values.flat_map do |document|
|
29
|
-
document.css('w|
|
29
|
+
document.css('w|t')
|
30
30
|
.select { |tag| tag.text =~ ROLES_REGEXP }
|
31
31
|
.flat_map { |tag|
|
32
32
|
tag.text.scan(ROLES_REGEXP)
|
@@ -47,20 +47,19 @@ module LMDocstache
|
|
47
47
|
def tags
|
48
48
|
@documents.values.flat_map do |document|
|
49
49
|
document.text.strip.scan(TAGS_REGEXP)
|
50
|
-
.select {|t| !(t =~ ROLES_REGEXP)}
|
51
50
|
end
|
52
51
|
end
|
53
52
|
|
54
53
|
def usable_tags
|
55
54
|
@documents.values.flat_map do |document|
|
56
55
|
document.css('w|t')
|
57
|
-
.select { |tag| tag.text =~ TAGS_REGEXP
|
56
|
+
.select { |tag| tag.text =~ TAGS_REGEXP }
|
58
57
|
.flat_map { |tag| tag.text.scan(TAGS_REGEXP) }
|
59
58
|
end
|
60
59
|
end
|
61
60
|
|
62
61
|
def usable_tag_names
|
63
|
-
self.usable_tags.map do |tag|
|
62
|
+
self.usable_tags.select {|t| !(t =~ ROLES_REGEXP)}.map do |tag|
|
64
63
|
tag.scan(/\{\{[\/#^]?(.+?)(?:(\s((?:==|~=))\s?.+?))?\}\}/)
|
65
64
|
$1
|
66
65
|
end.compact.uniq
|
@@ -10,7 +10,7 @@ module LMDocstache
|
|
10
10
|
|
11
11
|
def render
|
12
12
|
find_and_expand_blocks
|
13
|
-
replace_tags(@data)
|
13
|
+
replace_tags(@content, @data)
|
14
14
|
remove_role_tags if @remove_role_tags
|
15
15
|
@content
|
16
16
|
end
|
@@ -105,9 +105,9 @@ module LMDocstache
|
|
105
105
|
end
|
106
106
|
end
|
107
107
|
|
108
|
-
def replace_tags(data)
|
109
|
-
|
110
|
-
if !(results = text_el.text.scan(/\{\{([\w\.\|]+)\}\}/).flatten).empty?
|
108
|
+
def replace_tags(elements, data)
|
109
|
+
elements.css('w|t').select {|t| !(t.text =~ Document::ROLES_REGEXP)}.each do |text_el|
|
110
|
+
if !(results = text_el.text.scan(/\{\{([\w\.\|]+)\}\}/).flatten).empty? &&
|
111
111
|
rendered_string = text_el.text
|
112
112
|
results.each do |r|
|
113
113
|
rendered_string.gsub!("{{#{r}}}", data.get(r).to_s)
|
@@ -115,10 +115,11 @@ module LMDocstache
|
|
115
115
|
text_el.content = rendered_string
|
116
116
|
end
|
117
117
|
end
|
118
|
+
elements
|
118
119
|
end
|
119
120
|
|
120
121
|
def remove_role_tags
|
121
|
-
@content.css('w|
|
122
|
+
@content.css('w|t').each do |text_el|
|
122
123
|
results = text_el.text.scan(Document::ROLES_REGEXP).map {|r| r.first }
|
123
124
|
unless results.empty?
|
124
125
|
rendered_string = text_el.text
|
data/lib/lm_docstache/version.rb
CHANGED
data/spec/integration_spec.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: lm_docstache
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.3.
|
4
|
+
version: 1.3.9
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Roey Chasman
|
@@ -11,7 +11,7 @@ authors:
|
|
11
11
|
autorequire:
|
12
12
|
bindir: bin
|
13
13
|
cert_chain: []
|
14
|
-
date: 2020-11-
|
14
|
+
date: 2020-11-05 00:00:00.000000000 Z
|
15
15
|
dependencies:
|
16
16
|
- !ruby/object:Gem::Dependency
|
17
17
|
name: nokogiri
|