metanorma-utils 1.10.1 → 1.10.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/utils/log.rb +41 -3
- data/lib/utils/main.rb +1 -1
- data/lib/utils/version.rb +1 -1
- data/metanorma-utils.gemspec +2 -1
- metadata +22 -8
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 1529d7af0a046a40b3b079adbc36786882be1abce4b515b2ec644c9ade8fb6eb
|
|
4
|
+
data.tar.gz: 756653fafb5a833206d2f60e7cbcc64c8c0f7dc2d94149655efbd06395694be7
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f62f4879f665181f06d1102785dac3e8481cd4d15c9e982c481af56bd079a4440205a7d18549dd1b53ed0c8bc127119742904b088e145ee4f0710f5745b129da
|
|
7
|
+
data.tar.gz: 8234bac72f1dd5f432af91442c3802a2c03f3ba7f928ef89c2feba5c5a6838176fd2d271f2beb63a70a0c613b24d94a5b6816e594e40c7851070f1125b336716
|
data/lib/utils/log.rb
CHANGED
|
@@ -3,12 +3,17 @@ require "htmlentities"
|
|
|
3
3
|
module Metanorma
|
|
4
4
|
module Utils
|
|
5
5
|
class Log
|
|
6
|
-
attr_writer :xml
|
|
6
|
+
attr_writer :xml, :suppress_log
|
|
7
7
|
|
|
8
8
|
def initialize
|
|
9
9
|
@log = {}
|
|
10
10
|
@c = HTMLEntities.new
|
|
11
11
|
@mapid = {}
|
|
12
|
+
@suppress_log = { severity: 4, category: [] }
|
|
13
|
+
end
|
|
14
|
+
|
|
15
|
+
def to_ncname(tag)
|
|
16
|
+
::Metanorma::Utils.to_ncname(tag)
|
|
12
17
|
end
|
|
13
18
|
|
|
14
19
|
def save_to(filename, dir = nil)
|
|
@@ -21,7 +26,7 @@ module Metanorma
|
|
|
21
26
|
|
|
22
27
|
# severity: 0: abort; 1: serious; 2: not serious; 3: info only
|
|
23
28
|
def add(category, loc, msg, severity: 2, display: true)
|
|
24
|
-
@novalid and return
|
|
29
|
+
@novalid || suppress_log?(category, severity, msg) and return
|
|
25
30
|
@log[category] ||= []
|
|
26
31
|
item = create_entry(loc, msg, severity)
|
|
27
32
|
@log[category] << item
|
|
@@ -38,6 +43,20 @@ module Metanorma
|
|
|
38
43
|
end
|
|
39
44
|
end
|
|
40
45
|
|
|
46
|
+
def messages
|
|
47
|
+
@log.values.each_with_object([]) do |v, m|
|
|
48
|
+
v.each do |e|
|
|
49
|
+
m << e
|
|
50
|
+
end
|
|
51
|
+
end
|
|
52
|
+
end
|
|
53
|
+
|
|
54
|
+
def suppress_log?(category, severity, msg)
|
|
55
|
+
category == "Relaton" && /^Fetching /.match?(msg) ||
|
|
56
|
+
@suppress_log[:severity] <= severity ||
|
|
57
|
+
@suppress_log[:category].include?(category)
|
|
58
|
+
end
|
|
59
|
+
|
|
41
60
|
def suppress_display?(category, _loc, _msg, display)
|
|
42
61
|
["Metanorma XML Syntax", "Relaton"].include?(category) ||
|
|
43
62
|
!display
|
|
@@ -127,9 +146,28 @@ module Metanorma
|
|
|
127
146
|
.severity3 { font-style: italic; color: grey; }
|
|
128
147
|
</style>
|
|
129
148
|
</head><body><h1>#{file} errors</h1>
|
|
149
|
+
<ul>#{log_index}</ul>
|
|
130
150
|
HTML
|
|
131
151
|
end
|
|
132
152
|
|
|
153
|
+
def log_index
|
|
154
|
+
@log.each_with_object([]) do |(k, v), m|
|
|
155
|
+
m << <<~HTML
|
|
156
|
+
<li><p><b><a href="##{to_ncname(k)}">#{k}</a></b>: #{index_severities(v)}</p></li>
|
|
157
|
+
HTML
|
|
158
|
+
end.join("\n")
|
|
159
|
+
end
|
|
160
|
+
|
|
161
|
+
def index_severities(entries)
|
|
162
|
+
s = entries.each_with_object({}) do |e, m|
|
|
163
|
+
m[e[:severity]] ||= 0
|
|
164
|
+
m[e[:severity]] += 1
|
|
165
|
+
end.compact
|
|
166
|
+
s.keys.sort.map do |k|
|
|
167
|
+
"Severity #{k}: <b>#{s[k]}</b> errors"
|
|
168
|
+
end.join("; ")
|
|
169
|
+
end
|
|
170
|
+
|
|
133
171
|
def write(file = nil)
|
|
134
172
|
(!file && @filename) or save_to(file || "metanorma", nil)
|
|
135
173
|
File.open(@filename, "w:UTF-8") do |f|
|
|
@@ -141,7 +179,7 @@ module Metanorma
|
|
|
141
179
|
|
|
142
180
|
def write_key(file, key)
|
|
143
181
|
file.puts <<~HTML
|
|
144
|
-
<h2>#{key}</h2>\n<table border="1">
|
|
182
|
+
<h2 id="#{to_ncname(key)}">#{key}</h2>\n<table border="1">
|
|
145
183
|
<thead><th width="5%">Line</th><th width="20%">ID</th>
|
|
146
184
|
<th width="30%">Message</th><th width="40%">Context</th><th width="5%">Severity</th></thead>
|
|
147
185
|
<tbody>
|
data/lib/utils/main.rb
CHANGED
|
@@ -143,7 +143,7 @@ module Metanorma
|
|
|
143
143
|
nopunct = LONGSTR_NOPUNCT)
|
|
144
144
|
/^\s*$/.match?(text) and return text
|
|
145
145
|
text.split(/(?=(?:\s|-))/).map do |w|
|
|
146
|
-
if /^\s*$/.match(
|
|
146
|
+
if /^\s*$/.match(w) || (w.size < threshold) then w
|
|
147
147
|
else
|
|
148
148
|
w.scan(/.{,#{threshold}}/o).map.with_index do |w1, i|
|
|
149
149
|
w1.size < threshold ? w1 : break_up_long_str1(w1, i + 1, nopunct)
|
data/lib/utils/version.rb
CHANGED
data/metanorma-utils.gemspec
CHANGED
|
@@ -41,7 +41,8 @@ Gem::Specification.new do |spec|
|
|
|
41
41
|
spec.add_development_dependency "guard-rspec", "~> 4.7"
|
|
42
42
|
spec.add_development_dependency "rake", "~> 13.0"
|
|
43
43
|
spec.add_development_dependency "rspec", "~> 3.6"
|
|
44
|
-
spec.add_development_dependency "rubocop", "~> 1
|
|
44
|
+
spec.add_development_dependency "rubocop", "~> 1"
|
|
45
|
+
spec.add_development_dependency "rubocop-performance"
|
|
45
46
|
spec.add_development_dependency "simplecov", "~> 0.15"
|
|
46
47
|
spec.add_development_dependency "timecop", "~> 0.9"
|
|
47
48
|
spec.add_development_dependency "vcr", "~> 6.1.0"
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metanorma-utils
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.10.
|
|
4
|
+
version: 1.10.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ribose Inc.
|
|
8
|
-
autorequire:
|
|
8
|
+
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2025-04-14 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: asciidoctor
|
|
@@ -212,14 +212,28 @@ dependencies:
|
|
|
212
212
|
requirements:
|
|
213
213
|
- - "~>"
|
|
214
214
|
- !ruby/object:Gem::Version
|
|
215
|
-
version: 1
|
|
215
|
+
version: '1'
|
|
216
216
|
type: :development
|
|
217
217
|
prerelease: false
|
|
218
218
|
version_requirements: !ruby/object:Gem::Requirement
|
|
219
219
|
requirements:
|
|
220
220
|
- - "~>"
|
|
221
221
|
- !ruby/object:Gem::Version
|
|
222
|
-
version: 1
|
|
222
|
+
version: '1'
|
|
223
|
+
- !ruby/object:Gem::Dependency
|
|
224
|
+
name: rubocop-performance
|
|
225
|
+
requirement: !ruby/object:Gem::Requirement
|
|
226
|
+
requirements:
|
|
227
|
+
- - ">="
|
|
228
|
+
- !ruby/object:Gem::Version
|
|
229
|
+
version: '0'
|
|
230
|
+
type: :development
|
|
231
|
+
prerelease: false
|
|
232
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
233
|
+
requirements:
|
|
234
|
+
- - ">="
|
|
235
|
+
- !ruby/object:Gem::Version
|
|
236
|
+
version: '0'
|
|
223
237
|
- !ruby/object:Gem::Dependency
|
|
224
238
|
name: simplecov
|
|
225
239
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -320,7 +334,7 @@ homepage: https://github.com/metanorma/metanorma-utils
|
|
|
320
334
|
licenses:
|
|
321
335
|
- BSD-2-Clause
|
|
322
336
|
metadata: {}
|
|
323
|
-
post_install_message:
|
|
337
|
+
post_install_message:
|
|
324
338
|
rdoc_options: []
|
|
325
339
|
require_paths:
|
|
326
340
|
- lib
|
|
@@ -335,8 +349,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
335
349
|
- !ruby/object:Gem::Version
|
|
336
350
|
version: '0'
|
|
337
351
|
requirements: []
|
|
338
|
-
rubygems_version: 3.
|
|
339
|
-
signing_key:
|
|
352
|
+
rubygems_version: 3.5.22
|
|
353
|
+
signing_key:
|
|
340
354
|
specification_version: 4
|
|
341
355
|
summary: metanorma-utils
|
|
342
356
|
test_files: []
|