relaton-ogc 1.3.0 → 1.5.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/macos.yml +2 -0
- data/README.adoc +12 -5
- data/grammars/isodoc.rng +136 -21
- data/grammars/ogc.rng +8 -1
- data/lib/relaton_ogc/editorial_group.rb +5 -0
- data/lib/relaton_ogc/hit_collection.rb +8 -3
- data/lib/relaton_ogc/ogc_bibliographic_item.rb +7 -4
- data/lib/relaton_ogc/ogc_bibliography.rb +2 -2
- data/lib/relaton_ogc/version.rb +1 -1
- data/relaton_ogc.gemspec +1 -1
- metadata +7 -7
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: '09f233949ca3ca48d8ae2ca784097f471407694b40546f04450255f8f773d119'
|
4
|
+
data.tar.gz: 75bc95e83eff25f9e2dd5d5e898e3c08d87ec2d4703f29130da200ff523687ab
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 4272ce035563fc4b3fcc321d3c06a6f1f24c73d1273ad2748bc3ea279fe894d98e4f3d06ae61a7e6c20779bbe814498886e7ac386c21bcd4d19dff2c8f80d7a5
|
7
|
+
data.tar.gz: f193772cb108afba5c1c253f91301a1eaaae107552bcb587d36bdf441e95c079e4c502d88d05cf619ef57e50e3e82911392c98788909c411edc5020b6e33f379
|
data/.github/workflows/macos.yml
CHANGED
@@ -26,6 +26,8 @@ jobs:
|
|
26
26
|
- name: Update gems
|
27
27
|
run: |
|
28
28
|
sudo gem install bundler --force
|
29
|
+
ruby -v | grep 2.5 && bundle config set build.debase --with-cflags="-Wno-error=implicit-function-declaration"
|
30
|
+
ruby -v | grep 2.5 && bundle config set build.ruby-debug-ide --with-cflags="-Wno-error=implicit-function-declaration"
|
29
31
|
bundle install --jobs 4 --retry 3
|
30
32
|
- name: Run specs
|
31
33
|
run: |
|
data/README.adoc
CHANGED
@@ -18,7 +18,7 @@ Add this line to your application's Gemfile:
|
|
18
18
|
|
19
19
|
[source,ruby]
|
20
20
|
----
|
21
|
-
gem '
|
21
|
+
gem 'relaton-ogc'
|
22
22
|
----
|
23
23
|
|
24
24
|
And then execute:
|
@@ -27,7 +27,7 @@ And then execute:
|
|
27
27
|
|
28
28
|
Or install it yourself as:
|
29
29
|
|
30
|
-
$ gem install
|
30
|
+
$ gem install relaton-ogc
|
31
31
|
|
32
32
|
== Usage
|
33
33
|
|
@@ -35,8 +35,11 @@ Or install it yourself as:
|
|
35
35
|
|
36
36
|
[source,ruby]
|
37
37
|
----
|
38
|
+
require 'relaton_ogc'
|
39
|
+
=> true
|
40
|
+
|
38
41
|
hits = RelatonOgc::OgcBibliography.search("OGC 19-025r1")
|
39
|
-
=>
|
42
|
+
=> <RelatonOgc::HitCollection:0x007fcc8e085ba8 @ref=OGC 19-025r1 @fetched=false>
|
40
43
|
|
41
44
|
tem = hits[0].fetch
|
42
45
|
=> #<RelatonOgc::OgcBibliographicItem:0x007fcab3cb4758
|
@@ -72,7 +75,10 @@ item.to_xml bibdata: true
|
|
72
75
|
</date>
|
73
76
|
...
|
74
77
|
<ext>
|
75
|
-
<doctype>
|
78
|
+
<doctype>engineering-report</doctype>
|
79
|
+
<editorialgroup>
|
80
|
+
<committee>technical</committee>
|
81
|
+
</editorialgroup>
|
76
82
|
</ext>
|
77
83
|
</bibdata>"
|
78
84
|
----
|
@@ -81,7 +87,8 @@ item.to_xml bibdata: true
|
|
81
87
|
[source,ruby]
|
82
88
|
----
|
83
89
|
RelatonOgc::OgcBibliography.get "OGC 19-025r1", "2019", {}
|
84
|
-
|
90
|
+
[relaton-ogc] ("OGC 19-025r1") fetching...
|
91
|
+
[relaton-ogc] ("OGC 19-025r1") found 19-025r1
|
85
92
|
=> #<RelatonOgc::OgcBibliographicItem:0x007fc322e9aba0
|
86
93
|
...
|
87
94
|
----
|
data/grammars/isodoc.rng
CHANGED
@@ -43,7 +43,9 @@
|
|
43
43
|
<define name="xref">
|
44
44
|
<element name="xref">
|
45
45
|
<attribute name="target">
|
46
|
-
<data type="
|
46
|
+
<data type="string">
|
47
|
+
<param name="pattern">\i\c*|\c+#\c+</param>
|
48
|
+
</data>
|
47
49
|
</attribute>
|
48
50
|
<optional>
|
49
51
|
<attribute name="type">
|
@@ -61,6 +63,11 @@
|
|
61
63
|
</choice>
|
62
64
|
</attribute>
|
63
65
|
</optional>
|
66
|
+
<optional>
|
67
|
+
<attribute name="droploc">
|
68
|
+
<data type="boolean"/>
|
69
|
+
</attribute>
|
70
|
+
</optional>
|
64
71
|
<text/>
|
65
72
|
</element>
|
66
73
|
</define>
|
@@ -578,6 +585,8 @@
|
|
578
585
|
<ref name="ol"/>
|
579
586
|
<ref name="dl"/>
|
580
587
|
<ref name="formula"/>
|
588
|
+
<ref name="quote"/>
|
589
|
+
<ref name="sourcecode"/>
|
581
590
|
</choice>
|
582
591
|
</oneOrMore>
|
583
592
|
</element>
|
@@ -661,6 +670,16 @@
|
|
661
670
|
</choice>
|
662
671
|
</attribute>
|
663
672
|
</optional>
|
673
|
+
<optional>
|
674
|
+
<attribute name="valign">
|
675
|
+
<choice>
|
676
|
+
<value>top</value>
|
677
|
+
<value>middle</value>
|
678
|
+
<value>bottom</value>
|
679
|
+
<value>baseline</value>
|
680
|
+
</choice>
|
681
|
+
</attribute>
|
682
|
+
</optional>
|
664
683
|
<choice>
|
665
684
|
<zeroOrMore>
|
666
685
|
<choice>
|
@@ -697,6 +716,16 @@
|
|
697
716
|
</choice>
|
698
717
|
</attribute>
|
699
718
|
</optional>
|
719
|
+
<optional>
|
720
|
+
<attribute name="valign">
|
721
|
+
<choice>
|
722
|
+
<value>top</value>
|
723
|
+
<value>middle</value>
|
724
|
+
<value>bottom</value>
|
725
|
+
<value>baseline</value>
|
726
|
+
</choice>
|
727
|
+
</attribute>
|
728
|
+
</optional>
|
700
729
|
<choice>
|
701
730
|
<zeroOrMore>
|
702
731
|
<choice>
|
@@ -834,6 +863,13 @@
|
|
834
863
|
</define>
|
835
864
|
<define name="standard-document">
|
836
865
|
<element name="standard-document">
|
866
|
+
<attribute name="version"/>
|
867
|
+
<attribute name="type">
|
868
|
+
<choice>
|
869
|
+
<value>semantic</value>
|
870
|
+
<value>presentation</value>
|
871
|
+
</choice>
|
872
|
+
</attribute>
|
837
873
|
<ref name="bibdata"/>
|
838
874
|
<optional>
|
839
875
|
<ref name="boilerplate"/>
|
@@ -855,7 +891,7 @@
|
|
855
891
|
<oneOrMore>
|
856
892
|
<choice>
|
857
893
|
<ref name="content"/>
|
858
|
-
<ref name="
|
894
|
+
<ref name="abstract"/>
|
859
895
|
<ref name="foreword"/>
|
860
896
|
<ref name="introduction"/>
|
861
897
|
<ref name="acknowledgements"/>
|
@@ -922,6 +958,9 @@
|
|
922
958
|
<optional>
|
923
959
|
<attribute name="script"/>
|
924
960
|
</optional>
|
961
|
+
<optional>
|
962
|
+
<attribute name="type"/>
|
963
|
+
</optional>
|
925
964
|
<optional>
|
926
965
|
<attribute name="obligation">
|
927
966
|
<choice>
|
@@ -961,9 +1000,6 @@
|
|
961
1000
|
</define>
|
962
1001
|
<define name="content-subsection">
|
963
1002
|
<element name="clause">
|
964
|
-
<optional>
|
965
|
-
<attribute name="type"/>
|
966
|
-
</optional>
|
967
1003
|
<ref name="Content-Section"/>
|
968
1004
|
</element>
|
969
1005
|
</define>
|
@@ -992,6 +1028,9 @@
|
|
992
1028
|
</choice>
|
993
1029
|
</attribute>
|
994
1030
|
</optional>
|
1031
|
+
<optional>
|
1032
|
+
<attribute name="type"/>
|
1033
|
+
</optional>
|
995
1034
|
<optional>
|
996
1035
|
<ref name="section-title"/>
|
997
1036
|
</optional>
|
@@ -1011,9 +1050,6 @@
|
|
1011
1050
|
</define>
|
1012
1051
|
<define name="clause">
|
1013
1052
|
<element name="clause">
|
1014
|
-
<optional>
|
1015
|
-
<attribute name="type"/>
|
1016
|
-
</optional>
|
1017
1053
|
<ref name="Clause-Section"/>
|
1018
1054
|
</element>
|
1019
1055
|
</define>
|
@@ -1042,18 +1078,24 @@
|
|
1042
1078
|
</choice>
|
1043
1079
|
</attribute>
|
1044
1080
|
</optional>
|
1081
|
+
<optional>
|
1082
|
+
<attribute name="type"/>
|
1083
|
+
</optional>
|
1045
1084
|
<optional>
|
1046
1085
|
<ref name="section-title"/>
|
1047
1086
|
</optional>
|
1048
1087
|
<group>
|
1049
|
-
<
|
1050
|
-
<
|
1051
|
-
<
|
1052
|
-
|
1053
|
-
|
1054
|
-
<
|
1055
|
-
|
1056
|
-
|
1088
|
+
<choice>
|
1089
|
+
<group>
|
1090
|
+
<zeroOrMore>
|
1091
|
+
<ref name="BasicBlock"/>
|
1092
|
+
</zeroOrMore>
|
1093
|
+
<zeroOrMore>
|
1094
|
+
<ref name="note"/>
|
1095
|
+
</zeroOrMore>
|
1096
|
+
</group>
|
1097
|
+
<ref name="amend"/>
|
1098
|
+
</choice>
|
1057
1099
|
<zeroOrMore>
|
1058
1100
|
<choice>
|
1059
1101
|
<ref name="clause-subsection"/>
|
@@ -1180,6 +1222,9 @@
|
|
1180
1222
|
<optional>
|
1181
1223
|
<attribute name="script"/>
|
1182
1224
|
</optional>
|
1225
|
+
<optional>
|
1226
|
+
<attribute name="type"/>
|
1227
|
+
</optional>
|
1183
1228
|
<optional>
|
1184
1229
|
<attribute name="obligation">
|
1185
1230
|
<choice>
|
@@ -1447,11 +1492,6 @@
|
|
1447
1492
|
</optional>
|
1448
1493
|
</element>
|
1449
1494
|
</define>
|
1450
|
-
<define name="preface_abstract">
|
1451
|
-
<element name="abstract">
|
1452
|
-
<ref name="Basic-Section"/>
|
1453
|
-
</element>
|
1454
|
-
</define>
|
1455
1495
|
<define name="term-clause">
|
1456
1496
|
<element name="clause">
|
1457
1497
|
<optional>
|
@@ -1501,4 +1541,79 @@
|
|
1501
1541
|
<ref name="CitationType"/>
|
1502
1542
|
</element>
|
1503
1543
|
</define>
|
1544
|
+
<define name="amend">
|
1545
|
+
<element name="amend">
|
1546
|
+
<optional>
|
1547
|
+
<attribute name="id">
|
1548
|
+
<data type="ID"/>
|
1549
|
+
</attribute>
|
1550
|
+
</optional>
|
1551
|
+
<attribute name="change">
|
1552
|
+
<choice>
|
1553
|
+
<value>add</value>
|
1554
|
+
<value>modify</value>
|
1555
|
+
<value>delete</value>
|
1556
|
+
</choice>
|
1557
|
+
</attribute>
|
1558
|
+
<optional>
|
1559
|
+
<attribute name="path"/>
|
1560
|
+
</optional>
|
1561
|
+
<optional>
|
1562
|
+
<attribute name="path_end"/>
|
1563
|
+
</optional>
|
1564
|
+
<optional>
|
1565
|
+
<attribute name="title"/>
|
1566
|
+
</optional>
|
1567
|
+
<optional>
|
1568
|
+
<element name="location">
|
1569
|
+
<zeroOrMore>
|
1570
|
+
<ref name="locality"/>
|
1571
|
+
</zeroOrMore>
|
1572
|
+
</element>
|
1573
|
+
</optional>
|
1574
|
+
<zeroOrMore>
|
1575
|
+
<ref name="autonumber"/>
|
1576
|
+
</zeroOrMore>
|
1577
|
+
<optional>
|
1578
|
+
<element name="description">
|
1579
|
+
<zeroOrMore>
|
1580
|
+
<ref name="BasicBlock"/>
|
1581
|
+
</zeroOrMore>
|
1582
|
+
</element>
|
1583
|
+
</optional>
|
1584
|
+
<optional>
|
1585
|
+
<element name="newcontent">
|
1586
|
+
<zeroOrMore>
|
1587
|
+
<ref name="BasicBlock"/>
|
1588
|
+
</zeroOrMore>
|
1589
|
+
</element>
|
1590
|
+
</optional>
|
1591
|
+
<optional>
|
1592
|
+
<element name="description">
|
1593
|
+
<zeroOrMore>
|
1594
|
+
<ref name="BasicBlock"/>
|
1595
|
+
</zeroOrMore>
|
1596
|
+
</element>
|
1597
|
+
</optional>
|
1598
|
+
</element>
|
1599
|
+
</define>
|
1600
|
+
<define name="autonumber">
|
1601
|
+
<element name="autonumber">
|
1602
|
+
<attribute name="type">
|
1603
|
+
<choice>
|
1604
|
+
<value>requirement</value>
|
1605
|
+
<value>recommendation</value>
|
1606
|
+
<value>permission</value>
|
1607
|
+
<value>table</value>
|
1608
|
+
<value>figure</value>
|
1609
|
+
<value>admonition</value>
|
1610
|
+
<value>formula</value>
|
1611
|
+
<value>sourcecode</value>
|
1612
|
+
<value>example</value>
|
1613
|
+
<value>note</value>
|
1614
|
+
</choice>
|
1615
|
+
</attribute>
|
1616
|
+
<text/>
|
1617
|
+
</element>
|
1618
|
+
</define>
|
1504
1619
|
</grammar>
|
data/grammars/ogc.rng
CHANGED
@@ -54,7 +54,7 @@
|
|
54
54
|
<define name="preface">
|
55
55
|
<element name="preface">
|
56
56
|
<optional>
|
57
|
-
<ref name="
|
57
|
+
<ref name="abstract"/>
|
58
58
|
</optional>
|
59
59
|
<ref name="foreword"/>
|
60
60
|
<optional>
|
@@ -104,6 +104,13 @@
|
|
104
104
|
</define>
|
105
105
|
<define name="ogc-standard">
|
106
106
|
<element name="ogc-standard">
|
107
|
+
<attribute name="version"/>
|
108
|
+
<attribute name="type">
|
109
|
+
<choice>
|
110
|
+
<value>semantic</value>
|
111
|
+
<value>presentation</value>
|
112
|
+
</choice>
|
113
|
+
</attribute>
|
107
114
|
<ref name="bibdata"/>
|
108
115
|
<zeroOrMore>
|
109
116
|
<ref name="termdocsource"/>
|
@@ -52,10 +52,15 @@ module RelatonOgc
|
|
52
52
|
#
|
53
53
|
# fetch data form server and save it to file.
|
54
54
|
#
|
55
|
-
def fetch_data
|
56
|
-
|
55
|
+
def fetch_data # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
|
56
|
+
h = {}
|
57
|
+
h["If-None-Match"] = etag if etag
|
58
|
+
resp = Faraday.new(ENDPOINT, headers: h).get
|
57
59
|
# return if there aren't any changes since last fetching
|
58
|
-
|
60
|
+
return if resp.status == 304
|
61
|
+
unless resp.status == 200
|
62
|
+
raise RelatonBib::RequestError, "Could not access #{ENDPOINT}"
|
63
|
+
end
|
59
64
|
|
60
65
|
FileUtils.mkdir_p DATADIR unless Dir.exist? DATADIR
|
61
66
|
self.etag = resp[:etag]
|
@@ -25,8 +25,8 @@ module RelatonOgc
|
|
25
25
|
end
|
26
26
|
|
27
27
|
@docsubtype = args.delete :docsubtype
|
28
|
+
# @doctype = args.delete :doctype
|
28
29
|
super
|
29
|
-
# @doctype = args[:doctype]
|
30
30
|
end
|
31
31
|
|
32
32
|
# @return [Hash]
|
@@ -36,11 +36,14 @@ module RelatonOgc
|
|
36
36
|
hash
|
37
37
|
end
|
38
38
|
|
39
|
-
# @param builder [Nokogiri::XML::Builder]
|
40
39
|
# @param opts [Hash]
|
40
|
+
# @option opts [Nokogiri::XML::Builder] :builder XML builder
|
41
41
|
# @option opts [Boolean] :bibdata
|
42
|
-
|
43
|
-
|
42
|
+
# @option opts [Symbol, NilClass] :date_format (:short), :full
|
43
|
+
# @option opts [String, Symbol] :lang language
|
44
|
+
# @return [String] XML
|
45
|
+
def to_xml(**opts)
|
46
|
+
super **opts do |b|
|
44
47
|
b.ext do
|
45
48
|
b.doctype doctype if doctype
|
46
49
|
b.docsubtype docsubtype if docsubtype
|
@@ -3,10 +3,10 @@ module RelatonOgc
|
|
3
3
|
class << self
|
4
4
|
# @param text [String]
|
5
5
|
# @return [RelatonOgc::HitCollection]
|
6
|
-
def search(text, year = nil,
|
6
|
+
def search(text, year = nil, _opts = {})
|
7
7
|
HitCollection.new text, year
|
8
8
|
rescue Faraday::ConnectionFailed
|
9
|
-
raise RelatonBib::RequestError,
|
9
|
+
raise RelatonBib::RequestError, HitCollection::ENDPOINT
|
10
10
|
end
|
11
11
|
|
12
12
|
# @param code [String] the OGC standard Code to look up (e..g "8200")
|
data/lib/relaton_ogc/version.rb
CHANGED
data/relaton_ogc.gemspec
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: relaton-ogc
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.5.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ribose Inc.
|
8
|
-
autorequire:
|
8
|
+
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-
|
11
|
+
date: 2020-11-04 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: debase
|
@@ -170,14 +170,14 @@ dependencies:
|
|
170
170
|
requirements:
|
171
171
|
- - "~>"
|
172
172
|
- !ruby/object:Gem::Version
|
173
|
-
version: 1.
|
173
|
+
version: 1.5.0
|
174
174
|
type: :runtime
|
175
175
|
prerelease: false
|
176
176
|
version_requirements: !ruby/object:Gem::Requirement
|
177
177
|
requirements:
|
178
178
|
- - "~>"
|
179
179
|
- !ruby/object:Gem::Version
|
180
|
-
version: 1.
|
180
|
+
version: 1.5.0
|
181
181
|
description: 'RelatonOgc: retrieve OGC Standards for bibliographic use using the OgcBibliographicItem
|
182
182
|
model'
|
183
183
|
email:
|
@@ -219,7 +219,7 @@ homepage: https://github.com/relaton/relaton-ogc
|
|
219
219
|
licenses:
|
220
220
|
- BSD-2-Clause
|
221
221
|
metadata: {}
|
222
|
-
post_install_message:
|
222
|
+
post_install_message:
|
223
223
|
rdoc_options: []
|
224
224
|
require_paths:
|
225
225
|
- lib
|
@@ -235,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
235
235
|
version: '0'
|
236
236
|
requirements: []
|
237
237
|
rubygems_version: 3.0.6
|
238
|
-
signing_key:
|
238
|
+
signing_key:
|
239
239
|
specification_version: 4
|
240
240
|
summary: 'RelatonOgc: retrieve OGC Standards for bibliographic use using the OgcBibliographicItem
|
241
241
|
model'
|