relaton-calconnect 1.13.1 → 1.14.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 472e2e5fa6688de1b2437d22f1ec7cbe720bbfa3f15020083b9667f5cf153863
4
- data.tar.gz: ee3ea9b65ba53b75aae4fb92b83b147869ea639eed7dddf6b95ddf97fb5bc1a8
3
+ metadata.gz: e56768bb659378f291f2bd2ec6f57d46ff0db713c6465150b57e3a3ba85aeff0
4
+ data.tar.gz: db3c391bd354c06cbb774e2f13f0f746ec615bee53c139876f70e312816fce19
5
5
  SHA512:
6
- metadata.gz: fe3271ea3e47ee2d29b39961062c5c85a9604ed0e5af2ec66240abdeb18233e96d4facfea08ab94bcbae31acb015361b280286dfaf82bc4903efea8b023ef824
7
- data.tar.gz: 5c284c28bc437bcd77cdf26c1001e12b491e903c810806ac9c207c07093ea1498ca3fad08ba290c11cfc563babc357f46ae21254d985c898615a6a5f1eb43589
6
+ metadata.gz: bb8b6b662b644931211db146edb0e4470d068f9c94987f7594793656655f450902b3e601217f9ecf24975cf7a6434150c5c67c668c18a0ecc6464653d07edbe1
7
+ data.tar.gz: a373c880ef6c73092333b85e7f686d765d596ef8bf6be2516124393d63fc179b64fa0005f69a747ccc139bde5117c5d8f2b0937a381cf561e2664894ee9b021a
@@ -10,8 +10,9 @@ on:
10
10
  Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
11
11
  required: true
12
12
  default: 'skip'
13
- push:
14
- tags: [ v* ]
13
+ repository_dispatch:
14
+ types: [ do-release ]
15
+
15
16
 
16
17
  jobs:
17
18
  release:
data/.gitignore CHANGED
@@ -6,6 +6,7 @@
6
6
  /pkg/
7
7
  /spec/reports/
8
8
  /tmp/
9
+ /vendor/
9
10
 
10
11
  # rspec failure tracking
11
12
  .rspec_status
data/.rubocop.yml CHANGED
@@ -7,6 +7,6 @@ require: rubocop-rails
7
7
  inherit_from:
8
8
  - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
9
9
  AllCops:
10
- TargetRubyVersion: 2.5
10
+ TargetRubyVersion: 2.7
11
11
  Rails:
12
12
  Enabled: false
data/Gemfile CHANGED
@@ -2,3 +2,8 @@ source "https://rubygems.org"
2
2
 
3
3
  # Specify your gem's dependencies in relaton_calconnect.gemspec
4
4
  gemspec
5
+
6
+ gem "ruby-jing"
7
+ gem "simplecov"
8
+ gem "vcr"
9
+ gem "webmock"
data/README.adoc CHANGED
@@ -43,14 +43,10 @@ item = hits[0].fetch
43
43
  [source,ruby]
44
44
  ----
45
45
  item.to_xml
46
- => "<bibitem id="CC/DIR10005-2019" type="standard">
46
+ => "<bibitem id="CC-DIR10005-2019" type="standard" schema-version="v1.2.1">
47
47
  <title format="text/plain" language="en">Guidelines for the implementation of the CalConnect patent policy</title>
48
- <uri type="xml">csd/cc-10005.xml</uri>
49
- <uri type="pdf">csd/cc-10005.pdf</uri>
50
- <uri type="doc">csd/cc-10005.doc</uri>
51
- <uri type="html">csd/cc-10005.html</uri>
52
- <uri type="rxl">csd/cc-10005.rxl</uri>
53
- <docidentifier type="csd">CC/DIR 10005:2019</docidentifier>
48
+ <uri type="xml">https://standards.calconnect.org/csd/cc-10005.xml</uri>
49
+ <uri type="pdf">https://standards.calconnect.org/csd/cc-10005.pdf</uri>
54
50
  ...
55
51
  </bibitem>"
56
52
  ----
@@ -58,19 +54,14 @@ With argument `bibdata: true` it ouputs XML wrapped by `bibdata` element and add
58
54
  [source,ruby]
59
55
  ----
60
56
  item.to_xml bibdata: true
61
- => "<bibdata type="standard">
62
- <title format="text/plain" language=en>Guidelines for the implementation of the CalConnect patent policy</title>
63
- <uri type="xml">csd/cc-10005.xml</uri>
64
- <uri type="pdf">csd/cc-10005.pdf</uri>
65
- <uri type="doc">csd/cc-10005.doc</uri>
66
- <uri type="html">csd/cc-10005.html</uri>
67
- <uri type="rxl">csd/cc-10005.rxl</uri>
68
- <docidentifier type="csd">CC/DIR 10005:2019</docidentifier>
57
+ => "<bibdata type="standard" schema-version="v1.2.1">
58
+ <title format="text/plain" language="en">Guidelines for the implementation of the CalConnect patent policy</title>
59
+ <uri type="xml">https://standards.calconnect.org/csd/cc-10005.xml</uri>
69
60
  ...
70
- <ext>
61
+ <ext schema-version="v1.0.0">
71
62
  <doctype>directive</doctype>
72
63
  <editorialgroup>
73
- <technical-committee>PUBLISH</technical-committee>
64
+ <committee>PUBLISH</committee>
74
65
  </editorialgroup>
75
66
  </ext>
76
67
  </bibdata>"
@@ -1,10 +1,5 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
3
- <include href="biblio.rng">
4
- <start>
5
- <ref name="document"/>
6
- </start>
7
- </include>
8
3
  <define name="document">
9
4
  <element name="document">
10
5
  <optional>
@@ -527,7 +522,6 @@
527
522
  <value>tip</value>
528
523
  <value>important</value>
529
524
  <value>caution</value>
530
- <value>statement</value>
531
525
  </choice>
532
526
  </define>
533
527
  <define name="figure">
@@ -688,6 +682,9 @@
688
682
  </define>
689
683
  <define name="underline">
690
684
  <element name="underline">
685
+ <optional>
686
+ <attribute name="style"/>
687
+ </optional>
691
688
  <zeroOrMore>
692
689
  <ref name="PureTextElement"/>
693
690
  </zeroOrMore>
@@ -1125,26 +1122,4 @@
1125
1122
  </zeroOrMore>
1126
1123
  </element>
1127
1124
  </define>
1128
- <define name="ext">
1129
- <element name="ext">
1130
- <ref name="BibDataExtensionType"/>
1131
- </element>
1132
- </define>
1133
- <define name="BibDataExtensionType">
1134
- <ref name="doctype"/>
1135
- </define>
1136
- <define name="doctype">
1137
- <element name="doctype">
1138
- <ref name="DocumentType"/>
1139
- </element>
1140
- </define>
1141
- <define name="DocumentType">
1142
- <value>document</value>
1143
- </define>
1144
- <define name="BibData">
1145
- <ref name="BibliographicItem"/>
1146
- <optional>
1147
- <ref name="ext"/>
1148
- </optional>
1149
- </define>
1150
1125
  </grammar>
@@ -0,0 +1,164 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <grammar xmlns="http://relaxng.org/ns/structure/1.0">
3
+ <!--
4
+ Add-ons to biblio.rnc for standoc model: defines the extension point BibDataExtensionType
5
+ of relaton
6
+
7
+ Specialisations as for biblio.rnc. Extension point can be redefined completely for a flavour of standoc
8
+ (SDO); but other elements in Bibdata can only be extended (more specialised vocabularies for Bibdata)
9
+ -->
10
+ <include href="biblio.rng">
11
+ <define name="BibData">
12
+ <ref name="BibliographicItem"/>
13
+ <optional>
14
+ <ref name="ext"/>
15
+ </optional>
16
+ </define>
17
+ </include>
18
+ <define name="ext">
19
+ <element name="ext">
20
+ <ref name="BibDataExtensionType"/>
21
+ </element>
22
+ </define>
23
+ <define name="BibDataExtensionType">
24
+ <optional>
25
+ <attribute name="schema-version"/>
26
+ </optional>
27
+ <ref name="doctype"/>
28
+ <optional>
29
+ <ref name="docsubtype"/>
30
+ </optional>
31
+ <optional>
32
+ <ref name="editorialgroup"/>
33
+ </optional>
34
+ <zeroOrMore>
35
+ <ref name="ics"/>
36
+ </zeroOrMore>
37
+ <zeroOrMore>
38
+ <ref name="structuredidentifier"/>
39
+ </zeroOrMore>
40
+ </define>
41
+ <define name="doctype">
42
+ <element name="doctype">
43
+ <optional>
44
+ <attribute name="abbreviation"/>
45
+ </optional>
46
+ <ref name="DocumentType"/>
47
+ </element>
48
+ </define>
49
+ <define name="DocumentType">
50
+ <text/>
51
+ </define>
52
+ <define name="docsubtype">
53
+ <element name="subdoctype">
54
+ <ref name="DocumentSubtype"/>
55
+ </element>
56
+ </define>
57
+ <define name="DocumentSubtype">
58
+ <text/>
59
+ </define>
60
+ <define name="editorialgroup">
61
+ <element name="editorialgroup">
62
+ <oneOrMore>
63
+ <ref name="technical-committee"/>
64
+ </oneOrMore>
65
+ </element>
66
+ </define>
67
+ <define name="technical-committee">
68
+ <element name="technical-committee">
69
+ <ref name="IsoWorkgroup"/>
70
+ </element>
71
+ </define>
72
+ <define name="IsoWorkgroup">
73
+ <optional>
74
+ <attribute name="number"/>
75
+ </optional>
76
+ <optional>
77
+ <attribute name="type"/>
78
+ </optional>
79
+ <optional>
80
+ <attribute name="identifier"/>
81
+ </optional>
82
+ <optional>
83
+ <attribute name="prefix"/>
84
+ </optional>
85
+ <text/>
86
+ </define>
87
+ <define name="ics">
88
+ <element name="ics">
89
+ <element name="code">
90
+ <text/>
91
+ </element>
92
+ <optional>
93
+ <element name="text">
94
+ <text/>
95
+ </element>
96
+ </optional>
97
+ </element>
98
+ </define>
99
+ <define name="structuredidentifier">
100
+ <element name="structuredidentifier">
101
+ <optional>
102
+ <attribute name="type"/>
103
+ </optional>
104
+ <oneOrMore>
105
+ <element name="agency">
106
+ <text/>
107
+ </element>
108
+ </oneOrMore>
109
+ <optional>
110
+ <element name="class">
111
+ <text/>
112
+ </element>
113
+ </optional>
114
+ <element name="docnumber">
115
+ <text/>
116
+ </element>
117
+ <optional>
118
+ <element name="partnumber">
119
+ <text/>
120
+ </element>
121
+ </optional>
122
+ <optional>
123
+ <element name="edition">
124
+ <text/>
125
+ </element>
126
+ </optional>
127
+ <optional>
128
+ <element name="version">
129
+ <text/>
130
+ </element>
131
+ </optional>
132
+ <optional>
133
+ <element name="supplementtype">
134
+ <text/>
135
+ </element>
136
+ </optional>
137
+ <optional>
138
+ <element name="supplementnumber">
139
+ <text/>
140
+ </element>
141
+ </optional>
142
+ <optional>
143
+ <element name="amendment">
144
+ <text/>
145
+ </element>
146
+ </optional>
147
+ <optional>
148
+ <element name="corrigendum">
149
+ <text/>
150
+ </element>
151
+ </optional>
152
+ <optional>
153
+ <element name="language">
154
+ <text/>
155
+ </element>
156
+ </optional>
157
+ <optional>
158
+ <element name="year">
159
+ <text/>
160
+ </element>
161
+ </optional>
162
+ </element>
163
+ </define>
164
+ </grammar>
data/grammars/biblio.rng CHANGED
@@ -33,9 +33,10 @@
33
33
  <param name="pattern">([\+\-]?\d{4})((-?)((0[1-9]|1[0-2])((-?)([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6]))))?</param>
34
34
  </data>
35
35
  </define>
36
- <start>
37
- <ref name="bibitem"/>
38
- </start>
36
+ <!-- start = bibitem -->
37
+ <define name="BibData">
38
+ <ref name="BibliographicItem"/>
39
+ </define>
39
40
  <define name="status">
40
41
  <element name="status">
41
42
  <ref name="stage"/>
@@ -73,8 +74,14 @@
73
74
  <text/>
74
75
  </element>
75
76
  </define>
76
- <define name="script">
77
+ <define name="locale">
77
78
  <a:documentation>ISO-639</a:documentation>
79
+ <element name="locale">
80
+ <text/>
81
+ </element>
82
+ </define>
83
+ <define name="script">
84
+ <a:documentation>ISO-3166</a:documentation>
78
85
  <element name="script">
79
86
  <text/>
80
87
  </element>
@@ -93,6 +100,9 @@
93
100
  <!-- multiple languages and scripts possible: comma delimit them if so -->
94
101
  <attribute name="language"/>
95
102
  </optional>
103
+ <optional>
104
+ <attribute name="locale"/>
105
+ </optional>
96
106
  <optional>
97
107
  <attribute name="script"/>
98
108
  </optional>
@@ -136,6 +146,9 @@
136
146
  <!-- multiple languages and scripts possible: comma delimit them if so -->
137
147
  <attribute name="language"/>
138
148
  </optional>
149
+ <optional>
150
+ <attribute name="locale"/>
151
+ </optional>
139
152
  <optional>
140
153
  <attribute name="script"/>
141
154
  </optional>
@@ -158,27 +171,30 @@
158
171
  </define>
159
172
  <define name="contributor">
160
173
  <element name="contributor">
161
- <zeroOrMore>
174
+ <oneOrMore>
162
175
  <ref name="role"/>
163
- </zeroOrMore>
176
+ </oneOrMore>
164
177
  <ref name="ContributorInfo"/>
165
178
  </element>
166
179
  </define>
167
180
  <define name="role">
168
181
  <element name="role">
169
- <optional>
170
- <attribute name="type">
171
- <choice>
172
- <value>author</value>
173
- <value>performer</value>
174
- <value>publisher</value>
175
- <value>editor</value>
176
- <value>adapter</value>
177
- <value>translator</value>
178
- <value>distributor</value>
179
- </choice>
180
- </attribute>
181
- </optional>
182
+ <attribute name="type">
183
+ <choice>
184
+ <value>author</value>
185
+ <value>performer</value>
186
+ <value>publisher</value>
187
+ <value>editor</value>
188
+ <value>adapter</value>
189
+ <value>translator</value>
190
+ <value>distributor</value>
191
+ <value>realizer</value>
192
+ <value>owner</value>
193
+ <value>authorizer</value>
194
+ <value>enabler</value>
195
+ <value>subject</value>
196
+ </choice>
197
+ </attribute>
182
198
  <zeroOrMore>
183
199
  <ref name="roledescription"/>
184
200
  </zeroOrMore>
@@ -200,6 +216,9 @@
200
216
  <optional>
201
217
  <ref name="fullname"/>
202
218
  </optional>
219
+ <zeroOrMore>
220
+ <ref name="credential"/>
221
+ </zeroOrMore>
203
222
  <zeroOrMore>
204
223
  <ref name="affiliation"/>
205
224
  </zeroOrMore>
@@ -216,6 +235,11 @@
216
235
  <ref name="FullNameType"/>
217
236
  </element>
218
237
  </define>
238
+ <define name="credential">
239
+ <element name="credential">
240
+ <text/>
241
+ </element>
242
+ </define>
219
243
  <define name="FullNameType">
220
244
  <choice>
221
245
  <group>
@@ -289,7 +313,9 @@
289
313
  <zeroOrMore>
290
314
  <ref name="affiliationdescription"/>
291
315
  </zeroOrMore>
292
- <ref name="organization"/>
316
+ <optional>
317
+ <ref name="organization"/>
318
+ </optional>
293
319
  </element>
294
320
  </define>
295
321
  <define name="affiliationname">
@@ -500,6 +526,17 @@
500
526
  </define>
501
527
  <define name="localityStack">
502
528
  <element name="localityStack">
529
+ <optional>
530
+ <attribute name="connective">
531
+ <choice>
532
+ <value>and</value>
533
+ <value>or</value>
534
+ <value>from</value>
535
+ <value>to</value>
536
+ <value/>
537
+ </choice>
538
+ </attribute>
539
+ </optional>
503
540
  <zeroOrMore>
504
541
  <ref name="locality"/>
505
542
  </zeroOrMore>
@@ -512,6 +549,17 @@
512
549
  </define>
513
550
  <define name="sourceLocalityStack">
514
551
  <element name="sourceLocalityStack">
552
+ <optional>
553
+ <attribute name="connective">
554
+ <choice>
555
+ <value>and</value>
556
+ <value>or</value>
557
+ <value>from</value>
558
+ <value>to</value>
559
+ <value/>
560
+ </choice>
561
+ </attribute>
562
+ </optional>
515
563
  <zeroOrMore>
516
564
  <ref name="sourceLocality"/>
517
565
  </zeroOrMore>
@@ -614,6 +662,9 @@
614
662
  <ref name="BibItemType"/>
615
663
  </attribute>
616
664
  </optional>
665
+ <optional>
666
+ <attribute name="schema-version"/>
667
+ </optional>
617
668
  <optional>
618
669
  <ref name="fetched"/>
619
670
  </optional>
@@ -650,6 +701,9 @@
650
701
  <zeroOrMore>
651
702
  <ref name="language"/>
652
703
  </zeroOrMore>
704
+ <zeroOrMore>
705
+ <ref name="locale"/>
706
+ </zeroOrMore>
653
707
  <zeroOrMore>
654
708
  <ref name="script"/>
655
709
  </zeroOrMore>
@@ -705,6 +759,9 @@
705
759
  <ref name="BibItemType"/>
706
760
  </attribute>
707
761
  </optional>
762
+ <optional>
763
+ <attribute name="schema-version"/>
764
+ </optional>
708
765
  <optional>
709
766
  <ref name="fetched"/>
710
767
  </optional>
@@ -741,6 +798,9 @@
741
798
  <zeroOrMore>
742
799
  <ref name="language"/>
743
800
  </zeroOrMore>
801
+ <zeroOrMore>
802
+ <ref name="locale"/>
803
+ </zeroOrMore>
744
804
  <zeroOrMore>
745
805
  <ref name="script"/>
746
806
  </zeroOrMore>
@@ -854,6 +914,15 @@
854
914
  <optional>
855
915
  <attribute name="type"/>
856
916
  </optional>
917
+ <optional>
918
+ <attribute name="language"/>
919
+ </optional>
920
+ <optional>
921
+ <attribute name="locale"/>
922
+ </optional>
923
+ <optional>
924
+ <attribute name="script"/>
925
+ </optional>
857
926
  <data type="anyURI"/>
858
927
  </define>
859
928
  <define name="DateType">
@@ -882,6 +951,7 @@
882
951
  <value>vote-started</value>
883
952
  <value>vote-ended</value>
884
953
  <value>announced</value>
954
+ <value>stable-until</value>
885
955
  </choice>
886
956
  </define>
887
957
  <define name="bdate">
@@ -930,6 +1000,9 @@
930
1000
  <optional>
931
1001
  <attribute name="language"/>
932
1002
  </optional>
1003
+ <optional>
1004
+ <attribute name="locale"/>
1005
+ </optional>
933
1006
  <optional>
