relaton-calconnect 1.10.0 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc6f1d7dfe13d3c4db9b18e95dc9f5aed1bedefd19213c70dbd873de26a38ce2
-  data.tar.gz: bab5ad5fec02754e549f7a35f488a985d03947c5a428fe6b02438a2a1cc54d3f
+  metadata.gz: 28f0818beb318356e6c98999c461cfa4abfd2582f22771e42c93679b79acc0b6
+  data.tar.gz: 629eec258bb6b2ab488cb50731ec8a49248ea2b52fea97d8628f51dca3a495ba
 SHA512:
-  metadata.gz: 902f6d7353903a53cd1739d7a094c2be8d72fe94b73066bd849559463a368060d4692542cbc48c49764b128be44e3e83177e5d18c0e0ae8c88bbc491484f586b
-  data.tar.gz: ca2dcfca25d202703a3a32032880b82532e7c75a7395582bcbdac6314c71a92c0c5fe2bd5d8a62b737c20e6d51c2188d2f33970b833fb4368f99a2840371a038
+  metadata.gz: 1c2ee52411505f9e208aee08277ba956d66c74ddce6cdaa4b78700ac906ddc1caeaf10951f05e20a9e3666486d24c4fe5f4a763217ca0e5a073326f3ccc668e4
+  data.tar.gz: 83c61bb0b56e315db85647b46a889d8ec506905d9019ed675d4de31d1508500340d0b61a8df6ddcad21f29df828323c3b624694434f62f23fc0e2509c4854144

data/grammars/biblio.rng

@@ -209,9 +209,6 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="uri"/>
-      </zeroOrMore>
     </element>
   </define>
   <define name="fullname">
@@ -828,6 +825,11 @@
       <optional>
         <attribute name="scope"/>
       </optional>
+      <optional>
+        <attribute name="primary">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <text/>
     </element>
   </define>

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.10.0".freeze
+  VERSION = "1.10.1".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.10.0"
+  spec.add_dependency "relaton-bib", "~> 1.10.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-calconnect
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.10.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-30 00:00:00.000000000 Z
+date: 2022-02-09 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.10.0
+        version: 1.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.10.1
 description: 'RelatonIso: retrieve CC Standards for bibliographic use using the IsoBibliographicItem
   model'
 email: