relaton-3gpp 1.10.4 → 1.11.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: 141136c7526afc99951c96b2b7f393d18c4e7a597e967657b7f5dabfc9c54450
4
- data.tar.gz: 5d7977198895cec13a7b6205712f42e16f6e407b13a2ca30de6e3dafe8917f54
3
+ metadata.gz: e7475b654d91e5fb573c5d37f71b10fb5ae54b426b4d2899a2a20b8973e9a3d5
4
+ data.tar.gz: cb65139f2f08e3c95db99ab13593ce545e6c579e0f8bfe14377ccc65f153af3b
5
5
  SHA512:
6
- metadata.gz: 1f02c6ab9a9b0237935db773876c16d86d4cf47be05f8d1b7c016067d6588e2e5f8db6e747f1c3c1f1e7461f32b0098befd9d297ed154b488fe719517369ac1c
7
- data.tar.gz: 89404e6346bfcdedfde1485b799fe392c0dc793fda39e0e104a81246e43fea6f5ddce5a243e3fa368366ccd4bc21f3b55df91a07c72540ed84775a28d4c874ab
6
+ metadata.gz: da4ea63ea3f33ba232f8e36123454cf78ae2b19067c3fbb794d1af4c0dc2c3cb7165456c3c82ec3e20fcb08b8ed55c9d40572654a76e157c9aa337fa0b7d8c0b
7
+ data.tar.gz: 4c89b36586680f499e4305b7e23600e50fa2a3f2e14f6b932d8fce7fcd4472a2f25f7a98dca3df47382eff5b03c84e3f9a00ff8811b36d9a40bbdda6193fe7e1
data/grammars/biblio.rng CHANGED
@@ -677,6 +677,9 @@
677
677
  <zeroOrMore>
678
678
  <ref name="extent"/>
679
679
  </zeroOrMore>
680
+ <optional>
681
+ <ref name="bibliographic_size"/>
682
+ </optional>
680
683
  <zeroOrMore>
681
684
  <ref name="accesslocation"/>
682
685
  </zeroOrMore>
@@ -922,9 +925,29 @@
922
925
  <text/>
923
926
  </element>
924
927
  </define>
928
+ <define name="sizevalue">
929
+ <element name="value">
930
+ <attribute name="type"/>
931
+ <text/>
932
+ </element>
933
+ </define>
934
+ <define name="bibliographic_size">
935
+ <element name="size">
936
+ <oneOrMore>
937
+ <ref name="sizevalue"/>
938
+ </oneOrMore>
939
+ </element>
940
+ </define>
925
941
  <define name="extent">
926
942
  <element name="extent">
927
- <ref name="BibItemLocality"/>
943
+ <choice>
944
+ <zeroOrMore>
945
+ <ref name="locality"/>
946
+ </zeroOrMore>
947
+ <zeroOrMore>
948
+ <ref name="localityStack"/>
949
+ </zeroOrMore>
950
+ </choice>
928
951
  </element>
929
952
  </define>
930
953
  <define name="series">
data/grammars/isodoc.rng CHANGED
@@ -152,9 +152,7 @@
152
152
  <data type="boolean"/>
153
153
  </attribute>
154
154
  </optional>
155
- <oneOrMore>
156
- <ref name="PureTextElement"/>
157
- </oneOrMore>
155
+ <ref name="XrefBody"/>
158
156
  </element>
159
157
  </define>
160
158
  <define name="erefType">
@@ -188,6 +186,42 @@
188
186
  <ref name="PureTextElement"/>
189
187
  </oneOrMore>
190
188
  </define>
189
+ <define name="localityStack">
190
+ <element name="localityStack">
191
+ <optional>
192
+ <attribute name="connective">
193
+ <choice>
194
+ <value>and</value>
195
+ <value>or</value>
196
+ <value>from</value>
197
+ <value>to</value>
198
+ <value/>
199
+ </choice>
200
+ </attribute>
201
+ </optional>
202
+ <zeroOrMore>
203
+ <ref name="locality"/>
204
+ </zeroOrMore>
205
+ </element>
206
+ </define>
207
+ <define name="sourceLocalityStack">
208
+ <element name="sourceLocalityStack">
209
+ <optional>
210
+ <attribute name="connective">
211
+ <choice>
212
+ <value>and</value>
213
+ <value>or</value>
214
+ <value>from</value>
215
+ <value>to</value>
216
+ <value/>
217
+ </choice>
218
+ </attribute>
219
+ </optional>
220
+ <zeroOrMore>
221
+ <ref name="sourceLocality"/>
222
+ </zeroOrMore>
223
+ </element>
224
+ </define>
191
225
  <define name="ul">
192
226
  <element name="ul">
193
227
  <attribute name="id">
@@ -1098,6 +1132,16 @@
1098
1132
  </define>
1099
1133
  </include>
1100
1134
  <!-- end overrides -->
1135
+ <define name="image" combine="choice">
1136
+ <element name="svg">
1137
+ <oneOrMore>
1138
+ <choice>
1139
+ <text/>
1140
+ <ref name="AnyElement"/>
1141
+ </choice>
1142
+ </oneOrMore>
1143
+ </element>
1144
+ </define>
1101
1145
  <define name="MultilingualRenderingType">
1102
1146
  <choice>
1103
1147
  <value>common</value>
@@ -2631,4 +2675,30 @@
2631
2675
  </zeroOrMore>
2632
2676
  </element>
2633
2677
  </define>
2678
+ <define name="XrefBody">
2679
+ <zeroOrMore>
2680
+ <ref name="XrefTarget"/>
2681
+ </zeroOrMore>
2682
+ <oneOrMore>
2683
+ <ref name="PureTextElement"/>
2684
+ </oneOrMore>
2685
+ </define>
2686
+ <define name="XrefTarget">
2687
+ <element name="location">
2688
+ <attribute name="target">
2689
+ <data type="string">
2690
+ <param name="pattern">\i\c*|\c+#\c+</param>
2691
+ </data>
2692
+ </attribute>
2693
+ <attribute name="connective">
2694
+ <choice>
2695
+ <value>and</value>
2696
+ <value>or</value>
2697
+ <value>from</value>
2698
+ <value>to</value>
2699
+ <value/>
2700
+ </choice>
2701
+ </attribute>
2702
+ </element>
2703
+ </define>
2634
2704
  </grammar>
@@ -12,7 +12,7 @@ module Relaton3gpp
12
12
  end
13
13
 
14
14
  # @param item_hash [Hash]
15
- # @return [RelatonBib::BibliographicItem]
15
+ # @return [Relaton3gpp::BibliographicItem]
16
16
  def bib_item(item_hash)
17
17
  BibliographicItem.new(**item_hash)
18
18
  end
@@ -134,16 +134,18 @@ module Relaton3gpp
134
134
  # @return [Array<RelatonBib::BibliographicDate>] date
135
135
  #
136
136
  def parse_date
137
- d = []
138
- if @row[:completed]
139
- cd = Date.parse(@row[:completed]).to_s
140
- d << RelatonBib::BibliographicDate.new(type: "created", on: cd)
137
+ dates = { completed: "created", ACHIEVED_DATE: "published" }.each_with_object([]) do |(k, t), d|
138
+ # if @row[:completed]
139
+ next unless @row[k]
140
+
141
+ cd = Date.parse(@row[k]).to_s
142
+ d << RelatonBib::BibliographicDate.new(type: t, on: cd)
141
143
  end
142
144
  if @spec[:"title verified"]
143
145
  td = Date.parse(@spec[:"title verified"]).to_s
144
- d << RelatonBib::BibliographicDate.new(type: "confirmed", on: td)
146
+ dates << RelatonBib::BibliographicDate.new(type: "confirmed", on: td)
145
147
  end
146
- d
148
+ dates
147
149
  end
148
150
 
149
151
  #
@@ -248,7 +250,8 @@ module Relaton3gpp
248
250
  org = RelatonBib::Organization.new(
249
251
  name: "3rd Generation Partnership Project", abbreviation: "3GPP", contact: [address],
250
252
  )
251
- contribs = [RelatonBib::ContributionInfo.new(entity: org, role: [type: "author"])]
253
+ roles = [{ type: "author" }, { type: "publisher" }]
254
+ contribs = [RelatonBib::ContributionInfo.new(entity: org, role: roles)]
252
255
  return contribs unless @tstatus && @tstatus[:rapporteur]
253
256
 
254
257
  aff = []
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Relaton3gpp
4
- VERSION = "1.10.4"
4
+ VERSION = "1.11.1"
5
5
  end
data/relaton_3gpp.gemspec CHANGED
@@ -46,6 +46,6 @@ Gem::Specification.new do |spec|
46
46
 
47
47
  spec.add_dependency "mdb", "~> 0.5.0"
48
48
  spec.add_dependency "net-ftp", "~> 0.1.0"
49
- spec.add_dependency "relaton-bib", "~> 1.10.1"
49
+ spec.add_dependency "relaton-bib", "~> 1.11.0"
50
50
  spec.add_dependency "rubyzip", "~> 2.3.0"
51
51
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: relaton-3gpp
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.10.4
4
+ version: 1.11.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: 2022-02-11 00:00:00.000000000 Z
11
+ date: 2022-04-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: equivalent-xml
@@ -156,14 +156,14 @@ dependencies:
156
156
  requirements:
157
157
  - - "~>"
158
158
  - !ruby/object:Gem::Version
159
- version: 1.10.1
159
+ version: 1.11.0
160
160
  type: :runtime
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
164
  - - "~>"
165
165
  - !ruby/object:Gem::Version
166
- version: 1.10.1
166
+ version: 1.11.0
167
167
  - !ruby/object:Gem::Dependency
168
168
  name: rubyzip
169
169
  requirement: !ruby/object:Gem::Requirement