934
1007
  <attribute name="script"/>
935
1008
  </optional>
@@ -1253,7 +1326,7 @@
1253
1326
  <value>commentaryOf</value>
1254
1327
  <value>hasCommentary</value>
1255
1328
  <value>related</value>
1256
- <value>complements</value>
1329
+ <value>hasComplement</value>
1257
1330
  <value>complementOf</value>
1258
1331
  <value>obsoletes</value>
1259
1332
  <value>obsoletedBy</value>
@@ -0,0 +1,11 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <grammar xmlns="http://relaxng.org/ns/structure/1.0">
3
+ <include href="basicdoc.rng"/>
4
+ <include href="relaton-cc.rng"/>
5
+ <start>
6
+ <choice>
7
+ <ref name="bibitem"/>
8
+ <ref name="bibdata"/>
9
+ </choice>
10
+ </start>
11
+ </grammar>
@@ -0,0 +1,48 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <grammar xmlns="http://relaxng.org/ns/structure/1.0">
3
+ <include href="biblio-standoc.rng">
4
+ <define name="DocumentType">
5
+ <choice>
6
+ <value>directive</value>
7
+ <value>guide</value>
8
+ <value>specification</value>
9
+ <value>standard</value>
10
+ <value>report</value>
11
+ <value>administrative</value>
12
+ <value>amendment</value>
13
+ <value>technical corrigendum</value>
14
+ <value>advisory</value>
15
+ </choice>
16
+ </define>
17
+ <define name="BibDataExtensionType">
18
+ <optional>
19
+ <attribute name="schema-version"/>
20
+ </optional>
21
+ <optional>
22
+ <ref name="doctype"/>
23
+ </optional>
24
+ <optional>
25
+ <ref name="docsubtype"/>
26
+ </optional>
27
+ <ref name="editorialgroup"/>
28
+ <zeroOrMore>
29
+ <ref name="ics"/>
30
+ </zeroOrMore>
31
+ </define>
32
+ <define name="editorialgroup">
33
+ <element name="editorialgroup">
34
+ <oneOrMore>
35
+ <ref name="technical-committee"/>
36
+ </oneOrMore>
37
+ </element>
38
+ </define>
39
+ <define name="technical-committee">
40
+ <element name="committee">
41
+ <optional>
42
+ <attribute name="type"/>
43
+ </optional>
44
+ <text/>
45
+ </element>
46
+ </define>
47
+ </include>
48
+ </grammar>
@@ -5,6 +5,15 @@ module RelatonCalconnect
5
5
  technical\ corrigendum advisory
6
6
  ].freeze
7
7
 
8
+ #
9
+ # Fetch flavor schema version
10
+ #
11
+ # @return [String] flavor schema version
12
+ #
13
+ def ext_schema
14
+ @ext_schema ||= schema_versions["relaton-model-cc"]
15
+ end
16
+
8
17
  # @param hash [Hash]
9
18
  # @return [RelatonIsoBib::CcBibliographicItem]
10
19
  def self.from_hash(hash)
@@ -57,6 +57,7 @@ module RelatonCalconnect
57
57
  missed_years = []
58
58
  result.each do |r|
59
59
  item = r.fetch
60
+ item.fetched = Date.today.to_s
60
61
  return { ret: item } if !year
61
62
 
62
63
  item.date.select { |d| d.type == "published" }.each do |d|
@@ -26,6 +26,9 @@ module RelatonCalconnect
26
26
  # Fetch data from yaml
27
27
  #
28
28
  # @param docid [String]
29
+ #
30
+ # @return [Array<RelatonBib::Hit>]
31
+ #
29
32
  def from_yaml(docid, **_opts)
30
33
  data["root"]["items"].select do |doc|
31
34
  doc["docid"] && doc["docid"]["id"].include?(docid)
@@ -1,3 +1,3 @@
1
1
  module RelatonCalconnect
2
- VERSION = "1.13.1".freeze
2
+ VERSION = "1.14.1".freeze
3
3
  end