relaton-w3c 1.17.0 → 1.17.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2be8f996d2817de1178521c3e44076641c356a5070b80ed224f08c81e90c4013
4
- data.tar.gz: 402ef37f8f0e22f6c7887df9d11665f79b1bd4ab16545c67b63a1fa2cd65d675
3
+ metadata.gz: 93cc28a3d425ad3b7eae1f905690747b2a700cd54eb6f97506cb47d4007970fc
4
+ data.tar.gz: ea68818b5814465e9610bb271d32f5f753a8f424db0c4669986b8bc7879758bf
5
5
  SHA512:
6
- metadata.gz: 199b908dac06eee499d675bf44cf9d0c8df53968ee639a11f4f914c6ae2ac03281d01dce19cafe92c1427a03f342a93ce071556eccf11c612df8c8f41961f7ad
7
- data.tar.gz: f65c63b39d3a6b2210ae02402f241951254f5f6c2c6eec108ba62c29ed8ad796bbb55362ca4e3710373cc911bd8b8eec4074464c4636bb1c1dd954e719c37549
6
+ metadata.gz: cb28efbe7ab797ff44c0af784bb71f55fe61b19bb63684d0096be2cb9f716ce27ae3f23f18411a570456036b66f2e2ded4460a2a7cadf3206c42895e60171b87
7
+ data.tar.gz: f0cf0e02cd8809328e1f929e346a2a5c47b27be42886419e1a99a0a8afeb2422efe12fbf5ef39fd23615f63da8ff29527260cdaac9de0be7b48849c7c09dec87
@@ -914,44 +914,47 @@
914
914
  -->
915
915
  <define name="image">
916
916
  <element name="image">
917
- <attribute name="id">
918
- <data type="ID"/>
917
+ <ref name="Image"/>
918
+ </element>
919
+ </define>
920
+ <define name="Image">
921
+ <attribute name="id">
922
+ <data type="ID"/>
923
+ </attribute>
924
+ <attribute name="src">
925
+ <data type="anyURI"/>
926
+ </attribute>
927
+ <attribute name="mimetype"/>
928
+ <optional>
929
+ <attribute name="filename"/>
930
+ </optional>
931
+ <optional>
932
+ <attribute name="width">
933
+ <choice>
934
+ <data type="int"/>
935
+ <value>auto</value>
936
+ </choice>
919
937
  </attribute>
920
- <attribute name="src">
938
+ </optional>
939
+ <optional>
940
+ <attribute name="height">
941
+ <choice>
942
+ <data type="int"/>
943
+ <value>auto</value>
944
+ </choice>
945
+ </attribute>
946
+ </optional>
947
+ <optional>
948
+ <attribute name="alt"/>
949
+ </optional>
950
+ <optional>
951
+ <attribute name="title"/>
952
+ </optional>
953
+ <optional>
954
+ <attribute name="longdesc">
921
955
  <data type="anyURI"/>
922
956
  </attribute>
923
- <attribute name="mimetype"/>
924
- <optional>
925
- <attribute name="filename"/>
926
- </optional>
927
- <optional>
928
- <attribute name="width">
929
- <choice>
930
- <data type="int"/>
931
- <value>auto</value>
932
- </choice>
933
- </attribute>
934
- </optional>
935
- <optional>
936
- <attribute name="height">
937
- <choice>
938
- <data type="int"/>
939
- <value>auto</value>
940
- </choice>
941
- </attribute>
942
- </optional>
943
- <optional>
944
- <attribute name="alt"/>
945
- </optional>
946
- <optional>
947
- <attribute name="title"/>
948
- </optional>
949
- <optional>
950
- <attribute name="longdesc">
951
- <data type="anyURI"/>
952
- </attribute>
953
- </optional>
954
- </element>
957
+ </optional>
955
958
  </define>
956
959
  <define name="video">
957
960
  <element name="video">
data/grammars/biblio.rng CHANGED
@@ -348,6 +348,9 @@
348
348
  <zeroOrMore>
349
349
  <ref name="contact"/>
350
350
  </zeroOrMore>
351
+ <optional>
352
+ <ref name="logo"/>
353
+ </optional>
351
354
  </element>
352
355
  </define>
353
356
  <define name="orgname">
@@ -366,6 +369,21 @@
366
369
  </choice>
367
370
  </element>
368
371
  </define>
372
+ <define name="logo">
373
+ <element name="logo">
374
+ <ref name="image"/>
375
+ </element>
376
+ </define>
377
+ <define name="depiction">
378
+ <element name="depiction">
379
+ <optional>
380
+ <attribute name="scope"/>
381
+ </optional>
382
+ <zeroOrMore>
383
+ <ref name="image"/>
384
+ </zeroOrMore>
385
+ </element>
386
+ </define>
369
387
  <define name="NameWithVariants">
370
388
  <element name="primary">
371
389
  <ref name="LocalizedString"/>
@@ -752,6 +770,9 @@
752
770
  <optional>
753
771
  <ref name="validity"/>
754
772
  </optional>
773
+ <optional>
774
+ <ref name="depiction"/>
775
+ </optional>
755
776
  </define>
756
777
  <define name="ReducedBibliographicItem">
757
778
  <optional>
@@ -1,6 +1,6 @@
1
1
  module RelatonW3c
2
2
  class PubId
3
- PARTS = %i[code stage type date suff].freeze
3
+ PARTS = %i[code stage type year date suff].freeze
4
4
 
5
5
  PARTS.each { |part| attr_accessor part }
6
6
 
@@ -19,12 +19,14 @@ module RelatonW3c
19
19
  %r{
20
20
  (?:^|/)(?:(?:(?<stage>WD|CRD|CR|PR|PER|REC|SPSD|OBSL|RET)|(?<type>D?NOTE|TR))[\s/-])?
21
21
  (?<code>\w+(?:[+-][\w.]+)*?)
22
- (?:-(?<date>\d{8}|\d{6}|\d{4}))?
22
+ (?:-(?<year>\d{4}))?
23
+ (?:-(?<date>\d{8}|\d{6}))?
23
24
  (?:/(?<suff>\w+))?(?:$|/)
24
25
  }xi =~ docnumber
25
26
  entry = { code: code }
26
27
  entry[:stage] = stage if stage
27
28
  entry[:type] = type if type && type != "TR"
29
+ entry[:year] = year if year
28
30
  entry[:date] = date if date
29
31
  entry[:suff] = suff if suff
30
32
  new(**entry)
@@ -39,7 +41,8 @@ module RelatonW3c
39
41
  #
40
42
  def ==(other) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
41
43
  other[:code].casecmp?(code) && other[:stage] == stage && other[:type] == type &&
42
- (date.nil? || other[:date] == date) && (suff.nil? || other[:suff]&.casecmp?(suff))
44
+ (year.nil? || other[:year] == year) && (date.nil? || other[:date] == date) &&
45
+ (suff.nil? || other[:suff]&.casecmp?(suff))
43
46
  end
44
47
 
45
48
  #
@@ -1,3 +1,3 @@
1
1
  module RelatonW3c
2
- VERSION = "1.17.0".freeze
2
+ VERSION = "1.17.1".freeze
3
3
  end
@@ -16,7 +16,7 @@ module RelatonW3c
16
16
  index = Relaton::Index.find_or_create(
17
17
  :W3C, url: "#{SOURCE}#{INDEX}.zip", file: "#{INDEX}.yaml", id_keys: PubId::PARTS
18
18
  )
19
- row = index.search { |r| pubid == r[:id] }.first
19
+ row = index.search { |r| pubid == r[:id] }.sort_by{ |r| (r[:id][:date] || r[:id][:year]).to_i }.last
20
20
  return unless row
21
21
 
22
22
  url = "#{SOURCE}#{row[:file]}"
@@ -46,7 +46,7 @@ module RelatonW3c
46
46
  return
47
47
  end
48
48
 
49
- found = result.docnumber
49
+ found = result.docidentifier.first.id
50
50
  Util.warn "(#{ref}) Found: `#{found}`"
51
51
  result
52
52
  end
@@ -30,10 +30,10 @@
30
30
  name: Mobile Web Best Practices Working Group
31
31
  abbrev: BPWG
32
32
  'www.w3.org/WAI/EO':
33
- name: Education and Outreach Working Group
33
+ name: Education and Outreach Working Group
34
34
  abbrev: EOWG
35
35
  'www.w3.org/WAI/about/groups/eowg':
36
- name: Education and Outreach Working Group
36
+ name: Education and Outreach Working Group
37
37
  abbrev: EOWG
38
38
  'www.w3.org/2001/sw/WebOnt':
39
39
  name: Web-Ontology Working Group
@@ -208,7 +208,7 @@
208
208
  'www.w3.org/2008/WebVideo/Fragments':
209
209
  name: Media Fragments Working Group
210
210
  'www.w3.org/2011/mbui':
211
- name: Model-Based User Interfaces Working Group
211
+ name: Model-Based User Interfaces Working Group
212
212
  abbrev: MBUI WG
213
213
  'www.w3.org/International/its':
214
214
  name: ITS Working Group
@@ -482,4 +482,27 @@
482
482
  name: HTML Working Group
483
483
  abbrev: HTMLWG
484
484
  'www.w3.org/groups/wg/audio':
485
- name: Audio Working Group
485
+ name: Audio Working Group
486
+ 'www.w3.org/groups/wg/webperf':
487
+ name: Web Performance Working Group
488
+ 'www.w3.org/groups/wg/webauthn':
489
+ name: Web Authentication Working Group
490
+ abbrev: WebAuthn WG
491
+ 'www.w3.org/Privacy/IG':
492
+ name: Privacy Interest Group
493
+ abbrev: PING
494
+ 'www.w3.org/groups/wg/json-ld':
495
+ name: JSON-LD Working Group
496
+ 'www.w3.org/groups/wg/rdf-star':
497
+ name: RDF-star Working Group
498
+ 'www.w3.org/groups/wg/png':
499
+ name: Portable Network Graphics (PNG) Working Group
500
+ abbrev: PNG WG
501
+ 'www.w3.org/web-networks':
502
+ name: Web & Networks Interest Group
503
+ 'www.w3.org/groups/wg/pm':
504
+ name: Publishing Maintenance Working Group
505
+ abbrev: PM WG
506
+ 'www.w3.org/groups/wg/rch':
507
+ name: RDF Dataset Canonicalization and Hash Working Group
508
+ abbrev: RCH WG
data/relaton_w3c.gemspec CHANGED
@@ -34,9 +34,9 @@ Gem::Specification.new do |spec|
34
34
  spec.add_dependency "linkeddata", "~> 3.2.0"
35
35
  spec.add_dependency "mechanize", "~> 2.8.0"
36
36
  spec.add_dependency "rdf", "~> 3.2.0"
37
- spec.add_dependency "rdf-normalize", "~> 0.5.0"
37
+ spec.add_dependency "rdf-normalize", "~> 0.6.0"
38
38
  spec.add_dependency "relaton-bib", "~> 1.17.0"
39
- spec.add_dependency "relaton-index", "~> 0.2.4"
39
+ spec.add_dependency "relaton-index", "~> 0.2.8"
40
40
  spec.add_dependency "rubyzip", "~> 2.3.0"
41
41
  spec.add_dependency "shex", "~> 0.7.0"
42
42
  spec.add_dependency "sparql", "~> 3.2.0"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: relaton-w3c
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.17.0
4
+ version: 1.17.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: 2023-11-27 00:00:00.000000000 Z
11
+ date: 2023-12-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: linkeddata
@@ -58,14 +58,14 @@ dependencies:
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 0.5.0
61
+ version: 0.6.0
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: 0.5.0
68
+ version: 0.6.0
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: relaton-bib
71
71
  requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
86
86
  requirements:
87
87
  - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: 0.2.4
89
+ version: 0.2.8
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
94
  - - "~>"
95
95
  - !ruby/object:Gem::Version
96
- version: 0.2.4
96
+ version: 0.2.8
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: rubyzip
99
99
  requirement: !ruby/object:Gem::Requirement