relaton-w3c 1.11.5 → 1.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6432e67ef05f183bc0774c4d99d371de778693826020a6202e548c878c4ddd8
-  data.tar.gz: 4b05d35a0d6c05dafee9046bdf4a5270d61e2bf56ad3e9fa23865c83f439773a
+  metadata.gz: faf78f2abf348e9aa6dd74f2f0fe94899d9d6fc34af3368849a818b6dd856e26
+  data.tar.gz: c4cabbd9559b9f122f34fbb204f7780606bfc87c9db999492fbdd2b6b02639b3
 SHA512:
-  metadata.gz: 656afc278c830f8b31182781e474938efbad280a923239ee8c2a634faa095f7f73638de3a41e2bad8a27a0cb25163cd48ab462dc22ee378d73d734b90883b7fb
-  data.tar.gz: cc49efd88885d26c0085a47c36b2f1bec4fb1c1d7c1a82545c63b1198f73ed7d94b33c895dd265febce80fe4d08d03f450585af651a13e4e771eb371b3c2a50a
+  metadata.gz: cc6e6c80914b8973091795b1f234ea57a49499bb0466ae04a14358c30e526c38a6f607031e9dd0d4963c2caccca26dd9418939c871b4f47016aa094156d783a3
+  data.tar.gz: 041625ce66ae2949112bc20856de89b05fd4772c1dd1f3413a3a5b04059ec7cb84f8b92517a3634294080031760fca8795b7ae113bbfae03986f775c5f52acb0

data/.github/workflows/rake.yml

@@ -10,23 +10,4 @@ on:
 
 jobs:
   rake:
-    name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '3.0', '2.7', '2.6' ]
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
-        experimental: [ false ]
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: true
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-
-      - run: bundle exec rake
+    uses: relaton/support/.github/workflows/rake.yml@master

data/data/reference.W3C.DSig-label.xml

@@ -28,5 +28,5 @@
     </author>
     <date day="27" month="May" year="1998"/>
   </front>
-  <seriesInfo name="W3C Recommendation" value="REC-DSig-label"/>
+  <seriesInfo name="W3C" value="REC-DSig-label"/>
 </reference>

data/data/reference.W3C.P3P-rdfschema.xml

@@ -22,5 +22,5 @@
     </author>
     <date day="25" month="January" year="2002"/>
   </front>
-  <seriesInfo name="W3C Note" value="P3P-rdfschema"/>
+  <seriesInfo name="W3C" value="NOTE-P3P-rdfschema"/>
 </reference>

data/data/reference.W3C.P3P.xml

@@ -34,5 +34,5 @@
     </author>
     <date day="16" month="April" year="2002"/>
   </front>
-  <seriesInfo name="W3C Recommendation" value="REC-PICS-services"/>
+  <seriesInfo name="W3C" value="REC-PICS-services"/>
 </reference>

data/data/reference.W3C.PICS-labels.xml

@@ -39,5 +39,5 @@
     </author>
     <date day="31" month="October" year="1996"/>
   </front>
-  <seriesInfo name="W3C Recommendation" value="REC-PICS-labels"/>
+  <seriesInfo name="W3C" value="REC-PICS-labels"/>
 </reference>

data/data/reference.W3C.PICS-rules.xml

@@ -34,5 +34,5 @@
     </author>
     <date day="29" month="December" year="1997"/>
   </front>
-  <seriesInfo name="W3C Recommendation" value="REC-PICSRules"/>
+  <seriesInfo name="W3C" value="REC-PICSRules"/>
 </reference>

data/data/reference.W3C.PICS-services.xml

@@ -33,5 +33,5 @@
     </author>
     <date day="31" month="October" year="1996"/>
   </front>
-  <seriesInfo name="W3C Recommendation" value="REC-PICS-services"/>
+  <seriesInfo name="W3C" value="REC-PICS-services"/>
 </reference>

data/data/reference.W3C.daml-oil-reference.xml

@@ -35,5 +35,5 @@
     </author>
     <date day="18" month="December" year="2001"/>
   </front>
-  <seriesInfo value="daml+oil-reference" name="W3C Note"/>
+  <seriesInfo value="NOTE-daml+oil-reference" name="W3C"/>
 </reference>

data/data/reference.W3C.soap11.xml

@@ -52,5 +52,5 @@
     </author>
     <date day="8" month="May" year="2000"/>
   </front>
-  <seriesInfo value="soap11" name="W3C Note"/>
+  <seriesInfo value="NOTE-soap11" name="W3C"/>
 </reference>

data/data/reference.W3C.soap12-part1.xml

@@ -34,5 +34,5 @@
     </author>
     <date day="26" month="June" year="2002"/>
   </front>
-  <seriesInfo value="soap12-part1" name="W3C Working Draft"/>
+  <seriesInfo value="WD-soap12-part1" name="W3C"/>
 </reference>

data/data/reference.W3C.soap12-part2.xml

@@ -34,5 +34,5 @@
     </author>
     <date day="26" month="June" year="2002"/>
   </front>
-  <seriesInfo value="soap12-part2" name="W3C Working Draft"/>
+  <seriesInfo value="WD-soap12-part2" name="W3C"/>
 </reference>

data/data/reference.W3C.xkms.xml

@@ -46,5 +46,5 @@
     </author>
     <date day="30" month="March" year="2001"/>
   </front>
-  <seriesInfo value="xkms" name="W3C Note"/>
+  <seriesInfo value="NOTE-xkms" name="W3C"/>
 </reference>

data/data/reference.W3C.xml-c14n.xml

@@ -11,5 +11,5 @@
     </author>
     <date day="15" month="March" year="2001"/>
   </front>
-  <seriesInfo name="W3C Recommendation" value="xpath"/>
+  <seriesInfo name="W3C" value="REC-xpath"/>
 </reference>

data/data/reference.W3C.xmldsig-core.xml

@@ -22,5 +22,5 @@
     </author>
     <date day="6" month="October" year="2000"/>
   </front>
-  <seriesInfo value="xmldsig-core" name="W3C Recommendation"/>
+  <seriesInfo value="REC-xmldsig-core" name="W3C"/>
 </reference>

data/data/reference.W3C.xmlenc-core.xml

@@ -16,5 +16,5 @@
     </author>
     <date day="2" month="August" year="2002"/>
   </front>
-  <seriesInfo value="xmlenc-core" name="W3C Candidate Recommendation"/>
+  <seriesInfo value="CR-xmlenc-core" name="W3C"/>
 </reference>

data/data/reference.W3C.xpath.xml

@@ -18,5 +18,5 @@
     </author>
     <date day="16" month="November" year="1999"/>
   </front>
-  <seriesInfo name="W3C Recommendation" value="xpath"/>
+  <seriesInfo name="W3C" value="REC-xpath"/>
 </reference>

data/lib/relaton_w3c/data_fetcher.rb

@@ -68,7 +68,7 @@ module RelatonW3c
     end
 
     #
-    # Query RDF source for documents
+    # Query RDF source for versioned documents
     #
     # @return [RDF::Query::Solutions] query results
     #
@@ -87,6 +87,11 @@ module RelatonW3c
       data.query sse
     end
 
+    #
+    # Query RDF source for unversioned documents
+    #
+    # @return [Array<RDF::Query::Solution>] query results
+    #
     def query_unversioned_docs
       sse = SPARQL.parse(%(
         PREFIX doc: <http://www.w3.org/2000/10/swap/pim/doc#>

data/lib/relaton_w3c/data_parser.rb

@@ -86,9 +86,10 @@ module RelatonW3c
     # @return [RelatonBib::TypedTitleStringCollection] title
     #
     def parse_title
-      return [] unless @sol.respond_to?(:title)
-
-      t = RelatonBib::TypedTitleString.new content: @sol.title.to_s
+      content = if @sol.respond_to?(:title) then @sol.title.to_s
+                else document_versions.max_by { |dv| dv.date.to_s }.title.to_s
+                end
+      t = RelatonBib::TypedTitleString.new content: content
       RelatonBib::TypedTitleStringCollection.new [t]
     end
 
@@ -99,7 +100,6 @@ module RelatonW3c
     #
     def parse_link
       link = @sol.respond_to?(:link) ? @sol.link : @sol.version_of
-
       [RelatonBib::TypedUri.new(type: "src", content: link.to_s)]
     end
 
@@ -109,9 +109,7 @@ module RelatonW3c
     # @return [Arra<RelatonBib::DocumentIdentifier>] docidentifier
     #
     def parse_docid
-      return [] unless @sol.respond_to?(:link)
-
-      id = pub_id(@sol.link)
+      id = @sol.respond_to?(:link) ? pub_id(@sol.link) : pub_id(@sol.version_of)
       [RelatonBib::DocumentIdentifier.new(type: "W3C", id: id, primary: true)]
     end
 
@@ -221,10 +219,16 @@ module RelatonW3c
     def parse_relation
       if @sol.respond_to?(:link)
         relations + editor_drafts
-      else document_versions
+      else
+        document_versions.map { |r| create_relation(r.link.to_s, "hasEdition") }
       end
     end
 
+    #
+    # Create relations
+    #
+    # @return [Array<RelatonBib::DocumentRelation>] relations
+    #
     def relations # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       {
         "doc:obsoletes" => { type: "obsoletes" },
@@ -234,14 +238,16 @@ module RelatonW3c
         ":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)
+          create_relation(r.rel.to_s, tp[:type], tp[:description])
         end
       end
     end
 
+    #
+    # Parse editor drafts relation
+    #
+    # @return [Array<RelatonBib::DocumentRelation>] relation
+    #
     def editor_drafts # rubocop:disable Metrics/MethodLength
       sse = SPARQL.parse(%(
         PREFIX : <http://www.w3.org/2001/02pd/rec54#>
@@ -250,15 +256,17 @@ module RelatonW3c
         WHERE { <#{@sol.link}> :ED ?rel . }
       ))
       @fetcher.data.query(sse).map do |s|
-        fr = RelatonBib::LocalizedString.new pub_id(s.rel.to_s)
-        bib = W3cBibliographicItem.new formattedref: fr
-        desc = RelatonBib::FormattedString.new content: "Editor's draft"
-        RelatonBib::DocumentRelation.new(
-          type: "hasDraft", description: desc, bibitem: bib,
-        )
+        create_relation(s.rel.to_s, "hasDraft", "Editor's draft")
       end
     end
 
+    #
+    # Query for relations
+    #
+    # @param [String] predicate relation type
+    #
+    # @return [RDF::Query::Solutions] query result
+    #
     def relation_query(predicate)
       sse = SPARQL.parse(%(
         PREFIX : <http://www.w3.org/2001/02pd/rec54#>
@@ -270,19 +278,43 @@ module RelatonW3c
       @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)
+    #
+    # Query document versions relations
+    #
+    # @return [RDF::Query::Solutions] query results
+    #
+    def document_versions # rubocop:disable Metrics/MethodLength
+      @document_versions ||= begin
+        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 rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+          SELECT ?link ?title ?date
+          WHERE { ?link doc:versionOf <#{@sol.version_of}> ; dc:title ?title ; dc:date ?date }
+        ))
+        @fetcher.data.query(sse)
       end
     end
 
+    #
+    # Create relation
+    #
+    # @param [String] url relation URL
+    # @param [String] type relation type
+    # @param [String, nil] desc relation description
+    #
+    # @return [RelatonBib::DocumentRelation] <description>
+    #
+    def create_relation(url, type, desc = nil)
+      id = pub_id(url)
+      fref = RelatonBib::FormattedRef.new content: id
+      docid = RelatonBib::DocumentIdentifier.new(type: "W3C", id: id, primary: true)
+      bib = W3cBibliographicItem.new formattedref: fref, docid: [docid]
+      dsc = RelatonBib::FormattedString.new content: desc if desc
+      RelatonBib::DocumentRelation.new(type: type, bibitem: bib, description: dsc)
+    end
+
     #
     # Parse formattedref
     #

data/lib/relaton_w3c/version.rb

@@ -1,3 +1,3 @@
 module RelatonW3c
-  VERSION = "1.11.5".freeze
+  VERSION = "1.11.6".freeze
 end

data/lib/relaton_w3c/workgroups.yaml

@@ -103,6 +103,8 @@
   name: Web Services Architecture Working Group
 'https://www.w3.org/2011/webappsec':
   name: Web Application Security Working Group
+'https://www.w3.org/groups/wg/webappsec':
+  name: Web Application Security Working Group
 'https://www.w3.org/Social/WG':
   name: Social Web Working Group
 'https://www.w3.org/XML/Core':

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-w3c
 version: !ruby/object:Gem::Version
-  version: 1.11.5
+  version: 1.11.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-13 00:00:00.000000000 Z
+date: 2022-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml