relaton-w3c 1.12.2 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bf7e3fdd349e94b272db7045c88bae46fe32f642436527486ff4db8abd08518
-  data.tar.gz: d66405c0f27950d42f1ceac65d3be95a7f93e19ff5045d4c4618ddb551d819b1
+  metadata.gz: 22ce649a3b14df8df8f9e3f8bc6f62b762b589489abfd09fb46cf3fc90d3fb30
+  data.tar.gz: 2994d75163681a80278d2701f51acd767ac38011290b3c24561255118b8a697b
 SHA512:
-  metadata.gz: fb14cc520b1fbe3f5bc0dfd387b990b1693e5e7ab8c15d093372cf8ebe5f11ae4df521c5d05885da83ef60b3fe475dedaeb3dc764a9aaad22f9288de50307ede
-  data.tar.gz: 5d36eea643697240c15bc24abcc6b03414731fd1aed4dc48f4e86f32c7feba6cfa99e3e6f1503882b241414875534a480f4e3c215a39b9bccb60bf0d3c798df5
+  metadata.gz: 816d7ef8942dfdcf7cc9e9ea3de4cf682a9cded874d080002d1a9689f01ec432f137c6e8bd74ec7568e06ed8cc401e433ca7300e22fca18615e8909a1620ae19
+  data.tar.gz: 611763003e4faa41a922d4cf49a5236f40c40c95fe348a413a112911a7f0393005308651bd657b4e6d5a21c7c6ee10c7945c389d2844825fde5cc5326b660176

data/.gitignore

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

data/grammars/biblio.rng

@@ -225,9 +225,9 @@
         <zeroOrMore>
           <ref name="forename"/>
         </zeroOrMore>
-        <zeroOrMore>
-          <ref name="initial"/>
-        </zeroOrMore>
+        <optional>
+          <ref name="formatted-initials"/>
+        </optional>
         <ref name="surname"/>
         <zeroOrMore>
           <ref name="addition"/>
@@ -247,8 +247,8 @@
       <ref name="LocalizedString"/>
     </element>
   </define>
-  <define name="initial">
-    <element name="initial">
+  <define name="formatted-initials">
+    <element name="formatted-initials">
       <ref name="LocalizedString"/>
     </element>
   </define>
@@ -264,6 +264,9 @@
   </define>
   <define name="forename">
     <element name="forename">
+      <optional>
+        <attribute name="initial"/>
+      </optional>
       <ref name="LocalizedString"/>
     </element>
   </define>

data/grammars/isodoc.rng

@@ -69,6 +69,17 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="AdmonitionType">
+      <choice>
+        <value>warning</value>
+        <value>note</value>
+        <value>tip</value>
+        <value>important</value>
+        <value>caution</value>
+        <value>statement</value>
+        <value>editorial</value>
+      </choice>
+    </define>
     <define name="index">
       <element name="index">
         <optional>
@@ -1274,7 +1285,12 @@
   </define>
   <define name="span">
     <element name="span">
-      <attribute name="class"/>
+      <optional>
+        <attribute name="class"/>
+      </optional>
+      <optional>
+        <attribute name="style"/>
+      </optional>
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>
@@ -2493,6 +2509,16 @@
           <text/>
         </element>
       </optional>
+      <optional>
+        <element name="amendment">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="corrigendum">
+          <text/>
+        </element>
+      </optional>
       <optional>
         <element name="language">
           <text/>

data/lib/relaton_w3c/data_fetcher.rb

@@ -20,7 +20,7 @@ module RelatonW3c
       @ext = format.sub(/^bib/, "")
       dir = File.dirname(File.expand_path(__FILE__))
       @group_names = YAML.load_file(File.join(dir, "workgroups.yaml"))
-      @index = DataIndex.new
+      @index = DataIndex.create_from_file
     end
 
     #
@@ -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_index.rb

@@ -136,7 +136,10 @@ module RelatonW3c
       # @return [RelatonW3c::DataIndex] data index
       #
       def create_from_file(index_file = "index-w3c.yaml")
-        index = RelatonBib.parse_yaml(File.read(index_file), [Symbol])
+        index = if File.exist?(index_file)
+                  RelatonBib.parse_yaml(File.read(index_file), [Symbol])
+                else []
+                end
         new index_file: index_file, index: index
       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.2".freeze
+  VERSION = "1.13.0".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]

data/relaton_w3c.gemspec

@@ -41,7 +41,7 @@ Gem::Specification.new do |spec|
   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.12.0"
+  spec.add_dependency "relaton-bib", "~> 1.13.0"
   spec.add_dependency "rubyzip", "~> 2.3.0"
   spec.add_dependency "shex", "~> 0.6.0"
   spec.add_dependency "sparql", "~> 3.1.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-w3c
 version: !ruby/object:Gem::Version
-  version: 1.12.2
+  version: 1.13.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-15 00:00:00.000000000 Z
+date: 2022-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement