relaton-un 1.14.0 → 1.14.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/rake.yml +1 -0
- data/.github/workflows/release.yml +3 -2
- data/.rubocop.yml +1 -1
- data/Gemfile +4 -0
- data/grammars/basicdoc.rng +0 -1
- data/grammars/biblio.rng +12 -2
- data/lib/relaton_un/hit_collection.rb +10 -9
- data/lib/relaton_un/version.rb +1 -1
- data/lib/relaton_un.rb +1 -0
- data/relaton_un.gemspec +6 -9
- metadata +16 -58
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7e704658b3773eb8347be22f467a49f320cc5efd06503e72095ee9b2398803b0
|
4
|
+
data.tar.gz: 5d25a613fe0d9a9f8e44246d092962907f1794aef97b4dc2a0296c03d474785b
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3bf607afc7975c55eb50bad68d30b710f90e3db0774629fec910df6e0aff35cc2e5520769e18ee459de7b802609a5c9b6d025bc681b992c1294addc56e23c4bf
|
7
|
+
data.tar.gz: d48eb2b4e1195a91e2ee47e00d6146c6bc396c6eef357020fc71c9527e8dfafa0896c81f80630de0b32c1b42dc8ee67ece8c0ac7058883886b40371d3576b091
|
data/.github/workflows/rake.yml
CHANGED
data/.rubocop.yml
CHANGED
data/Gemfile
CHANGED
data/grammars/basicdoc.rng
CHANGED
data/grammars/biblio.rng
CHANGED
@@ -216,6 +216,9 @@
|
|
216
216
|
<optional>
|
217
217
|
<ref name="fullname"/>
|
218
218
|
</optional>
|
219
|
+
<zeroOrMore>
|
220
|
+
<ref name="credential"/>
|
221
|
+
</zeroOrMore>
|
219
222
|
<zeroOrMore>
|
220
223
|
<ref name="affiliation"/>
|
221
224
|
</zeroOrMore>
|
@@ -232,6 +235,11 @@
|
|
232
235
|
<ref name="FullNameType"/>
|
233
236
|
</element>
|
234
237
|
</define>
|
238
|
+
<define name="credential">
|
239
|
+
<element name="credential">
|
240
|
+
<text/>
|
241
|
+
</element>
|
242
|
+
</define>
|
235
243
|
<define name="FullNameType">
|
236
244
|
<choice>
|
237
245
|
<group>
|
@@ -305,7 +313,9 @@
|
|
305
313
|
<zeroOrMore>
|
306
314
|
<ref name="affiliationdescription"/>
|
307
315
|
</zeroOrMore>
|
308
|
-
<
|
316
|
+
<optional>
|
317
|
+
<ref name="organization"/>
|
318
|
+
</optional>
|
309
319
|
</element>
|
310
320
|
</define>
|
311
321
|
<define name="affiliationname">
|
@@ -1316,7 +1326,7 @@
|
|
1316
1326
|
<value>commentaryOf</value>
|
1317
1327
|
<value>hasCommentary</value>
|
1318
1328
|
<value>related</value>
|
1319
|
-
<value>
|
1329
|
+
<value>hasComplement</value>
|
1320
1330
|
<value>complementOf</value>
|
1321
1331
|
<value>obsoletes</value>
|
1322
1332
|
<value>obsoletedBy</value>
|
@@ -25,6 +25,7 @@ module RelatonUn
|
|
25
25
|
# @http.cert_store.add_file ca_file
|
26
26
|
@http.read_timeout = 120
|
27
27
|
if (form_resp = get_page)
|
28
|
+
# doc = Nokogiri::HTML page_resp(form_resp, text).body
|
28
29
|
doc = Nokogiri::HTML page_resp(form_resp, text).body
|
29
30
|
@array = doc.css("div.viewHover").map { |item| hit item }
|
30
31
|
end
|
@@ -34,7 +35,7 @@ module RelatonUn
|
|
34
35
|
|
35
36
|
# @param location [String]
|
36
37
|
# @param deeep [Integer]
|
37
|
-
# @return [
|
38
|
+
# @return [String, nil]
|
38
39
|
def get_page(location = "/", deep = 0)
|
39
40
|
return if deep > 3
|
40
41
|
|
@@ -55,16 +56,16 @@ module RelatonUn
|
|
55
56
|
# @return [Array<String>]
|
56
57
|
def form_data(form, text) # rubocop:disable Metrics/CyclomaticComplexity
|
57
58
|
fd = form.xpath(
|
58
|
-
"//input[@type!='radio']|"\
|
59
|
-
"//input[@type='radio'][@checked]|"\
|
60
|
-
"//select[@name!='view:_id1:_id2:cbLang']|"\
|
59
|
+
"//input[@type!='radio']|" \
|
60
|
+
"//input[@type='radio'][@checked]|" \
|
61
|
+
"//select[@name!='view:_id1:_id2:cbLang']|" \
|
61
62
|
"//textarea",
|
62
63
|
).reduce([]) do |m, i|
|
63
64
|
v = case i[:name]
|
64
65
|
when "view:_id1:_id2:txtSymbol" then text
|
65
66
|
when "view:_id1:_id2:rgTrunc", "view:_id1:_id2:cbSort" then "R"
|
66
67
|
when "view:_id1:_id2:cbType" then "FP"
|
67
|
-
when "$$xspsubmitid" then "view:_id1:_id2:
|
68
|
+
when "$$xspsubmitid" then "view:_id1:_id2:_id131"
|
68
69
|
when "$$xspsubmitscroll" then "0|102"
|
69
70
|
when "view:_id1" then "view:_id1"
|
70
71
|
else i[:value]
|
@@ -86,7 +87,7 @@ module RelatonUn
|
|
86
87
|
req["Content-Type"] = "multipart/form-data; boundary=#{BOUNDARY}"
|
87
88
|
req.body = form_data(form, text).join("\r\n")
|
88
89
|
resp = @http.request req
|
89
|
-
get_page URI.parse(resp["location"]).request_uri
|
90
|
+
get_page Addressable::URI.parse(resp["location"]).request_uri
|
90
91
|
end
|
91
92
|
|
92
93
|
# @param item [Nokogiri::XML::Element]
|
@@ -173,9 +174,9 @@ module RelatonUn
|
|
173
174
|
# @param req [Net::HTTP::Get, Net::HTTP::Post]
|
174
175
|
def set_headers(req) # rubocop:disable Metrics/AbcSize
|
175
176
|
set_cookie req
|
176
|
-
req["Accept"] = "text/html,application/xhtml+xml,application/xml;q=0.9,"\
|
177
|
-
|
178
|
-
|
177
|
+
req["Accept"] = "text/html,application/xhtml+xml,application/xml;q=0.9," \
|
178
|
+
"image/avif,image/webp,image/apng,*/*;q=0.8," \
|
179
|
+
"application/signed-exchange;v=b3;q=0.9"
|
179
180
|
req["Accept-Encoding"] = "gzip, deflate, br"
|
180
181
|
req["Accept-Language"] = "en-US;q=0.8,en;q=0.7"
|
181
182
|
req["Cache-Control"] = "max-age=0"
|
data/lib/relaton_un/version.rb
CHANGED
data/lib/relaton_un.rb
CHANGED
data/relaton_un.gemspec
CHANGED
@@ -9,13 +9,13 @@ Gem::Specification.new do |spec|
|
|
9
9
|
spec.authors = ["Ribose Inc."]
|
10
10
|
spec.email = ["open.source@ribose.com"]
|
11
11
|
|
12
|
-
spec.summary = "RelatonIso: retrieve CC Standards for bibliographic "\
|
12
|
+
spec.summary = "RelatonIso: retrieve CC Standards for bibliographic " \
|
13
13
|
"use using the IsoBibliographicItem model"
|
14
|
-
spec.description = "RelatonIso: retrieve CC Standards for bibliographic "\
|
14
|
+
spec.description = "RelatonIso: retrieve CC Standards for bibliographic " \
|
15
15
|
"use using the IsoBibliographicItem model"
|
16
16
|
spec.homepage = "https://github.com/relaton/relaton-un"
|
17
17
|
spec.license = "BSD-2-Clause"
|
18
|
-
spec.required_ruby_version = Gem::Requirement.new(">= 2.
|
18
|
+
spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
|
19
19
|
|
20
20
|
spec.metadata["homepage_uri"] = spec.homepage
|
21
21
|
spec.metadata["source_code_uri"] = spec.homepage
|
@@ -33,13 +33,10 @@ Gem::Specification.new do |spec|
|
|
33
33
|
spec.require_paths = ["lib"]
|
34
34
|
|
35
35
|
spec.add_development_dependency "equivalent-xml", "~> 0.6"
|
36
|
-
spec.add_development_dependency "ruby-jing"
|
37
|
-
spec.add_development_dependency "simplecov"
|
38
|
-
spec.add_development_dependency "vcr"
|
39
|
-
spec.add_development_dependency "webmock"
|
40
36
|
|
41
|
-
spec.add_dependency "
|
42
|
-
spec.add_dependency "
|
37
|
+
spec.add_dependency "addressable", "~> 2.8.0"
|
38
|
+
spec.add_dependency "faraday", "~> 2.7.0"
|
39
|
+
spec.add_dependency "http-cookie", "~> 1.0.5"
|
43
40
|
spec.add_dependency "relaton-bib", "~> 1.14.0"
|
44
41
|
spec.add_dependency "unf_ext", ">= 0.0.7.7"
|
45
42
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: relaton-un
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.14.
|
4
|
+
version: 1.14.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ribose Inc.
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2023-05-06 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: equivalent-xml
|
@@ -25,89 +25,47 @@ dependencies:
|
|
25
25
|
- !ruby/object:Gem::Version
|
26
26
|
version: '0.6'
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
|
-
name:
|
28
|
+
name: addressable
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
|
-
- - "
|
32
|
-
- !ruby/object:Gem::Version
|
33
|
-
version: '0'
|
34
|
-
type: :development
|
35
|
-
prerelease: false
|
36
|
-
version_requirements: !ruby/object:Gem::Requirement
|
37
|
-
requirements:
|
38
|
-
- - ">="
|
39
|
-
- !ruby/object:Gem::Version
|
40
|
-
version: '0'
|
41
|
-
- !ruby/object:Gem::Dependency
|
42
|
-
name: simplecov
|
43
|
-
requirement: !ruby/object:Gem::Requirement
|
44
|
-
requirements:
|
45
|
-
- - ">="
|
46
|
-
- !ruby/object:Gem::Version
|
47
|
-
version: '0'
|
48
|
-
type: :development
|
49
|
-
prerelease: false
|
50
|
-
version_requirements: !ruby/object:Gem::Requirement
|
51
|
-
requirements:
|
52
|
-
- - ">="
|
53
|
-
- !ruby/object:Gem::Version
|
54
|
-
version: '0'
|
55
|
-
- !ruby/object:Gem::Dependency
|
56
|
-
name: vcr
|
57
|
-
requirement: !ruby/object:Gem::Requirement
|
58
|
-
requirements:
|
59
|
-
- - ">="
|
60
|
-
- !ruby/object:Gem::Version
|
61
|
-
version: '0'
|
62
|
-
type: :development
|
63
|
-
prerelease: false
|
64
|
-
version_requirements: !ruby/object:Gem::Requirement
|
65
|
-
requirements:
|
66
|
-
- - ">="
|
67
|
-
- !ruby/object:Gem::Version
|
68
|
-
version: '0'
|
69
|
-
- !ruby/object:Gem::Dependency
|
70
|
-
name: webmock
|
71
|
-
requirement: !ruby/object:Gem::Requirement
|
72
|
-
requirements:
|
73
|
-
- - ">="
|
31
|
+
- - "~>"
|
74
32
|
- !ruby/object:Gem::Version
|
75
|
-
version:
|
76
|
-
type: :
|
33
|
+
version: 2.8.0
|
34
|
+
type: :runtime
|
77
35
|
prerelease: false
|
78
36
|
version_requirements: !ruby/object:Gem::Requirement
|
79
37
|
requirements:
|
80
|
-
- - "
|
38
|
+
- - "~>"
|
81
39
|
- !ruby/object:Gem::Version
|
82
|
-
version:
|
40
|
+
version: 2.8.0
|
83
41
|
- !ruby/object:Gem::Dependency
|
84
42
|
name: faraday
|
85
43
|
requirement: !ruby/object:Gem::Requirement
|
86
44
|
requirements:
|
87
45
|
- - "~>"
|
88
46
|
- !ruby/object:Gem::Version
|
89
|
-
version:
|
47
|
+
version: 2.7.0
|
90
48
|
type: :runtime
|
91
49
|
prerelease: false
|
92
50
|
version_requirements: !ruby/object:Gem::Requirement
|
93
51
|
requirements:
|
94
52
|
- - "~>"
|
95
53
|
- !ruby/object:Gem::Version
|
96
|
-
version:
|
54
|
+
version: 2.7.0
|
97
55
|
- !ruby/object:Gem::Dependency
|
98
56
|
name: http-cookie
|
99
57
|
requirement: !ruby/object:Gem::Requirement
|
100
58
|
requirements:
|
101
|
-
- - "
|
59
|
+
- - "~>"
|
102
60
|
- !ruby/object:Gem::Version
|
103
|
-
version:
|
61
|
+
version: 1.0.5
|
104
62
|
type: :runtime
|
105
63
|
prerelease: false
|
106
64
|
version_requirements: !ruby/object:Gem::Requirement
|
107
65
|
requirements:
|
108
|
-
- - "
|
66
|
+
- - "~>"
|
109
67
|
- !ruby/object:Gem::Version
|
110
|
-
version:
|
68
|
+
version: 1.0.5
|
111
69
|
- !ruby/object:Gem::Dependency
|
112
70
|
name: relaton-bib
|
113
71
|
requirement: !ruby/object:Gem::Requirement
|
@@ -188,14 +146,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
188
146
|
requirements:
|
189
147
|
- - ">="
|
190
148
|
- !ruby/object:Gem::Version
|
191
|
-
version: 2.
|
149
|
+
version: 2.7.0
|
192
150
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
193
151
|
requirements:
|
194
152
|
- - ">="
|
195
153
|
- !ruby/object:Gem::Version
|
196
154
|
version: '0'
|
197
155
|
requirements: []
|
198
|
-
rubygems_version: 3.
|
156
|
+
rubygems_version: 3.3.26
|
199
157
|
signing_key:
|
200
158
|
specification_version: 4
|
201
159
|
summary: 'RelatonIso: retrieve CC Standards for bibliographic use using the IsoBibliographicItem
|