relaton-w3c 1.12.3 → 1.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0e1e914bfe536b10f9d3b9e48f946e9d86a66df1db0233e1b6d3f67b29beaa6
-  data.tar.gz: 635cd920c1b8ff93678083790518eade6ce7051653e190eb8294a25306e3e69a
+  metadata.gz: 99d8437c234f255a39c904f66b9a31a54bc8d96278cdf62be3097e53bc3f22d4
+  data.tar.gz: 42cb93c06794e8c72cbf81f43af3a7b3e4f5504f54215e2ac4872e61b84169bb
 SHA512:
-  metadata.gz: bcdce1b3f1e10def99be7e5d51d98acb868d9d94884211d17814b22ffc64b5d2b4cfdee45bebe784fe02672d1af0cabb1a7dc7f3671433bd63c296a9ed106016
-  data.tar.gz: 81457b4d1f0f59a6b869a7089bd9173164abd126ed17a923f5f02f1766e7d732ba421c61284cfd35b1ca006b75c0e8e1ff7e80d55f58d7af09f64460bd8e1d8f
+  metadata.gz: 3f970f7fbcdf0f3490ceea00f891877bfc235e5c1ac6a3e2dbf61845686088800281ae7c2d09ac98c8a51a5d6e8b4e9447e4aaa0ab14db52be141265ed4b2999
+  data.tar.gz: 57b934f34559e319b627c1747133a807f4befbf1a41f28523197c6fc66e51484bab2b43feaea90e92c02f7a15a3dedde55a20b9cf5f97c3c6410b85a2fa3acbe

data/.gitignore

@@ -12,3 +12,4 @@
 Gemfile.lock
 .rubocop-https---raw-githubusercontent-com-riboseinc-oss-guides-master-ci-rubocop-yml
 .vscode/
+tr.rdf

data/lib/relaton_w3c/data_fetcher.rb

@@ -67,21 +67,52 @@ module RelatonW3c
     #
     # @param [RelatonW3c::W3cBibliographicItem] bib bibligraphic item
     #
-    def add_has_edition_relation(bib) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity
+    def add_has_edition_relation(bib) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength
       file = file_name bib.docnumber
-      return unless File.exist? file
-
-      b = case @format
-          when "xml" then XMLParser.from_xml(File.read(file, encoding: "UTF-8"))
-          when "yaml"
-            hash = YAML.load_file(file)
-            W3cBibliographicItem.from_hash(hash)
-          when "bibxml" then BibXMLParser.parse File.read(file, encoding: "UTF-8")
-          end
-      b.relation.each do |r|
-        same_edition = bib.relation.detect { |r2| same_edition?(r, r2) }
-        bib.relation << r unless same_edition
+      if File.exist? file
+        item = send "read_#{@format}", file
+        item.relation.each do |r1|
+          r1.type = "hasEdition" if r1.type == "instance"
+          same_edition = bib.relation.detect { |r2| same_edition?(r1, r2) }
+          bib.relation << r1 unless same_edition
+        end
       end
+      bib.relation.select { |r| r.type == "hasEdition" }
+        .max_by { |r| r.bibitem.id.match(/(?<=-)\d{8}$/).to_s }&.type = "instance"
+    end
+
+    #
+    # Read XML file
+    #
+    # @param [String] file file name
+    #
+    # @return [RelatonW3c::W3cBibliographicItem] bibliographic item
+    #
+    def read_xml(file)
+      XMLParser.from_xml(File.read(file, encoding: "UTF-8"))
+    end
+
+    #
+    # Read YAML file
+    #
+    # @param [String] file file name
+    #
+    # @return [RelatonW3c::W3cBibliographicItem] bibliographic item
+    #
+    def read_yaml(file)
+      hash = YAML.load_file(file)
+      W3cBibliographicItem.from_hash(hash)
+    end
+
+    #
+    # Read BibXML file
+    #
+    # @param [String] file file name
+    #
+    # @return [RelatonW3c::W3cBibliographicItem] bibliographic item
+    #
+    def read_bibxml(file)
+      BibXMLParser.parse File.read(file, encoding: "UTF-8")
     end
 
     #

data/lib/relaton_w3c/data_parser.rb

@@ -101,7 +101,7 @@ module RelatonW3c
     #
     def parse_link
       link = @sol.respond_to?(:link) ? @sol.link : @sol.version_of
-      [RelatonBib::TypedUri.new(type: "src", content: link.to_s.strip)]
+      [RelatonBib::TypedUri.new(type: "src", content: link.to_s.strip)] + editor_drafts
     end
 
     #
@@ -176,29 +176,64 @@ module RelatonW3c
     #
     # @return [Array<String>] types and stages
     #
-    def types_stages # rubocop:disable Metrics/MethodLength
-      return unless @sol.respond_to?(:link)
-
+    def types_stages
       @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#>
-          SELECT ?type
-          WHERE {
-            { <#{@sol.link.to_s.strip}> rdf:type ?type }
-          }
-        ))
+        sse = @sol.respond_to?(:link) ? versioned_types_stages : unversioned_types_stages
         @rdf.query(sse).map { |s| s.type.to_s.split("#").last }
       end
     end
 
+    #
+    # Create SPARQL query for versioned types and stages
+    #
+    # @return [SPARQL::Algebra::Operator::Prefix] SPARQL query
+    #
+    def versioned_types_stages
+      SPARQL.parse(%(
+        PREFIX : <http://www.w3.org/2001/02pd/rec54#>
+        PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+        SELECT ?type
+        WHERE {
+          { <#{@sol.link.to_s.strip}> rdf:type ?type }
+        }
+      ))
+    end
+
+    #
+    # Create SPARQL query for unversioned types and stages
+    #
+    # @return [SPARQL::Algebra::Operator::Prefix] SPARQL query
+    #
+    def unversioned_types_stages
+      SPARQL.parse(%(
+        PREFIX : <http://www.w3.org/2001/02pd/rec54#>
+        PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+        PREFIX doc: <http://www.w3.org/2000/10/swap/pim/doc#>
+        SELECT ?type
+        WHERE {
+          ?link doc:versionOf <#{@sol.version_of}>; rdf:type ?type .
+          FILTER ( isURI(?link) && STR(?link) != <#{@sol.version_of}> )
+        }
+      ))
+    end
+
     #
     # Parse doctype
     #
-    # @return [Strinf] doctype
+    # @return [String, nil] doctype
     #
     def parse_doctype
-      DOCTYPES[type] || "recommendation"
+      DOCTYPES[type] || DOCTYPES[type_from_link]
+    end
+
+    #
+    # Fetch type from link
+    #
+    # @return [String, nil] type
+    #
+    def type_from_link
+      link = @sol.respond_to?(:link) ? @sol.link : @sol.version_of
+      link.to_s.strip.match(/www\.w3\.org\/(TR)/)&.to_a&.fetch 1
     end
 
     #
@@ -219,7 +254,7 @@ module RelatonW3c
     #
     def parse_relation
       if @sol.respond_to?(:link)
-        relations + editor_drafts
+        relations
       else
         document_versions.map { |r| create_relation(r.link.to_s.strip, "hasEdition") }
       end
@@ -250,14 +285,16 @@ module RelatonW3c
     # @return [Array<RelatonBib::DocumentRelation>] relation
     #
     def editor_drafts # rubocop:disable Metrics/MethodLength
+      return [] unless @sol.respond_to?(:link)
+
       sse = SPARQL.parse(%(
         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.to_s.strip}> :ED ?rel . }
+        SELECT ?latest
+        WHERE { <#{@sol.link.to_s.strip}> :ED ?latest . }
       ))
       @rdf.query(sse).map do |s|
-        create_relation(s.rel.to_s, "hasDraft", "Editor's draft")
+        RelatonBib::TypedUri.new(type: "current", content: s.latest.to_s.strip)
       end
     end
 

data/lib/relaton_w3c/version.rb

@@ -1,3 +1,3 @@
 module RelatonW3c
-  VERSION = "1.12.3".freeze
+  VERSION = "1.12.4".freeze
 end

data/lib/relaton_w3c/w3c_bibliographic_item.rb

@@ -2,7 +2,7 @@ module RelatonW3c
   class W3cBibliographicItem < RelatonBib::BibliographicItem
     TYPES = %w[
       candidateRecommendation groupNote proposedEditedRecommendation
-      proposedRecommendation recommendation retired workingDraft
+      proposedRecommendation recommendation retired workingDraft technicalReport
     ].freeze
 
     # @param doctype [String]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-w3c
 version: !ruby/object:Gem::Version
-  version: 1.12.3
+  version: 1.12.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-20 00:00:00.000000000 Z
+date: 2022-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml