relaton-un 0.2.1 → 1.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/grammars/biblio.rng +56 -18
  3. data/grammars/isodoc.rng +34 -4
  4. data/grammars/un.rng +1 -0
  5. data/lib/relaton_un/hit.rb +6 -0
  6. data/lib/relaton_un/un_bibliographic_item.rb +1 -1
  7. data/lib/relaton_un/version.rb +1 -1
  8. data/relaton_un.gemspec +1 -1
  9. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a0fcd871844a8cafc3b613fc6e77ccd219717122b95bfdfafca8362b46f63490
4
- data.tar.gz: 952d86d121183c5a32e822a2f7bb3ae651851f87999dfe21ccf0bb0b302fbf5f
3
+ metadata.gz: 851d540a537d8316ebf0602d8d1ddea7644a93fb9dd0393b3c3f02a2bd17df56
4
+ data.tar.gz: 2d84ceb7c58037809e716abf6cd93a97b5918fe033ff5cd4a0807dc98e487e23
5
5
  SHA512:
6
- metadata.gz: 03c2ccfe9ce6cce797f2a5c905b74976793c8245ed36b813dfaf55e3989e1cdb41426a6d52a357c71cffa42d67427d78ae6c4d3418fdf471b176276557ff2579
7
- data.tar.gz: 9f2c4b1db54d38a5e48407a33d01aab3d2e98c8d6eec700262f33f00505d7a2339378a5511ba600cad13a01ee710c5e4ba1e6ef703282644f4febe46b660fad0
6
+ metadata.gz: ce848fe8ae8429f59005d64c15e1e93226743b4d09ef51948f3fcf1d6bb10def18fcba34c31f3c5cc0b56bf4e64abe074b1bdd1a9227bc14e2711e222b3d415d
7
+ data.tar.gz: d89ee672523fb489857f181a1f3a77393104e99d45b39d111b391a768f8258b10b91cec5389836b54477c24b697ef9e8a3604f657235fa67e1e40f6f812e742f
data/grammars/biblio.rng CHANGED
@@ -49,11 +49,17 @@
49
49
  </define>
50
50
  <define name="stage">
51
51
  <element name="stage">
52
+ <optional>
53
+ <attribute name="abbreviation"/>
54
+ </optional>
52
55
  <text/>
53
56
  </element>
54
57
  </define>
55
58
  <define name="substage">
56
59
  <element name="substage">
60
+ <optional>
61
+ <attribute name="abbreviation"/>
62
+ </optional>
57
63
  <text/>
58
64
  </element>
59
65
  </define>
@@ -452,9 +458,14 @@
452
458
  <attribute name="bibitemid">
453
459
  <data type="IDREF"/>
454
460
  </attribute>
455
- <zeroOrMore>
456
- <ref name="locality"/>
457
- </zeroOrMore>
461
+ <choice>
462
+ <zeroOrMore>
463
+ <ref name="locality"/>
464
+ </zeroOrMore>
465
+ <zeroOrMore>
466
+ <ref name="localityStack"/>
467
+ </zeroOrMore>
468
+ </choice>
458
469
  <optional>
459
470
  <ref name="date"/>
460
471
  </optional>
@@ -469,6 +480,25 @@
469
480
  <ref name="BibItemLocality"/>
470
481
  </element>
471
482
  </define>
483
+ <define name="localityStack">
484
+ <element name="localityStack">
485
+ <zeroOrMore>
486
+ <ref name="locality"/>
487
+ </zeroOrMore>
488
+ </element>
489
+ </define>
490
+ <define name="sourceLocality">
491
+ <element name="sourceLocality">
492
+ <ref name="BibItemLocality"/>
493
+ </element>
494
+ </define>
495
+ <define name="sourceLocalityStack">
496
+ <element name="sourceLocalityStack">
497
+ <zeroOrMore>
498
+ <ref name="sourceLocality"/>
499
+ </zeroOrMore>
500
+ </element>
501
+ </define>
472
502
  <define name="BibItemLocality">
473
503
  <attribute name="type">
474
504
  <ref name="LocalityType"/>
@@ -703,21 +733,11 @@
703
733
  </define>
704
734
  <define name="TypedTitleString">
705
735
  <optional>
706
- <attribute name="type">
707
- <ref name="TitleType"/>
708
- </attribute>
736
+ <attribute name="type"/>
709
737
  </optional>
710
738
  <ref name="FormattedString"/>
711
739
  </define>
712
- <define name="TitleType">
713
- <choice>
714
- <value>alternative</value>
715
- <value>original</value>
716
- <value>unofficial</value>
717
- <value>subtitle</value>
718
- <value>main</value>
719
- </choice>
720
- </define>
740
+ <!-- TitleType = ( "alternative" | "original" | "unofficial" | "subtitle" | "main" ) -->
721
741
  <define name="TypedUri">
722
742
  <optional>
723
743
  <attribute name="type"/>
@@ -1038,12 +1058,30 @@
1038
1058
  <attribute name="type">
1039
1059
  <ref name="DocRelationType"/>
1040
1060
  </attribute>
1061
+ <optional>
1062
+ <element name="description">
1063
+ <ref name="FormattedString"/>
1064
+ </element>
1065
+ </optional>
1041
1066
  <element name="bibitem">
1042
1067
  <ref name="BibliographicItem"/>
1043
1068
  </element>
1044
- <zeroOrMore>
1045
- <ref name="locality"/>
1046
- </zeroOrMore>
1069
+ <choice>
1070
+ <zeroOrMore>
1071
+ <ref name="locality"/>
1072
+ </zeroOrMore>
1073
+ <zeroOrMore>
1074
+ <ref name="localityStack"/>
1075
+ </zeroOrMore>
1076
+ </choice>
1077
+ <choice>
1078
+ <zeroOrMore>
1079
+ <ref name="sourceLocality"/>
1080
+ </zeroOrMore>
1081
+ <zeroOrMore>
1082
+ <ref name="sourceLocalityStack"/>
1083
+ </zeroOrMore>
1084
+ </choice>
1047
1085
  </element>
1048
1086
  </define>
1049
1087
  <define name="version">
data/grammars/isodoc.rng CHANGED
@@ -101,9 +101,7 @@
101
101
  <ref name="structuredidentifier"/>
102
102
  </zeroOrMore>
103
103
  </define>
104
- <define name="TitleType">
105
- <text/>
106
- </define>
104
+ <!-- TitleType = text -->
107
105
  <define name="sections">
108
106
  <element name="sections">
109
107
  <oneOrMore>
@@ -305,8 +303,23 @@
305
303
  <ref name="paragraph"/>
306
304
  </element>
307
305
  </define>
306
+ <define name="TextElement" combine="choice">
307
+ <ref name="concept"/>
308
+ </define>
308
309
  </include>
309
310
  <!-- end overrides -->
311
+ <define name="concept">
312
+ <element name="concept">
313
+ <optional>
314
+ <attribute name="term"/>
315
+ </optional>
316
+ <choice>
317
+ <ref name="eref"/>
318
+ <ref name="xref"/>
319
+ <ref name="termref"/>
320
+ </choice>
321
+ </element>
322
+ </define>
310
323
  <define name="BasicBlock" combine="choice">
311
324
  <choice>
312
325
  <ref name="requirement"/>
@@ -645,6 +658,11 @@
645
658
  <optional>
646
659
  <attribute name="script"/>
647
660
  </optional>
661
+ <optional>
662
+ <attribute name="inline-header">
663
+ <data type="boolean"/>
664
+ </attribute>
665
+ </optional>
648
666
  <optional>
649
667
  <attribute name="obligation">
650
668
  <choice>
@@ -908,7 +926,10 @@
908
926
  </define>
909
927
  <define name="origin">
910
928
  <element name="origin">
911
- <ref name="erefType"/>
929
+ <choice>
930
+ <ref name="erefType"/>
931
+ <ref name="termref"/>
932
+ </choice>
912
933
  </element>
913
934
  </define>
914
935
  <define name="modification">
@@ -916,6 +937,15 @@
916
937
  <ref name="paragraph"/>
917
938
  </element>
918
939
  </define>
940
+ <define name="termref">
941
+ <element name="termref">
942
+ <attribute name="base"/>
943
+ <attribute name="target"/>
944
+ <optional>
945
+ <text/>
946
+ </optional>
947
+ </element>
948
+ </define>
919
949
  <define name="structuredidentifier">
920
950
  <element name="structuredidentifier">
921
951
  <optional>
data/grammars/un.rng CHANGED
@@ -223,6 +223,7 @@
223
223
  <value>general</value>
224
224
  <value>limited</value>
225
225
  <value>restricted</value>
226
+ <value>provisional</value>
226
227
  </choice>
227
228
  </element>
228
229
  </define>
data/lib/relaton_un/hit.rb CHANGED
@@ -74,6 +74,7 @@ module RelatonUn
74
74
  session: fetch_session,
75
75
  distribution: fetch_distribution,
76
76
  editorialgroup: fetch_editorialgroup,
77
+ classification: fetch_classification,
77
78
  )
78
79
  end
79
80
  # rubocop:enable Metrics/MethodLength
@@ -141,5 +142,10 @@ module RelatonUn
141
142
 
142
143
  RelatonUn::EditorialGroup.new tc
143
144
  end
145
+
146
+ # @return [Array<RelatonBib::Classification>]
147
+ def fetch_classification
148
+ [RelatonBib::Classification.new(type: "area", value: "UNDOC")]
149
+ end
144
150
  end
145
151
  end
data/lib/relaton_un/un_bibliographic_item.rb CHANGED
@@ -6,7 +6,7 @@ module RelatonUn
6
6
  ].freeze
7
7
 
8
8
  DISTRIBUTIONS = { "GEN" => "general", "LTD" => "limited",
9
- "DER" => "restricted" }.freeze
9
+ "DER" => "restricted", "PRO" => "provisional" }.freeze
10
10
 
11
11
  # @return [RelatonUn::Session, NilClass]
12
12
  attr_reader :session
data/lib/relaton_un/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module RelatonUn
2
- VERSION = "0.2.1".freeze
2
+ VERSION = "1.0.0".freeze
3
3
  end
data/relaton_un.gemspec CHANGED
@@ -43,7 +43,7 @@ Gem::Specification.new do |spec|
43
43
 
44
44
  spec.add_dependency "faraday"
45
45
  spec.add_dependency "http-cookie"
46
- spec.add_dependency "relaton-iso-bib", ">= 0.9.2"
46
+ spec.add_dependency "relaton-iso-bib", "~> 1.0.0"
47
47
  spec.add_dependency "unf_ext", ">= 0.0.7.7"
48
48
  end
49
49
  # rubocop:enable Metrics/BlockLength
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: 0.2.1
4
+ version: 1.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2020-04-19 00:00:00.000000000 Z
11
+ date: 2020-04-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: debase
@@ -154,16 +154,16 @@ dependencies:
154
154
  name: relaton-iso-bib
155
155
  requirement: !ruby/object:Gem::Requirement
156
156
  requirements:
157
- - - ">="
157
+ - - "~>"
158
158
  - !ruby/object:Gem::Version
159
- version: 0.9.2
159
+ version: 1.0.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: 0.9.2
166
+ version: 1.0.0
167
167
  - !ruby/object:Gem::Dependency
168
168
  name: unf_ext
169
169
  requirement: !ruby/object:Gem::Requirement