relaton-cen 1.8.pre1 → 1.10.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (17) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/rake.yml +1 -11
  3. data/.rubocop.yml +3 -1
  4. data/Gemfile +0 -2
  5. data/README.adoc +10 -0
  6. data/grammars/basicdoc.rng +26 -7
  7. data/grammars/biblio.rng +3 -2
  8. data/grammars/isodoc.rng +881 -117
  9. data/grammars/isostandard.rng +42 -26
  10. data/grammars/reqt.rng +65 -7
  11. data/lib/relaton_cen/cen_bibliography.rb +3 -12
  12. data/lib/relaton_cen/hit_collection.rb +9 -7
  13. data/lib/relaton_cen/processor.rb +2 -2
  14. data/lib/relaton_cen/scrapper.rb +5 -5
  15. data/lib/relaton_cen/version.rb +1 -1
  16. data/relaton_cen.gemspec +9 -6
  17. metadata +52 -10
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c7311d1a1f3e21e2677b0644271a5e7736a6c6b4e56b2740aa68fb56394be690
4
- data.tar.gz: 1ff6740c5fe26f97153e0129a956dea49fcef286778eee645dc065cda848385c
3
+ metadata.gz: '085f9f31d68845bf7b059f2d72c37108f5c0961326c9180be37158c96c62b7e9'
4
+ data.tar.gz: 0eb930c6f94df2cc984c2eaccfccc2b8eeae44f9264436c0bd199a0b2fb3eac7
5
5
  SHA512:
6
- metadata.gz: 50f8f87fc6c6cf149079a3fcc01d0af7222481a703405e0c82750518cb5df076083a28ba35899be01704d1998c81ee34af06319286a232e2335c9e3f4f23f7ee
7
- data.tar.gz: 14e5bd6a95665bceb4d32cdcbc9b50346292dec1134e2235cb1e97fa615c9b2e6c9f68119c1e7dd27ade0ba5ab37462189c71ff8951930defdcbad325f2d51b9
6
+ metadata.gz: 1e6b4d320c12948e1286732c8130afedb09c261f1e3852110c8b8c7e706c6fdd0c17d8310e5e29d7e0605ebbfff24deeef36701731f3e270c3d017f0701fed6d
7
+ data.tar.gz: 4c625b64b79e94d97e06a7441c1a89c1ba9d6ee3d4c94855e6d468a8d318eb86f62650993c58c840a16790c79160b80a5274d936edf09aacd77eee144782da01
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/Gemfile CHANGED
@@ -8,5 +8,3 @@ gemspec
8
8
  gem "rake", "~> 13.0"
9
9
 
10
10
  gem "rspec", "~> 3.0"
11
-
12
- gem "rubocop", "~> 0.80"
data/README.adoc CHANGED
@@ -152,6 +152,16 @@ puts item.to_xml(bibdata: true)
152
152
  </bibdata>"
153
153
  ----
154
154
 
155
+ === Typed links
156
+
157
+ Each CEN document has `src` type link.
158
+
159
+ [source,ruby]
160
+ ----
161
+ item.link
162
+ => [#<RelatonBib::TypedUri:0x00007f865cf9a328 @content=#<Addressable::URI:0xbea0 URI:https://standards.cencenelec.eu/dyn/www/f?p=CEN:110:0::::FSP_PROJECT,FSP_ORG_ID:68120,6137&cs=19764D9131733FD9E70037E7A6E6740B2>, @type="src">]
163
+ ----
164
+
155
165
  === Get code, and year
156
166
  [source,ruby]
157
167
  ----
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
@@ -401,9 +401,9 @@
401
401
  <choice>
402
402
  <!-- iso191606 TODO -->
403
403
  <group>
404
- <oneOrMore>
404
+ <zeroOrMore>
405
405
  <ref name="street"/>
406
- </oneOrMore>
406
+ </zeroOrMore>
407
407
  <ref name="city"/>
408
408
  <optional>
409
409
  <ref name="state"/>
@@ -787,6 +787,7 @@
787
787
  <value>adapted</value>
788
788
  <value>vote-started</value>
789
789
  <value>vote-ended</value>
790
+ <value>announced</value>
790
791
  </choice>
791
792
  </define>
792
793
  <define name="bdate">