relaton-w3c 1.17.0 → 1.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2be8f996d2817de1178521c3e44076641c356a5070b80ed224f08c81e90c4013
-  data.tar.gz: 402ef37f8f0e22f6c7887df9d11665f79b1bd4ab16545c67b63a1fa2cd65d675
+  metadata.gz: 0c049f93ae145723942e0c78b7cfe44f563ff8fc7d4c7ff596da113986cf5dea
+  data.tar.gz: 794c23599a51e449c95b7110d79934d96d85f6431f7ca86936da2bf31ade5487
 SHA512:
-  metadata.gz: 199b908dac06eee499d675bf44cf9d0c8df53968ee639a11f4f914c6ae2ac03281d01dce19cafe92c1427a03f342a93ce071556eccf11c612df8c8f41961f7ad
-  data.tar.gz: f65c63b39d3a6b2210ae02402f241951254f5f6c2c6eec108ba62c29ed8ad796bbb55362ca4e3710373cc911bd8b8eec4074464c4636bb1c1dd954e719c37549
+  metadata.gz: a111966a8e83f72b6ee30ff59544b61c589225be59d9b93ea81eb6835c3fd873b35e5be60aa041ade3e6070b048a110e44d530cd1bd450a5b45c0585e31531b9
+  data.tar.gz: be31d8f9e366557fb23c0882022149653242f50d58b3b72a47680f2de7b903a96aab6c46222adcdcf152918537ef01bed2404535132fc9b798d7b01fba6334e2

data/grammars/basicdoc.rng

@@ -914,44 +914,47 @@
   -->
   <define name="image">
     <element name="image">
-      <attribute name="id">
-        <data type="ID"/>
+      <ref name="Image"/>
+    </element>
+  </define>
+  <define name="Image">
+    <attribute name="id">
+      <data type="ID"/>
+    </attribute>
+    <attribute name="src">
+      <data type="anyURI"/>
+    </attribute>
+    <attribute name="mimetype"/>
+    <optional>
+      <attribute name="filename"/>
+    </optional>
+    <optional>
+      <attribute name="width">
+        <choice>
+          <data type="int"/>
+          <value>auto</value>
+        </choice>
       </attribute>
-      <attribute name="src">
+    </optional>
+    <optional>
+      <attribute name="height">
+        <choice>
+          <data type="int"/>
+          <value>auto</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="alt"/>
+    </optional>
+    <optional>
+      <attribute name="title"/>
+    </optional>
+    <optional>
+      <attribute name="longdesc">
         <data type="anyURI"/>
       </attribute>
-      <attribute name="mimetype"/>
-      <optional>
-        <attribute name="filename"/>
-      </optional>
-      <optional>
-        <attribute name="width">
-          <choice>
-            <data type="int"/>
-            <value>auto</value>
-          </choice>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="height">
-          <choice>
-            <data type="int"/>
-            <value>auto</value>
-          </choice>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="alt"/>
-      </optional>
-      <optional>
-        <attribute name="title"/>
-      </optional>
-      <optional>
-        <attribute name="longdesc">
-          <data type="anyURI"/>
-        </attribute>
-      </optional>
-    </element>
+    </optional>
   </define>
   <define name="video">
     <element name="video">

data/grammars/biblio.rng

@@ -348,6 +348,9 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
+      <optional>
+        <ref name="logo"/>
+      </optional>
     </element>
   </define>
   <define name="orgname">
@@ -366,6 +369,21 @@
       </choice>
     </element>
   </define>
+  <define name="logo">
+    <element name="logo">
+      <ref name="image"/>
+    </element>
+  </define>
+  <define name="depiction">
+    <element name="depiction">
+      <optional>
+        <attribute name="scope"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="image"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="NameWithVariants">
     <element name="primary">
       <ref name="LocalizedString"/>
@@ -752,6 +770,9 @@
     <optional>
       <ref name="validity"/>
     </optional>
+    <optional>
+      <ref name="depiction"/>
+    </optional>
   </define>
   <define name="ReducedBibliographicItem">
     <optional>

data/lib/relaton_w3c/pubid.rb

@@ -1,6 +1,6 @@
 module RelatonW3c
   class PubId
-    PARTS = %i[code stage type date suff].freeze
+    PARTS = %i[code stage type year date suff].freeze
 
     PARTS.each { |part| attr_accessor part }
 
@@ -19,12 +19,14 @@ module RelatonW3c
       %r{
         (?:^|/)(?:(?:(?<stage>WD|CRD|CR|PR|PER|REC|SPSD|OBSL|RET)|(?<type>D?NOTE|TR))[\s/-])?
         (?<code>\w+(?:[+-][\w.]+)*?)
+        (?:-(?<year>(?:18|19|20)\d{2}))?
         (?:-(?<date>\d{8}|\d{6}|\d{4}))?
         (?:/(?<suff>\w+))?(?:$|/)
       }xi =~ docnumber
       entry = { code: code }
       entry[:stage] = stage if stage
       entry[:type] = type if type && type != "TR"
+      entry[:year] = year if year
       entry[:date] = date if date
       entry[:suff] = suff if suff
       new(**entry)
@@ -39,7 +41,8 @@ module RelatonW3c
     #
     def ==(other) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       other[:code].casecmp?(code) && other[:stage] == stage && other[:type] == type &&
-        (date.nil? || other[:date] == date) && (suff.nil? || other[:suff]&.casecmp?(suff))
+        (year.nil? || other[:year] == year) && (date.nil? || other[:date] == date) &&
+        (suff.nil? || other[:suff]&.casecmp?(suff))
     end
 
     #

data/lib/relaton_w3c/version.rb

@@ -1,3 +1,3 @@
 module RelatonW3c
-  VERSION = "1.17.0".freeze
+  VERSION = "1.17.2".freeze
 end

data/lib/relaton_w3c/w3c_bibliography.rb

@@ -16,7 +16,7 @@ module RelatonW3c
         index = Relaton::Index.find_or_create(
           :W3C, url: "#{SOURCE}#{INDEX}.zip", file: "#{INDEX}.yaml", id_keys: PubId::PARTS
         )
-        row = index.search { |r| pubid == r[:id] }.first
+        row = index.search { |r| pubid == r[:id] }.sort_by{ |r| (r[:id][:date] || r[:id][:year]).to_i }.last
         return unless row
 
         url = "#{SOURCE}#{row[:file]}"
@@ -46,7 +46,7 @@ module RelatonW3c
           return
         end
 
-        found = result.docnumber
+        found = result.docidentifier.first.id
         Util.warn "(#{ref}) Found: `#{found}`"
         result
       end

data/lib/relaton_w3c/workgroups.yaml

@@ -30,10 +30,10 @@
   name: Mobile Web Best Practices Working Group
   abbrev: BPWG
 'www.w3.org/WAI/EO':
-  name: Education and Outreach Working Group 
+  name: Education and Outreach Working Group
   abbrev: EOWG
 'www.w3.org/WAI/about/groups/eowg':
-  name: Education and Outreach Working Group 
+  name: Education and Outreach Working Group
   abbrev: EOWG
 'www.w3.org/2001/sw/WebOnt':
   name: Web-Ontology Working Group
@@ -208,7 +208,7 @@
 'www.w3.org/2008/WebVideo/Fragments':
   name: Media Fragments Working Group
 'www.w3.org/2011/mbui':
-  name: Model-Based User Interfaces Working Group 
+  name: Model-Based User Interfaces Working Group
   abbrev: MBUI WG
 'www.w3.org/International/its':
   name: ITS Working Group
@@ -482,4 +482,27 @@
   name: HTML Working Group
   abbrev: HTMLWG
 'www.w3.org/groups/wg/audio':
-  name: Audio Working Group
+  name: Audio Working Group
+'www.w3.org/groups/wg/webperf':
+  name: Web Performance Working Group
+'www.w3.org/groups/wg/webauthn':
+  name: Web Authentication Working Group
+  abbrev: WebAuthn WG
+'www.w3.org/Privacy/IG':
+  name: Privacy Interest Group
+  abbrev: PING
+'www.w3.org/groups/wg/json-ld':
+  name: JSON-LD Working Group
+'www.w3.org/groups/wg/rdf-star':
+  name: RDF-star Working Group
+'www.w3.org/groups/wg/png':
+  name: Portable Network Graphics (PNG) Working Group
+  abbrev: PNG WG
+'www.w3.org/web-networks':
+  name: Web & Networks Interest Group
+'www.w3.org/groups/wg/pm':
+  name: Publishing Maintenance Working Group
+  abbrev: PM WG
+'www.w3.org/groups/wg/rch':
+  name: RDF Dataset Canonicalization and Hash Working Group
+  abbrev: RCH WG

data/relaton_w3c.gemspec

@@ -34,9 +34,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "linkeddata", "~> 3.2.0"
   spec.add_dependency "mechanize", "~> 2.8.0"
   spec.add_dependency "rdf", "~> 3.2.0"
-  spec.add_dependency "rdf-normalize", "~> 0.5.0"
+  spec.add_dependency "rdf-normalize", "~> 0.6.0"
   spec.add_dependency "relaton-bib", "~> 1.17.0"
-  spec.add_dependency "relaton-index", "~> 0.2.4"
+  spec.add_dependency "relaton-index", "~> 0.2.8"
   spec.add_dependency "rubyzip", "~> 2.3.0"
   spec.add_dependency "shex", "~> 0.7.0"
   spec.add_dependency "sparql", "~> 3.2.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-w3c
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.17.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-27 00:00:00.000000000 Z
+date: 2023-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linkeddata
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: relaton-bib
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.2.8
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement