metanorma-utils 1.7.0 → 1.7.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 +4 -4
- data/lib/utils/image.rb +1 -63
- data/lib/utils/log.rb +4 -2
- data/lib/utils/version.rb +1 -1
- data/metanorma-utils.gemspec +0 -3
- metadata +2 -44
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: bea3917e9c83cc15d44d2c142f556ff56e32712560705453e1df5effb76f2cfd
|
|
4
|
+
data.tar.gz: 1ba1d10ea64f71a811a8a6c44367f2de92044ff1025c0c75430f415686285760
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 59168d3995342fe99b736d4ef7906e9c8bb333aeb6e3d9bca354ead470a62ec713b33814c90bd7438fc839960326e4d29def6cfa6cd263a034273e908f6ee06f
|
|
7
|
+
data.tar.gz: df2fc51a6206b8d081eabde22bd09f076c168279b7d0eb9098b31c988798c6bdc4b4064d44ba4e54a567c69809549494392dda3ed689bbf9a4146dfe0cb13166
|
data/lib/utils/image.rb
CHANGED
|
@@ -1,69 +1,7 @@
|
|
|
1
|
-
require "tempfile"
|
|
2
|
-
require "marcel"
|
|
3
|
-
require "base64"
|
|
4
|
-
require "image_size"
|
|
5
1
|
require_relative "namespace"
|
|
6
2
|
|
|
7
3
|
module Metanorma
|
|
4
|
+
# Image methods were moved to the Vectory gem
|
|
8
5
|
module Utils
|
|
9
|
-
class << self
|
|
10
|
-
def image_resize(img, path, maxheight, maxwidth)
|
|
11
|
-
s, realsize = get_image_size(img, path)
|
|
12
|
-
img.name == "svg" && !img["viewBox"] && s[0] && s[1] and
|
|
13
|
-
img["viewBox"] = "0 0 #{s[0]} #{s[1]}"
|
|
14
|
-
s, skip = image_dont_resize(s, realsize)
|
|
15
|
-
skip and return s
|
|
16
|
-
s = image_size_fillin(s, realsize)
|
|
17
|
-
image_shrink(s, maxheight, maxwidth)
|
|
18
|
-
end
|
|
19
|
-
|
|
20
|
-
def image_dont_resize(dim, realsize)
|
|
21
|
-
dim.nil? and return [[nil, nil], true]
|
|
22
|
-
realsize.nil? and return [dim, true]
|
|
23
|
-
dim[0] == nil && dim[1] == nil and return [dim, true]
|
|
24
|
-
[dim, false]
|
|
25
|
-
end
|
|
26
|
-
|
|
27
|
-
def image_size_fillin(dim, realsize)
|
|
28
|
-
dim[1].zero? && !dim[0].zero? and
|
|
29
|
-
dim[1] = dim[0] * realsize[1] / realsize[0]
|
|
30
|
-
dim[0].zero? && !dim[1].zero? and
|
|
31
|
-
dim[0] = dim[1] * realsize[0] / realsize[1]
|
|
32
|
-
dim
|
|
33
|
-
end
|
|
34
|
-
|
|
35
|
-
def image_shrink(dim, maxheight, maxwidth)
|
|
36
|
-
dim[1] > maxheight and
|
|
37
|
-
dim = [(dim[0] * maxheight / dim[1]).ceil, maxheight]
|
|
38
|
-
dim[0] > maxwidth and
|
|
39
|
-
dim = [maxwidth, (dim[1] * maxwidth / dim[0]).ceil]
|
|
40
|
-
dim
|
|
41
|
-
end
|
|
42
|
-
|
|
43
|
-
def get_image_size(img, path)
|
|
44
|
-
realsize = ImageSize.path(path).size
|
|
45
|
-
s = image_size_interpret(img, realsize || [nil, nil])
|
|
46
|
-
image_size_zeroes_complete(s, realsize)
|
|
47
|
-
end
|
|
48
|
-
|
|
49
|
-
def image_size_interpret(img, realsize)
|
|
50
|
-
w = image_size_percent(img["width"], realsize[0])
|
|
51
|
-
h = image_size_percent(img["height"], realsize[1])
|
|
52
|
-
[w, h]
|
|
53
|
-
end
|
|
54
|
-
|
|
55
|
-
def image_size_percent(value, real)
|
|
56
|
-
/%$/.match?(value) && !real.nil? and
|
|
57
|
-
value = real * (value.sub(/%$/, "").to_f / 100)
|
|
58
|
-
value.to_i
|
|
59
|
-
end
|
|
60
|
-
|
|
61
|
-
def image_size_zeroes_complete(dim, realsize)
|
|
62
|
-
if dim[0].zero? && dim[1].zero?
|
|
63
|
-
dim = realsize
|
|
64
|
-
end
|
|
65
|
-
[dim, realsize]
|
|
66
|
-
end
|
|
67
|
-
end
|
|
68
6
|
end
|
|
69
7
|
end
|
data/lib/utils/log.rb
CHANGED
|
@@ -11,7 +11,7 @@ module Metanorma
|
|
|
11
11
|
@mapid = {}
|
|
12
12
|
end
|
|
13
13
|
|
|
14
|
-
# severity: 0: abort; 1: serious; 2: not serious
|
|
14
|
+
# severity: 0: abort; 1: serious; 2: not serious; 3: info only
|
|
15
15
|
def add(category, loc, msg, severity: 2)
|
|
16
16
|
@novalid and return
|
|
17
17
|
@log[category] ||= []
|
|
@@ -114,7 +114,9 @@ module Metanorma
|
|
|
114
114
|
thead th { font-weight: bold; background-color: aqua; }
|
|
115
115
|
.severity0 { font-weight: bold; background-color: lightpink }
|
|
116
116
|
.severity1 { font-weight: bold; }
|
|
117
|
-
.severity2 { }
|
|
117
|
+
.severity2 { }
|
|
118
|
+
.severity3 { font-style: italic; color: grey; }
|
|
119
|
+
</style>
|
|
118
120
|
</head><body><h1>#{file} errors</h1>
|
|
119
121
|
HTML
|
|
120
122
|
end
|
data/lib/utils/version.rb
CHANGED
data/metanorma-utils.gemspec
CHANGED
|
@@ -30,9 +30,6 @@ Gem::Specification.new do |spec|
|
|
|
30
30
|
spec.add_dependency "concurrent-ruby"
|
|
31
31
|
spec.add_dependency "csv"
|
|
32
32
|
spec.add_dependency "htmlentities", "~> 4.3.4"
|
|
33
|
-
spec.add_dependency "image_size", ">= 3.2.0"
|
|
34
|
-
spec.add_dependency "marcel", "~> 1.0.0"
|
|
35
|
-
spec.add_dependency "mime-types"
|
|
36
33
|
spec.add_dependency "nokogiri", ">= 1.11"
|
|
37
34
|
spec.add_dependency "sterile", "~> 1.0.14"
|
|
38
35
|
spec.add_dependency "uuidtools"
|
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.7.
|
|
4
|
+
version: 1.7.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ribose Inc.
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2024-
|
|
11
|
+
date: 2024-02-11 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: asciidoctor
|
|
@@ -66,48 +66,6 @@ dependencies:
|
|
|
66
66
|
- - "~>"
|
|
67
67
|
- !ruby/object:Gem::Version
|
|
68
68
|
version: 4.3.4
|
|
69
|
-
- !ruby/object:Gem::Dependency
|
|
70
|
-
name: image_size
|
|
71
|
-
requirement: !ruby/object:Gem::Requirement
|
|
72
|
-
requirements:
|
|
73
|
-
- - ">="
|
|
74
|
-
- !ruby/object:Gem::Version
|
|
75
|
-
version: 3.2.0
|
|
76
|
-
type: :runtime
|
|
77
|
-
prerelease: false
|
|
78
|
-
version_requirements: !ruby/object:Gem::Requirement
|
|
79
|
-
requirements:
|
|
80
|
-
- - ">="
|
|
81
|
-
- !ruby/object:Gem::Version
|
|
82
|
-
version: 3.2.0
|
|
83
|
-
- !ruby/object:Gem::Dependency
|
|
84
|
-
name: marcel
|
|
85
|
-
requirement: !ruby/object:Gem::Requirement
|
|
86
|
-
requirements:
|
|
87
|
-
- - "~>"
|
|
88
|
-
- !ruby/object:Gem::Version
|
|
89
|
-
version: 1.0.0
|
|
90
|
-
type: :runtime
|
|
91
|
-
prerelease: false
|
|
92
|
-
version_requirements: !ruby/object:Gem::Requirement
|
|
93
|
-
requirements:
|
|
94
|
-
- - "~>"
|
|
95
|
-
- !ruby/object:Gem::Version
|
|
96
|
-
version: 1.0.0
|
|
97
|
-
- !ruby/object:Gem::Dependency
|
|
98
|
-
name: mime-types
|
|
99
|
-
requirement: !ruby/object:Gem::Requirement
|
|
100
|
-
requirements:
|
|
101
|
-
- - ">="
|
|
102
|
-
- !ruby/object:Gem::Version
|
|
103
|
-
version: '0'
|
|
104
|
-
type: :runtime
|
|
105
|
-
prerelease: false
|
|
106
|
-
version_requirements: !ruby/object:Gem::Requirement
|
|
107
|
-
requirements:
|
|
108
|
-
- - ">="
|
|
109
|
-
- !ruby/object:Gem::Version
|
|
110
|
-
version: '0'
|
|
111
69
|
- !ruby/object:Gem::Dependency
|
|
112
70
|
name: nokogiri
|
|
113
71
|
requirement: !ruby/object:Gem::Requirement
|