relaton-w3c 1.16.1 → 1.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0440b77d73c24a978935bfba1bd94b9ddc58c8ebcf90cc229c4a5339a901c18c
-  data.tar.gz: a4b299f58a4c4c4b79946ef56e075cbff224fb8f6a639e11958a4dba996eeb5d
+  metadata.gz: 93cc28a3d425ad3b7eae1f905690747b2a700cd54eb6f97506cb47d4007970fc
+  data.tar.gz: ea68818b5814465e9610bb271d32f5f753a8f424db0c4669986b8bc7879758bf
 SHA512:
-  metadata.gz: 81e2bd181d0a55948a36d831d39ebb13edfc7a0d28bcff8e035f5e6544305b67bd6a28db4d647c45417ff4504aa8dde2459bd7b848b274c53c286fcc08edc360
-  data.tar.gz: ff49763539341324fc1d0e612d90404b52b25d11e9b2141cc7801e050abfb81e03c8c94de29c4278af452415eaf92293467b7d9817a87fbb2122fd0177a5b038
+  metadata.gz: cb28efbe7ab797ff44c0af784bb71f55fe61b19bb63684d0096be2cb9f716ce27ae3f23f18411a570456036b66f2e2ded4460a2a7cadf3206c42895e60171b87
+  data.tar.gz: f0cf0e02cd8809328e1f929e346a2a5c47b27be42886419e1a99a0a8afeb2422efe12fbf5ef39fd23615f63da8ff29527260cdaac9de0be7b48849c7c09dec87

data/grammars/basicdoc.rng

@@ -346,6 +346,8 @@
           <ref name="keyword"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </oneOrMore>
     </element>
@@ -623,6 +625,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -636,6 +640,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -648,6 +654,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -655,7 +663,11 @@
   <define name="keyword">
     <element name="keyword">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
@@ -676,7 +688,11 @@
   <define name="strike">
     <element name="strike">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
@@ -898,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>
@@ -942,6 +963,7 @@
       <value>obsoleted</value>
       <value>confirmed</value>
       <value>updated</value>
+      <value>corrected</value>
       <value>issued</value>
       <value>transmitted</value>
       <value>copied</value>

data/lib/relaton_w3c/data_parser.rb

@@ -222,7 +222,8 @@ module RelatonW3c
     # @return [String, nil] doctype
     #
     def parse_doctype
-      DOCTYPES[type] || DOCTYPES[type_from_link]
+      type = DOCTYPES[type] || DOCTYPES[type_from_link]
+      DocumentType.new(type: type) if type
     end
 
     #

data/lib/relaton_w3c/document_type.rb

@@ -0,0 +1,16 @@
+module RelatonW3c
+  class DocumentType < RelatonBib::DocumentType
+    DOCTYPES = %w[groupNote technicalReport].freeze
+
+    def initialize(type:, abbreviation: nil)
+      check_type type
+      super
+    end
+
+    def check_type(type)
+      unless DOCTYPES.include? type
+        Util.warn "WARNING: invalid doctype: `#{type}`"
+      end
+    end
+  end
+end

data/lib/relaton_w3c/hash_converter.rb

@@ -1,11 +1,12 @@
 module RelatonW3c
-  class HashConverter < RelatonBib::HashConverter
-    class << self
-      # @param item_hash [Hash]
-      # @return [RelatonW3c::W3cBibliographicItem]
-      def bib_item(item_hash)
-        W3cBibliographicItem.new(**item_hash)
-      end
+  module HashConverter
+    include RelatonBib::HashConverter
+    extend self
+
+    # @param item_hash [Hash]
+    # @return [RelatonW3c::W3cBibliographicItem]
+    def bib_item(item_hash)
+      W3cBibliographicItem.new(**item_hash)
     end
   end
 end

data/lib/relaton_w3c/hit.rb

@@ -0,0 +1,7 @@
+module RelatonW3c
+  class Hit
+    def initialize(rows)
+      @array = rows.map { |r| Hit.new(**r) }
+    end
+  end
+end

data/lib/relaton_w3c/hit_collection.rb

@@ -0,0 +1,7 @@
+module RelatonW3c
+  class HitCollection < RelatonBib::HitCollection
+    def initialize(rows)
+      @array = rows.map { |r| Hit.new(**r) }
+    end
+  end
+end

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.]+)*?)
-        (?:-(?<date>\d{8}|\d{6}|\d{4}))?
+        (?:-(?<year>\d{4}))?
+        (?:-(?<date>\d{8}|\d{6}))?
         (?:/(?<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.16.1".freeze
+  VERSION = "1.17.1".freeze
 end

data/lib/relaton_w3c/w3c_bibliographic_item.rb

@@ -1,17 +1,8 @@
 module RelatonW3c
   class W3cBibliographicItem < RelatonBib::BibliographicItem
-    TYPES = %w[
-      candidateRecommendation groupNote proposedEditedRecommendation
-      proposedRecommendation recommendation retired workingDraft technicalReport
-    ].freeze
-
-    # @param doctype [String]
-    def initialize(**args)
-      if args[:doctype] && !TYPES.include?(args[:doctype])
-        Util.warn "Invalid document type: `#{args[:doctype]}`"
-      end
-      super
-    end
+    # def initialize(**args)
+    #   super
+    # end
 
     #
     # Fetch flavor schema version

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/lib/relaton_w3c/xml_parser.rb

@@ -8,10 +8,10 @@ module RelatonW3c
       # @returtn [Hash]
       def item_data(item)
         data = super
-        ext = item.at "./ext"
-        return data unless ext
+        # ext = item.at "./ext"
+        # return data unless ext
 
-        data[:doctype] = ext.at("./doctype")&.text
+        # data[:doctype] = ext.at("./doctype")&.text
         data
       end
 

data/lib/relaton_w3c.rb

@@ -3,6 +3,7 @@ require "relaton/index"
 require "relaton_w3c/version"
 require "relaton_w3c/config"
 require "relaton_w3c/util"
+require "relaton_w3c/document_type"
 require "relaton_w3c/w3c_bibliography"
 require "relaton_w3c/w3c_bibliographic_item"
 require "relaton_w3c/xml_parser"

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 "relaton-bib", "~> 1.16.0"
-  spec.add_dependency "relaton-index", "~> 0.2.4"
+  spec.add_dependency "rdf-normalize", "~> 0.6.0"
+  spec.add_dependency "relaton-bib", "~> 1.17.0"
+  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.16.1
+  version: 1.17.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-18 00:00:00.000000000 Z
+date: 2023-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linkeddata
@@ -58,42 +58,42 @@ 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
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: 1.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: 1.17.0
 - !ruby/object:Gem::Dependency
   name: relaton-index
   requirement: !ruby/object:Gem::Requirement
     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
@@ -168,7 +168,10 @@ files:
 - lib/relaton_w3c/data_fetcher.rb
 - lib/relaton_w3c/data_index.rb
 - lib/relaton_w3c/data_parser.rb
+- lib/relaton_w3c/document_type.rb
 - lib/relaton_w3c/hash_converter.rb
+- lib/relaton_w3c/hit.rb
+- lib/relaton_w3c/hit_collection.rb
 - lib/relaton_w3c/processor.rb
 - lib/relaton_w3c/pubid.rb
 - lib/relaton_w3c/util.rb