relaton-calconnect 1.9.2 → 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_calconnect/scrapper.rb

@@ -7,7 +7,7 @@ module RelatonCalconnect
     class << self
       # papam hit [Hash]
       # @return [RelatonOgc::OrcBibliographicItem]
-      def parse_page(hit)
+      def parse_page(hit) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         links = array(hit["link"])
         link = links.detect { |l| l["type"] == "rxl" }
         if link
@@ -15,9 +15,11 @@ module RelatonCalconnect
           update_links bib, links
           # XMLParser.from_xml bib_xml
         else
-          bib = RelatonCalconnect::CcBibliographicItem.from_hash doc_to_hash(hit)
+          bib = RelatonCalconnect::CcBibliographicItem.from_hash doc_to_hash hit
+        end
+        bib.link.each do |l|
+          l.content.merge!(scheme: SCHEME, host: HOST) unless l.content.host
         end
-        bib.link.each { |l| l.content.merge!(scheme: SCHEME, host: HOST) unless l.content.host }
         bib
       end
 
@@ -25,16 +27,7 @@ module RelatonCalconnect
 
       # @param url [String]
       # @return [String] XML
-      def fetch_bib_xml(url)
-        # rxl = get_rxl url
-        # uri_rxl = rxl.at("uri[@type='rxl']")
-        # return rxl.to_xml unless uri_rxl
-
-        # uri_xml = rxl.xpath("//uri").to_xml
-        # rxl = get_rxl uri_rxl.text
-        # docid = rxl.at "//docidentifier"
-        # docid.add_previous_sibling uri_xml
-        # rxl.to_xml
+      def fetch_bib_xml(url) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         rxl = get_rxl url
         uri_rxl = rxl.at("uri[@type='rxl']")
         if uri_rxl
@@ -44,6 +37,7 @@ module RelatonCalconnect
           docid.add_previous_sibling uri_xml
         end
         xml = rxl.to_xml.gsub!(%r{(</?)technical-committee(>)}, '\1committee\2')
+          .gsub(%r{type="(?:csd|CC)"(?=>)}i, '\0 primary="true"')
         RelatonCalconnect::XMLParser.from_xml xml
       end
 
@@ -66,6 +60,8 @@ module RelatonCalconnect
           tc = eg.delete("technical_committee")
           eg.merge!(tc) if tc
         end
+        dtps = %w[CC CSD]
+        array(doc["docid"]).detect { |id| dtps.include? id["type"].upcase }["primary"] = true
         doc
       end
 

data/lib/relaton_calconnect/version.rb

@@ -1,3 +1,3 @@
 module RelatonCalconnect
-  VERSION = "1.9.2".freeze
+  VERSION = "1.11.0".freeze
 end

data/relaton_calconnect.gemspec

@@ -35,5 +35,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock"
 
   spec.add_dependency "faraday"
-  spec.add_dependency "relaton-bib", "~> 1.9.0"
+  spec.add_dependency "relaton-bib", "~> 1.11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-calconnect
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.11.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-09 00:00:00.000000000 Z
+date: 2022-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.11.0
 description: 'RelatonIso: retrieve CC Standards for bibliographic use using the IsoBibliographicItem
   model'
 email: