relaton-w3c 1.9.6 → 1.11.0

data/grammars/reqt.rng

@@ -58,15 +58,23 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="tag"/>
+    </optional>
+    <optional>
+      <attribute name="multilingual-rendering">
+        <ref name="MultilingualRenderingType"/>
+      </attribute>
+    </optional>
     <optional>
       <ref name="reqtitle"/>
     </optional>
     <optional>
       <ref name="label"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="subject"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="reqinherit"/>
     </zeroOrMore>
@@ -80,6 +88,7 @@
         <ref name="verification"/>
         <ref name="import"/>
         <ref name="description"/>
+        <ref name="component"/>
       </choice>
     </zeroOrMore>
     <optional>
@@ -100,17 +109,23 @@
   </define>
   <define name="label">
     <element name="label">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="subject">
     <element name="subject">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="reqinherit">
     <element name="inherit">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="measurementtarget">
@@ -138,6 +153,12 @@
       <ref name="RequirementSubpart"/>
     </element>
   </define>
+  <define name="component">
+    <element name="component">
+      <attribute name="class"/>
+      <ref name="RequirementSubpart"/>
+    </element>
+  </define>
   <define name="reqt_references">
     <element name="references">
       <oneOrMore>
@@ -164,6 +185,14 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="tag"/>
+    </optional>
+    <optional>
+      <attribute name="multilingual-rendering">
+        <ref name="MultilingualRenderingType"/>
+      </attribute>
+    </optional>
     <oneOrMore>
       <ref name="BasicBlock"/>
     </oneOrMore>

data/lib/relaton_w3c/bibxml_parser.rb

@@ -0,0 +1,17 @@
+module RelatonW3c
+  module BibXMLParser
+    extend RelatonBib::BibXMLParser
+    extend BibXMLParser
+
+    #
+    # Return PubID type
+    #
+    # @param [String] _ docidentifier
+    #
+    # @return [String] type
+    #
+    def pubid_type(_)
+      "W3C"
+    end
+  end
+end

data/lib/relaton_w3c/data_fethcer.rb

@@ -49,7 +49,7 @@ module RelatonW3c
       query.each { |sl| save_doc DataParser.parse(sl, self) }
       Dir[File.expand_path("../../data/*", __dir__)].each do |file|
         xml = File.read file, encoding: "UTF-8"
-        save_doc RelatonBib::BibXMLParser.parse(xml)
+        save_doc BibXMLParser.parse(xml)
       end
     end
 

data/lib/relaton_w3c/data_parser.rb

@@ -75,7 +75,7 @@ module RelatonW3c
     #
     def parse_docid
       id = pub_id(@sol.link.to_s)
-      [RelatonBib::DocumentIdentifier.new(type: "W3C", id: id)]
+      [RelatonBib::DocumentIdentifier.new(type: "W3C", id: id, primary: true)]
     end
 
     #

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.9.6".freeze
+  VERSION = "1.11.0".freeze
 end

data/lib/relaton_w3c.rb

@@ -6,6 +6,7 @@ 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"
 

data/relaton_w3c.gemspec

@@ -40,6 +40,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "linkeddata", "~> 3.1.0"
   spec.add_dependency "mechanize", "~> 2.8.0"
   spec.add_dependency "rdf", "~> 3.1.0"
-  spec.add_dependency "relaton-bib", ">= 1.9.19"
+  spec.add_dependency "relaton-bib", "~> 1.11.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.9.6
+  version: 1.11.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-26 00:00:00.000000000 Z
+date: 2022-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -126,16 +126,16 @@ dependencies:
   name: relaton-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.19
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.19
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: sparql
   requirement: !ruby/object:Gem::Requirement
@@ -200,6 +200,7 @@ files:
 - grammars/isodoc.rng
 - grammars/reqt.rng
 - lib/relaton_w3c.rb
+- lib/relaton_w3c/bibxml_parser.rb
 - lib/relaton_w3c/data_fethcer.rb
 - lib/relaton_w3c/data_parser.rb
 - lib/relaton_w3c/hash_converter.rb