relaton-w3c 1.10.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb96ed72b04b04404d6c20fe1c3d83e918580e8721083bb0d08602d22762576b
-  data.tar.gz: 775aefb0d4f807e6002b691448eefbed4687d0a27bae1152371385dbb5bcb6b4
+  metadata.gz: 9b9169cf7e9b747f47505f8ff279b33104ab64128d053013afa9307872ffa498
+  data.tar.gz: '09e56a18aa8db35ed2747f508ce9b786cc540bd28d4802f4cdbd41ac490a98ab'
 SHA512:
-  metadata.gz: 4f768f5a43524e9a159b66b0646bf8ac0643ed3e9dfa5d0adb7444d08e01967de02ff3001d948cc5289685a7108f456eb5fc6ea7536134ef3c2557d057aa5536
-  data.tar.gz: db77e522c3b6aa6b035ae32589528d75365d9d82b4f1bc9b9daa38af03ba044503e312a8175060f1c825d0d8fb63d3d64313fae33992ea5ce5a4035ca3be297b
+  metadata.gz: 137b95e319714c074fe712e28d1b58123fb1c82d4a2ce155533c5c3d125e01c29b35496954eb7055bbe3badb0bdce3143e6b5735c3cacab8d08ab019971504a0
+  data.tar.gz: 477eaeba6d35b38835275cc765c88ab24366cadae358421cb396ab2a2a28e2000d0a67ff742ac4bbb1947fa569129fdd9b961221c71803cab7c0cd826042dadf

data/data/reference.W3C.P3P.xml

@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding='UTF-8'?>
-<reference anchor="W3C.P3P" taret="http://www.w3.org/TR/P3P/">
-  <front>
-    <title>The Platform for Privacy Preferences 1.0 (P3P1.0) Specification</title>
-    <author initials="M." surname="Marchiori" fullname="Massimo Marchiori">
-      <organization abbrev="W3C">World Wide Web Consortium</organization>
-      <address>
-        <email>massimo@w3.or</email>
-      </address>
-    </author>
-    <author initials="L." surname="Cranor" fullname="Lorrie Cranor">
-      <organization>AT&amp;T</organization>
-      <address>
-        <url>http://lorrie.cranor.or/</url>
-      </address>
-    </author>
-    <author initials="M." surname="Lanheinrich" fullname="Marc Langheinrich">
-      <organization>ETH Zurich</organization>
-      <address>
-        <url>http://www.inf.ethz.ch/~lanhein/</url>
-      </address>
-    </author>
-    <author initials="M." surname="Presler-Marshall" fullname="Martin Presler-Marshall">
-      <organization>IBM</organization>
-      <address>
-        <email>mpresler@us.ibm.com</email>
-      </address>
-    </author>
-    <author initials="J." surname="Reale" fullname="Joseph Reagle">
-      <organization>W3C</organization>
-      <address>
-        <url>http://www.w3.or/People/Reagle/Overview.html</url>
-      </address>
-    </author>
-    <date day="16" month="April" year="2002"/>
-  </front>
-  <seriesInfo name="W3C Recommendation" value="REC-PICS-services"/>
-</reference>
+<?xml version="1.0" encoding='UTF-8'?>
+<reference anchor="W3C.P3P" target="http://www.w3.org/TR/P3P/">
+  <front>
+    <title>The Platform for Privacy Preferences 1.0 (P3P1.0) Specification</title>
+    <author initials="M." surname="Marchiori" fullname="Massimo Marchiori">
+      <organization abbrev="W3C">World Wide Web Consortium</organization>
+      <address>
+        <email>massimo@w3.or</email>
+      </address>
+    </author>
+    <author initials="L." surname="Cranor" fullname="Lorrie Cranor">
+      <organization>AT&amp;T</organization>
+      <address>
+        <url>http://lorrie.cranor.or/</url>
+      </address>
+    </author>
+    <author initials="M." surname="Lanheinrich" fullname="Marc Langheinrich">
+      <organization>ETH Zurich</organization>
+      <address>
+        <url>http://www.inf.ethz.ch/~lanhein/</url>
+      </address>
+    </author>
+    <author initials="M." surname="Presler-Marshall" fullname="Martin Presler-Marshall">
+      <organization>IBM</organization>
+      <address>
+        <email>mpresler@us.ibm.com</email>
+      </address>
+    </author>
+    <author initials="J." surname="Reale" fullname="Joseph Reagle">
+      <organization>W3C</organization>
+      <address>
+        <url>http://www.w3.or/People/Reagle/Overview.html</url>
+      </address>
+    </author>
+    <date day="16" month="April" year="2002"/>
+  </front>
+  <seriesInfo name="W3C Recommendation" value="REC-PICS-services"/>
+</reference>

data/grammars/biblio.rng

@@ -209,9 +209,6 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="uri"/>
-      </zeroOrMore>
     </element>
   </define>
   <define name="fullname">
@@ -680,6 +677,9 @@
     <zeroOrMore>
       <ref name="extent"/>
     </zeroOrMore>
+    <optional>
+      <ref name="bibliographic_size"/>
+    </optional>
     <zeroOrMore>
       <ref name="accesslocation"/>
     </zeroOrMore>
@@ -828,6 +828,11 @@
       <optional>
         <attribute name="scope"/>
       </optional>
+      <optional>
+        <attribute name="primary">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <text/>
     </element>
   </define>
@@ -920,9 +925,29 @@
       <text/>
     </element>
   </define>
+  <define name="sizevalue">
+    <element name="value">
+      <attribute name="type"/>
+      <text/>
+    </element>
+  </define>
+  <define name="bibliographic_size">
+    <element name="size">
+      <oneOrMore>
+        <ref name="sizevalue"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="extent">
     <element name="extent">
-      <ref name="BibItemLocality"/>
+      <choice>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="localityStack"/>
+        </zeroOrMore>
+      </choice>
     </element>
   </define>
   <define name="series">

data/grammars/isodoc.rng

@@ -152,9 +152,7 @@
             <data type="boolean"/>
           </attribute>
         </optional>
-        <oneOrMore>
-          <ref name="PureTextElement"/>
-        </oneOrMore>
+        <ref name="XrefBody"/>
       </element>
     </define>
     <define name="erefType">
@@ -188,6 +186,42 @@
         <ref name="PureTextElement"/>
       </oneOrMore>
     </define>
+    <define name="localityStack">
+      <element name="localityStack">
+        <optional>
+          <attribute name="connective">
+            <choice>
+              <value>and</value>
+              <value>or</value>
+              <value>from</value>
+              <value>to</value>
+              <value/>
+            </choice>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="sourceLocalityStack">
+      <element name="sourceLocalityStack">
+        <optional>
+          <attribute name="connective">
+            <choice>
+              <value>and</value>
+              <value>or</value>
+              <value>from</value>
+              <value>to</value>
+              <value/>
+            </choice>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="sourceLocality"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="ul">
       <element name="ul">
         <attribute name="id">
@@ -1098,6 +1132,16 @@
     </define>
   </include>
   <!-- end overrides -->
+  <define name="image" combine="choice">
+    <element name="svg">
+      <oneOrMore>
+        <choice>
+          <text/>
+          <ref name="AnyElement"/>
+        </choice>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="MultilingualRenderingType">
     <choice>
       <value>common</value>
@@ -2631,4 +2675,30 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="XrefBody">
+    <zeroOrMore>
+      <ref name="XrefTarget"/>
+    </zeroOrMore>
+    <oneOrMore>
+      <ref name="PureTextElement"/>
+    </oneOrMore>
+  </define>
+  <define name="XrefTarget">
+    <element name="location">
+      <attribute name="target">
+        <data type="string">
+          <param name="pattern">\i\c*|\c+#\c+</param>
+        </data>
+      </attribute>
+      <attribute name="connective">
+        <choice>
+          <value>and</value>
+          <value>or</value>
+          <value>from</value>
+          <value>to</value>
+          <value/>
+        </choice>
+      </attribute>
+    </element>
+  </define>
 </grammar>

data/lib/relaton_w3c/bibxml_parser.rb

@@ -13,5 +13,12 @@ module RelatonW3c
     def pubid_type(_)
       "W3C"
     end
+
+    def docids(reference, ver)
+      ids = super
+      ids.reject! &:primary
+      id = "W3C #{reference[:target].split('/').last}"
+      ids.unshift RelatonBib::DocumentIdentifier.new(id: id, type: "W3C", primary: true)
+    end
   end
 end

data/lib/relaton_w3c/data_fethcer.rb

@@ -6,8 +6,6 @@ require "relaton_w3c/data_parser"
 
 module RelatonW3c
   class DataFetcher
-    USED_TYPES = %w[WD NOTE PER PR REC CR].freeze
-
     attr_reader :data, :group_names
 
     #
@@ -21,9 +19,10 @@ module RelatonW3c
       @format = format
       @ext = format.sub(/^bib/, "")
       dir = File.dirname(File.expand_path(__FILE__))
-      @group_names = YAML.load_file(File.join(dir , "workgroups.yaml"))
+      @group_names = YAML.load_file(File.join(dir, "workgroups.yaml"))
       @data = RDF::Repository.load("http://www.w3.org/2002/01/tr-automation/tr.rdf")
       @files = []
+      @index = DataIndex.new
     end
 
     #
@@ -45,40 +44,117 @@ module RelatonW3c
     #
     # Parse documents
     #
-    def fetch
-      query.each { |sl| save_doc DataParser.parse(sl, self) }
+    def fetch # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      query_versioned_docs.each do |sl|
+        save_doc DataParser.parse(sl, self)
+      rescue StandardError => e
+        warn "Error: document #{sl.link} #{e.message}"
+        warn e.backtrace.join("\n")
+      end
+      query_unversioned_docs.each do |sl|
+        save_doc DataParser.parse(sl, self)
+      rescue StandardError => e
+        warn "Error: document #{sl.version_of} #{e.message}"
+        warn e.backtrace.join("\n")
+      end
       Dir[File.expand_path("../../data/*", __dir__)].each do |file|
         xml = File.read file, encoding: "UTF-8"
-        save_doc BibXMLParser.parse(xml)
+        save_doc BibXMLParser.parse(xml), warn_duplicate: false
+      rescue StandardError => e
+        warn "Error: document #{file} #{e.message}"
+        warn e.backtrace.join("\n")
       end
+      @index.sort!.save
     end
 
+    #
+    # Create index file
+    #
+    # def create_index
+    #   index_file = "index-w3c.yaml"
+    #   index_yaml = @index.sort do |a, b|
+    #     compare_index_items a, b
+    #   end.to_yaml
+    #   File.write index_file, index_yaml, encoding: "UTF-8"
+    # end
+
+    #
+    # Compare index items
+    #
+    # @param [Hash] aid first item
+    # @param [Hash] bid second item
+    #
+    # @return [Integer] comparison result
+    #
+    # def compare_index_items(aid, bid) # rubocop:disable Metrics/AbcSize
+    #   ret = aid[:code] <=> bid[:code]
+    #   ret = stage_weight(bid[:stage]) <=> stage_weight(aid[:stage]) if ret.zero?
+    #   ret = date_weight(bid[:date]) <=> date_weight(aid[:date]) if ret.zero?
+    #   # ret = aid[:type] <=> bid[:type] if ret.zero?
+    #   ret
+    # end
+
+    #
+    # Weight of stage
+    #
+    # @param [String, nil] stage stage
+    #
+    # @return [Integer] weight
+    #
+    # def stage_weight(stage)
+    #   return DataParser::STAGES.size if stage.nil?
+
+    #   DataParser::STAGES.keys.index(stage)
+    # end
+
+    #
+    # Weight of date
+    #
+    # @param [String] date date
+    #
+    # @return [String] weight
+    #
+    # def date_weight(date)
+    #   return "99999999" if date.nil?
+
+    #   date
+    # end
+
     #
     # Query RDF source for documents
     #
     # @return [RDF::Query::Solutions] query results
     #
-    def query # rubocop:disable Metrics/MethodLength
+    def query_versioned_docs # rubocop:disable Metrics/MethodLength
       sse = SPARQL.parse(%(
         PREFIX : <http://www.w3.org/2001/02pd/rec54#>
         PREFIX dc: <http://purl.org/dc/elements/1.1/>
         PREFIX doc: <http://www.w3.org/2000/10/swap/pim/doc#>
         # PREFIX mat: <http://www.w3.org/2002/05/matrix/vocab#>
         PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-        SELECT ?link ?title ?date
+        SELECT ?link ?title ?date ?version_of
         WHERE {
-          ?link dc:title ?title ; dc:date ?date . # ; doc:versionOf ?version_of .
+          ?link dc:title ?title ; dc:date ?date ; doc:versionOf ?version_of .
         }
       ))
       data.query sse
     end
 
+    def query_unversioned_docs
+      sse = SPARQL.parse(%(
+        PREFIX doc: <http://www.w3.org/2000/10/swap/pim/doc#>
+        SELECT ?version_of
+        WHERE { ?x doc:versionOf ?version_of . }
+      ))
+      data.query(sse).uniq &:version_of
+    end
+
     #
     # Save document to file
     #
     # @param [RelatonW3c::W3cBibliographicItem, nil] bib bibliographic item
     #
-    def save_doc(bib) # rubocop:disable Metrics/MethodLength
+    def save_doc(bib, warn_duplicate: true) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       return unless bib
 
       c = case @format
@@ -86,24 +162,26 @@ module RelatonW3c
           when "yaml" then bib.to_hash.to_yaml
           else bib.send("to_#{@format}")
           end
-      file = file_name(bib)
-      if @files.include? file
-        warn "File #{file} already exists. Document: #{bib.docnumber}"
+      # id = bib.docidentifier.detect(&:primary)&.id || bib.formattedref.content
+      file = file_name(bib.docnumber)
+      if @files.include?(file)
+        warn "File #{file} already exists. Document: #{bib.docnumber}" if warn_duplicate
       else
+        @index.add bib.docnumber, file
         @files << file
+        File.write file, c, encoding: "UTF-8"
       end
-      File.write file, c, encoding: "UTF-8"
     end
 
     #
     # Generate file name
     #
-    # @param [RelatonW3c::W3cBibliographicItem] bib bibliographic item
+    # @param [String] id document id
     #
     # @return [String] file name
     #
-    def file_name(bib)
-      name = bib.docnumber.gsub(/[\s,:\/]/, "_").squeeze("_").upcase
+    def file_name(id)
+      name = id.sub(/^W3C\s/, "").gsub(/[\s,:\/+]/, "_").squeeze("_").downcase
       File.join @output, "#{name}.#{@ext}"
     end
   end

data/lib/relaton_w3c/data_index.rb

@@ -0,0 +1,135 @@
+module RelatonW3c
+  class DataIndex
+    #
+    # Initialize data index.
+    #
+    # @param [String] index_file path to index file
+    # @param [Array<Hash>] index index data
+    #
+    def initialize(index_file: "index-w3c.yaml", index: [])
+      @index_file = index_file
+      @index = index
+    end
+
+    #
+    # Create index from a GitHub repository
+    #
+    # @return [RelatonW3c::DataIndex] data index
+    #
+    def self.create_from_repo
+      resp_index = Net::HTTP.get(URI("#{W3cBibliography::SOURCE}index-w3c.yaml"))
+      DataIndex.new index: YAML.safe_load(resp_index, [Symbol])
+    end
+
+    #
+    # Add document to index
+    #
+    # @param [String] docnumber document number
+    # @param [String] file path to document file
+    #
+    def add(docnumber, file)
+      @index << docnumber_to_parts(docnumber, file)
+    end
+
+    #
+    # Save index to file.
+    #
+    def save
+      File.write @index_file, @index.to_yaml, encoding: "UTF-8"
+    end
+
+    #
+    # Sort index
+    #
+    # @return [Array<Hash>] sorted index
+    #
+    def sort!
+      @index.sort! { |a, b| compare_index_items a, b }
+      self
+    end
+
+    #
+    # Search filename in index
+    #
+    # @param [String] ref reference
+    #
+    # @return [String] document's filename
+    #
+    def search(ref) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      dparts = docnumber_to_parts(ref)
+      @index.detect do |parts|
+        parts[:code].match?(/^#{Regexp.escape dparts[:code]}/i) &&
+          (dparts[:stage].nil? || dparts[:stage].casecmp?(parts[:stage])) &&
+          (dparts[:type].nil? || dparts[:type].casecmp?(parts[:type])) &&
+          (dparts[:date].nil? || dparts[:date] == parts[:date]) &&
+          (dparts[:suff].nil? || dparts[:suff].casecmp?(parts[:suff]))
+      end&.fetch(:file)
+    end
+
+    #
+    # Compare index items
+    #
+    # @param [Hash] aid first item
+    # @param [Hash] bid second item
+    #
+    # @return [Integer] comparison result
+    #
+    def compare_index_items(aid, bid) # rubocop:disable Metrics/AbcSize
+      ret = aid[:code] <=> bid[:code]
+      ret = stage_weight(bid[:stage]) <=> stage_weight(aid[:stage]) if ret.zero?
+      ret = date_weight(bid[:date]) <=> date_weight(aid[:date]) if ret.zero?
+      # ret = aid[:type] <=> bid[:type] if ret.zero?
+      ret
+    end
+
+    #
+    # Weight of stage
+    #
+    # @param [String, nil] stage stage
+    #
+    # @return [Integer] weight
+    #
+    def stage_weight(stage)
+      return DataParser::STAGES.size if stage.nil?
+
+      DataParser::STAGES.keys.index(stage)
+    end
+
+    #
+    # Weight of date
+    #
+    # @param [String] date date
+    #
+    # @return [String] weight
+    #
+    def date_weight(date)
+      return "99999999" if date.nil?
+
+      date
+    end
+
+    #
+    # Parse document number to parts
+    #
+    # @param [String] docnumber document number
+    # @param [String, nil] file path to document file
+    #
+    # @return [Hash{Symbol=>String}] document parts
+    #
+    def docnumber_to_parts(docnumber, file = nil) # rubocop:disable Metrics/MethodLength
+      %r{
+        ^(?:(?:(?<stage>WD|CRD|CR|PR|PER|REC|SPSD|OBSL|RET)|(?<type>D?NOTE))-)?
+        (?<code>\w+(?:[+-][\w.]+)*?)
+        (?:-(?<date>\d{8}|\d{6}))?
+        (?:/(?<suff>\w+))?$
+      }xi =~ docnumber
+      entry = { code: code }
+      entry[:file] = file if file
+      entry[:stage] = stage if stage
+      entry[:type] = type if type
+      entry[:date] = date if date
+      entry[:suff] = suff if suff
+      entry
+    end
+  end
+end

data/lib/relaton_w3c/data_parser.rb

@@ -1,5 +1,24 @@
 module RelatonW3c
   class DataParser
+    USED_TYPES = %w[WD NOTE PER PR REC CR].freeze
+
+    DOCTYPES = {
+      "TR" => "technicalReport",
+      "NOTE" => "groupNote",
+    }.freeze
+
+    STAGES = {
+      "RET" => "retired",
+      "SPSD" => "supersededRecommendation",
+      "OBSL" => "obsoletedRecommendation",
+      "WD" => "workingDraft",
+      "CRD" => "candidateRecommendationDraft",
+      "CR" => "candidateRecommendation",
+      "PR" => "proposedRecommendation",
+      "PER" => "proposedEditedRecommendation",
+      "REC" => "recommendation",
+    }.freeze
+
     #
     # Document parser initalization
     #
@@ -29,7 +48,7 @@ module RelatonW3c
     # @return [RelatonW3c:W3cBibliographicItem, nil] bibliographic item
     #
     def parse # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-      return unless @fetcher.class::USED_TYPES.include? type
+      return if @sol.respond_to?(:link) && !types_stages.detect { |ts| USED_TYPES.include?(ts) }
 
       RelatonW3c::W3cBibliographicItem.new(
         type: "standard",
@@ -37,10 +56,12 @@ module RelatonW3c
         fetched: Date.today.to_s,
         language: ["en"],
         script: ["Latn"],
+        docstatus: parse_docstatus,
         title: parse_title,
         link: parse_link,
         docid: parse_docid,
-        docnumber: identifier(@sol.link.to_s),
+        formattedref: parse_formattedref,
+        docnumber: identifier,
         series: parse_series,
         date: parse_date,
         relation: parse_relation,
@@ -49,12 +70,24 @@ module RelatonW3c
       )
     end
 
+    #
+    # Extract documetn status
+    #
+    # @return [RelatonBib::DocumentStatus, nil] dcoument status
+    #
+    def parse_docstatus
+      stage = types_stages&.detect { |st| STAGES.include?(st) }
+      RelatonBib::DocumentStatus.new stage: STAGES[stage] if stage
+    end
+
     #
     # Parse title
     #
     # @return [RelatonBib::TypedTitleStringCollection] title
     #
     def parse_title
+      return [] unless @sol.respond_to?(:title)
+
       t = RelatonBib::TypedTitleString.new content: @sol.title.to_s
       RelatonBib::TypedTitleStringCollection.new [t]
     end
@@ -65,7 +98,9 @@ module RelatonW3c
     # @return [Array<RelatonBib::TypedUri>] link
     #
     def parse_link
-      [RelatonBib::TypedUri.new(type: "src", content: @sol.link.to_s)]
+      link = @sol.respond_to?(:link) ? @sol.link : @sol.version_of
+
+      [RelatonBib::TypedUri.new(type: "src", content: link.to_s)]
     end
 
     #
@@ -74,23 +109,45 @@ module RelatonW3c
     # @return [Arra<RelatonBib::DocumentIdentifier>] docidentifier
     #
     def parse_docid
-      id = pub_id(@sol.link.to_s)
-      [RelatonBib::DocumentIdentifier.new(type: "W3C", id: id)]
+      return [] unless @sol.respond_to?(:link)
+
+      id = pub_id(@sol.link)
+      [RelatonBib::DocumentIdentifier.new(type: "W3C", id: id, primary: true)]
     end
 
     #
     # Generate PubID
     #
-    # @param [String] url url
-    #
-    # @return [String] PubID
+    # @return [RDF::URI] PubID
     #
     def pub_id(url)
       "W3C #{identifier(url)}"
     end
 
-    def identifier(url)
-      /.+\/(\w+(?:-[\w.]+)+(?:\/\w+)?)/.match(url)[1].to_s
+    #
+    # Generate identifier from URL
+    #
+    # @param [RDF::URI, nil] link
+    #
+    # @return [String] identifier
+    #
+    def identifier(link = nil)
+      url = link || (@sol.respond_to?(:link) ? @sol.link : @sol.version_of)
+      self.class.parse_identifier(url.to_s)
+    end
+
+    #
+    # Parse identifier from URL
+    #
+    # @param [String] url URL
+    #
+    # @return [String] identifier
+    #
+    def self.parse_identifier(url)
+      if /.+\/(\w+(?:-[\w.]+)+(?:\/\w+)?)/ =~ url.to_s
+        $1.to_s
+      else url.to_s.split("/").last
+      end
     end
 
     #
@@ -99,12 +156,31 @@ module RelatonW3c
     # @return [Array<RelatonBib::Series>] series
     #
     def parse_series
+      return [] unless type
+
       title = RelatonBib::TypedTitleString.new content: "W3C #{type}"
-      [RelatonBib::Series.new(title: title, number: identifier(@sol.link.to_s))]
+      [RelatonBib::Series.new(title: title, number: identifier)]
     end
 
-    def type # rubocop:disable Metrics/MethodLength
-      @type ||= begin
+    #
+    # Extract type
+    #
+    # @return [String] type
+    #
+    def type
+      # thre are many types, we need to find the right one
+      @type ||= types_stages&.detect { |t| USED_TYPES.include?(t) }
+    end
+
+    #
+    # Fetches types and stages
+    #
+    # @return [Array<String>] types and stages
+    #
+    def types_stages # rubocop:disable Metrics/MethodLength
+      return unless @sol.respond_to?(:link)
+
+      @types_stages ||= begin
         sse = SPARQL.parse(%(
           PREFIX : <http://www.w3.org/2001/02pd/rec54#>
           PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
@@ -113,8 +189,7 @@ module RelatonW3c
             { <#{@sol.link}> rdf:type ?type }
           }
         ))
-        tps = @fetcher.data.query(sse).map { |s| s.type.to_s.split("#").last }
-        tps.detect { |t| Scrapper::DOCTYPES.key?(t) }
+        @fetcher.data.query(sse).map { |s| s.type.to_s.split("#").last }
       end
     end
 
@@ -124,10 +199,17 @@ module RelatonW3c
     # @return [Strinf] doctype
     #
     def parse_doctype
-      Scrapper::DOCTYPES[type]
+      DOCTYPES[type] || "recommendation"
     end
 
+    #
+    # Parse date
+    #
+    # @return [Array<RelatonBib::BibliographicDate>] date
+    #
     def parse_date
+      return [] unless @sol.respond_to?(:date)
+
       [RelatonBib::BibliographicDate.new(type: "published", on: @sol.date.to_s)]
     end
 
@@ -136,29 +218,90 @@ module RelatonW3c
     #
     # @return [Array<RelatonBib::DocumentRelation>] relation
     #
-    def parse_relation # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+    def parse_relation
+      if @sol.respond_to?(:link)
+        relations + editor_drafts
+      else document_versions
+      end
+    end
+
+    def relations # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+      {
+        "doc:obsoletes" => { type: "obsoletes" },
+        "mat:hasErrata" => { type: "updatedBy", description: "errata" },
+        # "mat:hasTranslations" => "hasTranslation",
+        # "mat:hasImplReport" => "hasImpReport",
+        ":previousEdition" => { type: "editionOf" },
+      }.reduce([]) do |acc, (predicate, tp)|
+        acc + relation_query(predicate).map do |r|
+          fr = RelatonBib::LocalizedString.new pub_id(r.rel.to_s)
+          bib = W3cBibliographicItem.new formattedref: fr
+          tp[:description] = RelatonBib::FormattedString.new content: tp[:description] if tp[:description]
+          RelatonBib::DocumentRelation.new(**tp, bibitem: bib)
+        end
+      end
+    end
+
+    def editor_drafts # rubocop:disable Metrics/MethodLength
       sse = SPARQL.parse(%(
-        PREFIX doc: <http://www.w3.org/2000/10/swap/pim/doc#>
-        SELECT ?obsoletes
-        WHERE {
-          VALUES ?p { doc:obsoletes }
-          { <#{@sol.link}> ?p ?obsoletes }
-        }
+        PREFIX : <http://www.w3.org/2001/02pd/rec54#>
+        PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+        SELECT ?rel
+        WHERE { <#{@sol.link}> :ED ?rel . }
       ))
-      @fetcher.data.query(sse).order_by(:obsoletes).map do |r|
-        tp, url = r.to_h.first
-        fr = RelatonBib::LocalizedString.new pub_id(url.to_s)
+      @fetcher.data.query(sse).map do |s|
+        fr = RelatonBib::LocalizedString.new pub_id(s.rel.to_s)
         bib = W3cBibliographicItem.new formattedref: fr
-        RelatonBib::DocumentRelation.new(type: tp.to_s, bibitem: bib)
+        desc = RelatonBib::FormattedString.new content: "Editor's draft"
+        RelatonBib::DocumentRelation.new(
+          type: "hasDraft", description: desc, bibitem: bib,
+        )
+      end
+    end
+
+    def relation_query(predicate)
+      sse = SPARQL.parse(%(
+        PREFIX : <http://www.w3.org/2001/02pd/rec54#>
+        PREFIX doc: <http://www.w3.org/2000/10/swap/pim/doc#>
+        PREFIX mat: <http://www.w3.org/2002/05/matrix/vocab#>
+        SELECT ?rel
+        WHERE { <#{@sol.link}> #{predicate} ?rel . }
+      ))
+      @fetcher.data.query(sse).order_by(:rel)
+    end
+
+    def document_versions
+      sse = SPARQL.parse(%(
+        PREFIX doc: <http://www.w3.org/2000/10/swap/pim/doc#>
+        SELECT ?link
+        WHERE { ?link doc:versionOf <#{@sol.version_of}> }
+      ))
+      @fetcher.data.query(sse).map do |r|
+        fref = RelatonBib::FormattedRef.new content: pub_id(r.link)
+        bib = W3cBibliographicItem.new formattedref: fref
+        RelatonBib::DocumentRelation.new(type: "hasEdition", bibitem: bib)
       end
     end
 
+    #
+    # Parse formattedref
+    #
+    # @return [RelatonBib::FormattedRef] formattedref
+    #
+    def parse_formattedref
+      return if @sol.respond_to?(:link)
+
+      RelatonBib::FormattedRef.new(content: pub_id(@sol.version_of))
+    end
+
     #
     # Parse contributor
     #
     # @return [Array<RelatonBib::ContributionInfo>] contributor
     #
     def parse_contrib # rubocop:disable Metrics/MethodLength
+      return [] unless @sol.respond_to?(:link)
+
       sse = SPARQL.parse(%(
         PREFIX : <http://www.w3.org/2001/02pd/rec54#>
         PREFIX contact: <http://www.w3.org/2000/10/swap/pim/contact#>
@@ -181,6 +324,8 @@ module RelatonW3c
     # @return [RelatonBib::EditorialGroup] editorialgroup
     #
     def parse_editorialgroup # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+      return unless @sol.respond_to?(:link)
+
       sse = SPARQL.parse(%(
         PREFIX org: <http://www.w3.org/2001/04/roadmap/org#>
         PREFIX contact: <http://www.w3.org/2000/10/swap/pim/contact#>

data/lib/relaton_w3c/scrapper.rb

@@ -39,7 +39,7 @@ module RelatonW3c
       # @return [Array<RelatonBib::DocumentIdentifier>]
       def fetch_docid(hit)
         id = hit["link"].split("/").last
-        [RelatonBib::DocumentIdentifier.new(id: id, type: "W3C")]
+        [RelatonBib::DocumentIdentifier.new(id: id, type: "W3C", primary: true)]
       end
 
       # @param hit [Hash]

data/lib/relaton_w3c/version.rb

@@ -1,3 +1,3 @@
 module RelatonW3c
-  VERSION = "1.10.0".freeze
+  VERSION = "1.11.1".freeze
 end

data/lib/relaton_w3c/w3c_bibliography.rb

@@ -5,15 +5,17 @@ require "net/http"
 module RelatonW3c
   # Class methods for search W3C standards.
   class W3cBibliography
-    SOURCE = "https://raw.githubusercontent.com/relaton/relaton-data-w3c/main/data/"
+    SOURCE = "https://raw.githubusercontent.com/relaton/relaton-data-w3c/main/"
 
     class << self
       # @param text [String]
       # @return [RelatonW3c::HitCollection]
       def search(text) # rubocop:disable Metrics/MethodLength
-        # HitCollection.new text
-        file = text.sub(/^W3C\s/, "").gsub(/[\s,:\/]/, "_").squeeze("_").upcase
-        url = "#{SOURCE}#{file}.yaml"
+        ref = DataParser.parse_identifier text.sub(/^W3C\s/, "")
+        file = DataIndex.create_from_repo.search(ref)
+        return unless file
+
+        url = "#{SOURCE}#{file}"
         resp = Net::HTTP.get_response(URI.parse(url))
         return unless resp.code == "200"
 
@@ -24,7 +26,7 @@ module RelatonW3c
              EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,
              Net::ProtocolError, Errno::ETIMEDOUT
         raise RelatonBib::RequestError,
-              "Could not access #{HitCollection::DOMAIN}"
+              "Could not access #{url}"
       end
 
       # @param ref [String] the W3C standard Code to look up
@@ -39,8 +41,8 @@ module RelatonW3c
           return
         end
 
-        # ret = result.first.fetch
-        warn "[relaton-w3c] (\"#{ref}\") found #{result.title.first.title.content}"
+        found = result.docnumber
+        warn "[relaton-w3c] (\"#{ref}\") found #{found}"
         result
       end
     end

data/lib/relaton_w3c/workgroups.yaml

@@ -32,6 +32,9 @@
 'https://www.w3.org/WAI/EO':
   name: Education and Outreach Working Group 
   abbrev: EOWG
+'https://www.w3.org/WAI/about/groups/eowg':
+  name: Education and Outreach Working Group 
+  abbrev: EOWG
 'https://www.w3.org/2001/sw/WebOnt':
   name: Web-Ontology Working Group
 'http://www.w3.org/MarkUp/Forms':
@@ -54,6 +57,8 @@
   name: Web Applications Working Group
 'https://www.w3.org/2008/webapps':
   name: Web Applications Working Group
+'https://www.w3.org/groups/wg/webapps':
+  name: Web Applications Working Group
 'https://www.w3.org/das':
   name: Devices and Sensors Working Group
   abbrev: DAS WG
@@ -226,6 +231,8 @@
   abbrev: ARIA WG
 'https://www.w3.org/wasm':
   name: WebAssembly Working Group
+'https://www.w3.org/groups/wg/wasm':
+  name: WebAssembly Working Group
 'https://www.w3.org/groups/wg/webediting':
   name: Web Editing Working Group
 'https://www.w3.org/2014/data-shapes':

data/lib/relaton_w3c.rb

@@ -2,13 +2,14 @@ require "relaton_bib"
 require "relaton_w3c/version"
 require "relaton_w3c/w3c_bibliography"
 require "relaton_w3c/w3c_bibliographic_item"
-require "relaton_w3c/hit_collection"
-require "relaton_w3c/hit"
-require "relaton_w3c/scrapper"
+# require "relaton_w3c/hit_collection"
+# require "relaton_w3c/hit"
+# require "relaton_w3c/scrapper"
 require "relaton_w3c/xml_parser"
 require "relaton_w3c/bibxml_parser"
 require "relaton_w3c/hash_converter"
 require "relaton_w3c/data_fethcer"
+require "relaton_w3c/data_index"
 
 module RelatonW3c
   class Error < StandardError; end

data/relaton_w3c.gemspec

@@ -39,7 +39,10 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "linkeddata", "~> 3.1.0"
   spec.add_dependency "mechanize", "~> 2.8.0"
+  # spec.add_dependency "picky"
   spec.add_dependency "rdf", "~> 3.1.0"
-  spec.add_dependency "relaton-bib", "~> 1.10.0"
+  spec.add_dependency "rdf-normalize", "~> 0.4.0"
+  spec.add_dependency "relaton-bib", "~> 1.11.0"
+  spec.add_dependency "shex", "~> 0.6.0"
   spec.add_dependency "sparql", "~> 3.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-w3c
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-30 00:00:00.000000000 Z
+date: 2022-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -122,20 +122,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: rdf-normalize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: relaton-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.11.0
+- !ruby/object:Gem::Dependency
+  name: shex
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: sparql
   requirement: !ruby/object:Gem::Requirement
@@ -202,6 +230,7 @@ files:
 - lib/relaton_w3c.rb
 - lib/relaton_w3c/bibxml_parser.rb
 - lib/relaton_w3c/data_fethcer.rb
+- lib/relaton_w3c/data_index.rb
 - lib/relaton_w3c/data_parser.rb
 - lib/relaton_w3c/hash_converter.rb
 - lib/relaton_w3c/hit.rb