relaton-gb 1.8.0 → 1.10.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (18) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/rake.yml +1 -11
  3. data/.rubocop.yml +3 -1
  4. data/README.adoc +10 -0
  5. data/grammars/basicdoc.rng +26 -7
  6. data/grammars/biblio.rng +8 -5
  7. data/grammars/gbstandard.rng +4 -1
  8. data/grammars/isodoc.rng +686 -96
  9. data/grammars/isostandard.rng +42 -26
  10. data/grammars/reqt.rng +34 -5
  11. data/lib/relaton_gb/gb_bibliography.rb +7 -6
  12. data/lib/relaton_gb/gb_scrapper.rb +8 -9
  13. data/lib/relaton_gb/scrapper.rb +1 -1
  14. data/lib/relaton_gb/sec_scrapper.rb +3 -3
  15. data/lib/relaton_gb/t_scrapper.rb +2 -2
  16. data/lib/relaton_gb/version.rb +1 -1
  17. data/relaton_gb.gemspec +3 -5
  18. metadata +9 -9
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 32983d0e786c9f73c0e332a40cd6b43c5eb712a2e46bad9a085df562482fe493
4
- data.tar.gz: 2b05de912dc96c46f4095349eb9e48e2fc0ea63b9494ab490cc8a9377b048a6c
3
+ metadata.gz: 40dd731856bc78b4c9dc2acbae59a5d00f50c40ab3df0eedb6b81d57af01cb4f
4
+ data.tar.gz: be2f6c6b2ebbf03262e6126cd4ee839c37baa7083be13ebbcd528e9553014dda
5
5
  SHA512:
6
- metadata.gz: 4f4da11264ac8c1f9a390151875fd9bb743c34f4b155ef107ed2871f06b096305cba86fd7383180c6357aab6f7c19dece91c1c376eb92e1c9dfe39d0e42c8f24
7
- data.tar.gz: 7d20394e227dab5e9e6539a8d822a3b251c54cb9dc77b29c39e614ef854961e1af79c7c67afb8170e6928a4c741328f013e2bd0615b9ee22c6425d8fef17db28
6
+ metadata.gz: 15c28bc8e285f1a9187f60123cf53a9fd90f1dbbeeb2aa765fb18f22141c472f065e9eb435bdefa7943a01d6022d1969230fabbec76db13ea147c7a98c0cc302
7
+ data.tar.gz: f8a7e8da5f9457b677e9dfa39e9046927cbf34c436a1bf73245c0ec1f451dd91e18a5bd838d82748bee750e438cd69c48a94a726b1c0c2e8583ddd78e0d32b10
data/.github/workflows/rake.yml CHANGED
@@ -16,19 +16,9 @@ jobs:
16
16
  strategy:
17
17
  fail-fast: false
18
18
  matrix:
19
- ruby: [ '2.7', '2.6', '2.5', '2.4' ]
19
+ ruby: [ '3.0', '2.7', '2.6', '2.5' ]
20
20
  os: [ ubuntu-latest, windows-latest, macos-latest ]
21
21
  experimental: [ false ]
22
- include:
23
- - ruby: '3.0'
24
- os: 'ubuntu-latest'
25
- experimental: true
26
- - ruby: '3.0'
27
- os: 'windows-latest'
28
- experimental: true
29
- - ruby: '3.0'
30
- os: 'macos-latest'
31
- experimental: true
32
22
  steps:
33
23
  - uses: actions/checkout@v2
34
24
  with:
data/.rubocop.yml CHANGED
@@ -2,9 +2,11 @@
2
2
  # https://github.com/riboseinc/oss-guides
3
3
  # All project-specific additions and overrides should be specified in this file.
4
4
 
5
+ require: rubocop-rails
6
+
5
7
  inherit_from:
6
8
  - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
7
9
  AllCops:
8
- TargetRubyVersion: 2.4
10
+ TargetRubyVersion: 2.5
9
11
  Rails:
10
12
  Enabled: false
data/README.adoc CHANGED
@@ -183,6 +183,16 @@ hit_collection.first.fetch.to_xml bibdata: true
183
183
  </bibdata>"
184
184
  ----
185
185
 
186
+ === Typed links
187
+
188
+ Each GB document has `src` type link.
189
+
190
+ [source,ruby]
191
+ ----
192
+ hit_collection.first.fetch.link
193
+ => [#<RelatonBib::TypedUri:0x00007fee2c0257e8 @content=#<Addressable::URI:0x67c URI:http://openstd.samr.gov.cn/bzgk/gb/newGbInfo?hcno=083B48FA72DBD3B9BDE74507BC31736A>, @type="src">]
194
+ ----
195
+
186
196
  == Development
187
197
 
188
198
  After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
data/grammars/basicdoc.rng CHANGED
@@ -173,9 +173,11 @@
173
173
  <data type="dateTime"/>
174
174
  </attribute>
175
175
  </optional>
176
- <attribute name="from">
177
- <data type="IDREF"/>
178
- </attribute>
176
+ <optional>
177
+ <attribute name="from">
178
+ <data type="IDREF"/>
179
+ </attribute>
180
+ </optional>
179
181
  <optional>
180
182
  <attribute name="to">
181
183
  <data type="IDREF"/>
@@ -624,6 +626,9 @@
624
626
  <choice>
625
627
  <ref name="PureTextElement"/>
626
628
  <ref name="stem"/>
629
+ <ref name="eref"/>
630
+ <ref name="xref"/>
631
+ <ref name="hyperlink"/>
627
632
  </choice>
628
633
  </zeroOrMore>
629
634
  </element>
@@ -634,6 +639,9 @@
634
639
  <choice>
635
640
  <ref name="PureTextElement"/>
636
641
  <ref name="stem"/>
642
+ <ref name="eref"/>
643
+ <ref name="xref"/>
644
+ <ref name="hyperlink"/>
637
645
  </choice>
638
646
  </zeroOrMore>
639
647
  </element>
@@ -641,7 +649,12 @@
641
649
  <define name="tt">
642
650
  <element name="tt">
643
651
  <zeroOrMore>
644
- <ref name="PureTextElement"/>
652
+ <choice>
653
+ <ref name="PureTextElement"/>
654
+ <ref name="eref"/>
655
+ <ref name="xref"/>
656
+ <ref name="hyperlink"/>
657
+ </choice>
645
658
  </zeroOrMore>
646
659
  </element>
647
660
  </define>
@@ -822,7 +835,9 @@
822
835
  <attribute name="alt"/>
823
836
  </optional>
824
837
  <ref name="CitationType"/>
825
- <text/>
838
+ <oneOrMore>
839
+ <ref name="PureTextElement"/>
840
+ </oneOrMore>
826
841
  </define>
827
842
  <define name="hyperlink">
828
843
  <element name="link">
@@ -835,7 +850,9 @@
835
850
  <optional>
836
851
  <attribute name="alt"/>
837
852
  </optional>
838
- <text/>
853
+ <oneOrMore>
854
+ <ref name="PureTextElement"/>
855
+ </oneOrMore>
839
856
  </element>
840
857
  </define>
841
858
  <define name="xref">
@@ -849,7 +866,9 @@
849
866
  <optional>
850
867
  <attribute name="alt"/>
851
868
  </optional>
852
- <text/>
869
+ <oneOrMore>
870
+ <ref name="PureTextElement"/>
871
+ </oneOrMore>
853
872
  </element>
854
873
  </define>
855
874
  <define name="fn">
data/grammars/biblio.rng CHANGED
@@ -209,9 +209,6 @@
209
209
  <zeroOrMore>
210
210
  <ref name="contact"/>
211
211
  </zeroOrMore>
212
- <zeroOrMore>
213
- <ref name="uri"/>
214
- </zeroOrMore>
215
212
  </element>
216
213
  </define>
217
214
  <define name="fullname">
@@ -401,9 +398,9 @@
401
398
  <choice>
402
399
  <!-- iso191606 TODO -->
403
400
  <group>
404
- <oneOrMore>
401
+ <zeroOrMore>
405
402
  <ref name="street"/>
406
- </oneOrMore>
403
+ </zeroOrMore>
407
404
  <ref name="city"/>
408
405
  <optional>
409
406
  <ref name="state"/>
@@ -787,6 +784,7 @@
787
784
  <value>adapted</value>
788
785
  <value>vote-started</value>
789
786
  <value>vote-ended</value>
787
+ <value>announced</value>
790
788
  </choice>
791
789
  </define>
792
790
  <define name="bdate">
@@ -827,6 +825,11 @@
827
825
  <optional>
828
826
  <attribute name="scope"/>
829
827
  </optional>
828
+ <optional>
829
+ <attribute name="primary">
830
+ <data type="boolean"/>
831
+ </attribute>
832
+ </optional>
830
833
  <text/>
831
834
  </element>
832
835
  </define>
data/grammars/gbstandard.rng CHANGED
@@ -44,7 +44,7 @@
44
44
  <optional>
45
45
  <ref name="termdomain"/>
46
46
  </optional>
47
- <ref name="definition"/>
47
+ <!-- <ref name="definition"/> -->
48
48
  <zeroOrMore>
49
49
  <ref name="termnote"/>
50
50
  </zeroOrMore>
@@ -60,6 +60,9 @@
60
60
  <optional>
61
61
  <ref name="doctype"/>
62
62
  </optional>
63
+ <optional>
64
+ <ref name="docsubtype"/>
65
+ </optional>
63
66
  <zeroOrMore>
64
67
  <ref name="gbcommittee"/>
65
68
  </zeroOrMore>