relaton-calconnect 2.0.0.pre.alpha.2 → 2.0.0.pre.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd0c795185915981bc99a1c54961411b3da1f821025b31f8a6c4b18187e618ac
-  data.tar.gz: 219899381662180f074d624fa510bc33981c5ada346f6b5883b0bbc6f57c515c
+  metadata.gz: 8eeb2fd8506663291f0232e8b37d85a01205c3a31a6b71a1eb1bd46d51a86697
+  data.tar.gz: aa119791dda6060581b2c43dd4bfafcd9cc1c288d61e2275196ab5568b150884
 SHA512:
-  metadata.gz: 166bec1f55f7919e1e5db68c9b5843a624b10ff775f4d81a343a71ceac8776568fa0b78c8781e054cb2670bfbc206759d0614bfe8d4b7ad7e6ad6747eeab639b
-  data.tar.gz: ea3e740529a6e7f35840c49e3a694758c0cd14679077e5894c9d7c380c7d61022fa2212c5c8ab669a9854eca8726d659dbf16f37e39e397db6056ffe922e5eb6
+  metadata.gz: 969a15f38d16893c511cdf9bdc341af97026c0e788ed99d6e53e2cb942a37e86a948ef367fa1a47661bbcd45a1c4b2c33f7657c86a0e4addaca5b165a5f99a9e
+  data.tar.gz: c2296648220ea1828e6393e6c57a971a52ce99c278a7f9663b02f66d6f77e329e596ac7e4a21e0338122e364dd406fd8867059f8a508b0f47981900208c2fbe4

data/.gitignore

@@ -13,3 +13,4 @@
 .rubocop-https---raw-githubusercontent-com-riboseinc-oss-guides-master-ci-rubocop-yml
 .vscode/
 Gemfile.lock
+.claude/settings.local.json

data/README.adoc

@@ -43,7 +43,7 @@ item = hits[0].item
 [source,ruby]
 ----
 item.to_xml
-=> "<bibitem id="CC-DIR10005-2019" type="standard" schema-version="v1.4.1">
+=> "<bibitem id="CC-DIR10005-2019" type="standard" schema-version="v1.5.6">
       <title language="en">Guidelines for the implementation of the CalConnect patent policy</title>
       <docidentifier type="CalConnect" primary="true">CC/DIR 10005:2019</docidentifier>
       ...
@@ -53,11 +53,11 @@ With argument `bibdata: true` it outputs XML wrapped by `bibdata` element and ad
 [source,ruby]
 ----
 item.to_xml bibdata: true
-=> "<bibdata type="standard" schema-version="v1.4.1">
+=> "<bibdata type="standard" schema-version="v1.5.6">
       <title language="en">Guidelines for the implementation of the CalConnect patent policy</title>
       <docidentifier type="CalConnect" primary="true">CC/DIR 10005:2019</docidentifier>
       ...
-      <ext schema-version="v1.0.0">
+      <ext schema-version="v1.1.2">
         <doctype abbreviation="DIR">directive</doctype>
         <flavor>calconnect</flavor>
       </ext>

data/grammars/basicdoc.rng

@@ -187,6 +187,15 @@ Applicable to modify and delete</a:documentation>
         <a:documentation>Optional caption of this block</a:documentation>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="position">
+        <a:documentation>For an "add" change, whether the change is added before or after the location</a:documentation>
+        <choice>
+          <value>before</value>
+          <value>after</value>
+        </choice>
+      </attribute>
+    </optional>
     <optional>
       <element name="location">
         <a:documentation>The location(s) in the original document which have undergone the change described in this block</a:documentation>
@@ -208,11 +217,15 @@ Applicable to modify and delete</a:documentation>
     </zeroOrMore>
     <optional>
       <element name="newcontent">
-        <a:documentation>New content to be added to the document; applicable to add and modify</a:documentation>
+        <a:documentation>New content to be added to the document; applicable to add and modify.
+Can be blocks and/or sections</a:documentation>
         <ref name="OptionalId"/>
         <zeroOrMore>
           <ref name="BasicBlock"/>
         </zeroOrMore>
+        <zeroOrMore>
+          <ref name="section"/>
+        </zeroOrMore>
       </element>
     </optional>
     <zeroOrMore>

data/grammars/biblio.rng

@@ -1142,11 +1142,11 @@ NOTE: This should preferably be encoded as  a URI or short identifier, rather th
         <a:documentation>Information about how long the current description of the bibliographic item is valid for</a:documentation>
       </ref>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="depiction">
         <a:documentation>Depiction of the bibliographic item, typically an image</a:documentation>
       </ref>
-    </optional>
+    </zeroOrMore>
   </define>
   <define name="ReducedBibliographicItem">
     <a:documentation>Reduced description of a bibliographic resource, without mandatory title and docidentifier, used for document relations
@@ -1939,10 +1939,10 @@ Detailed in https://www.relaton.org/model/relations/</a:documentation>
       <value>hasAnnotation</value>
       <value>draftOf</value>
       <value>hasDraft</value>
-      <value>preliminaryDraftOf</value>
-      <value>hasPreliminaryDraft</value>
-      <value>revisionDraftOf</value>
-      <value>hasRevisionDraft</value>
+      <value>predecessorDraftOf</value>
+      <value>hasPredecessorDraft</value>
+      <value>successorDraftOf</value>
+      <value>hasSuccessorDraft</value>
       <value>editionOf</value>
       <value>hasEdition</value>
       <value>updates</value>
@@ -2063,13 +2063,13 @@ provided that it is not the entire bibliographic item that is so related</a:docu
           <ref name="LocalizedString"/>
         </element>
       </optional>
-      <oneOrMore>
+      <zeroOrMore>
         <element name="taxon">
           <a:documentation>The keywords as a hierarchical taxonomy. For example, the sequence of `taxon` elements
 `pump`, `centrifugal pump`, `line shaft pump` represents a taxonomic classification</a:documentation>
           <ref name="LocalizedString"/>
         </element>
-      </oneOrMore>
+      </zeroOrMore>
       <zeroOrMore>
         <ref name="vocabid">
           <a:documentation>Identifiers for the keyword as a controlled vocabulary</a:documentation>

data/lib/relaton/calconnect/data_fetcher.rb

@@ -27,6 +27,10 @@ module Relaton::Calconnect
       @index = Relaton::Index.find_or_create :CC, file: "index-v1.yaml"
     end
 
+    def log_error(msg)
+      Util.error msg
+    end
+
     #
     # fetch data form server and save it to file.
     #
@@ -40,6 +44,7 @@ module Relaton::Calconnect
       data["root"]["items"].each { |doc| all_success &&= parse_page doc }
       self.etag = resp[:etag] if all_success
       index.save
+      report_errors
     end
 
     private
@@ -50,7 +55,7 @@ module Relaton::Calconnect
     # @param [Hash] doc
     #
     def parse_page(doc)
-      bib = Scraper.parse_page doc
+      bib = Scraper.new(@errors).parse_page doc
       # bib.link.each { |l| l.content.merge!(scheme: SCHEME, host: HOST) unless l.content.host }
       write_doc doc["docid"][0]["id"], bib
       true

data/lib/relaton/calconnect/scraper.rb

@@ -3,264 +3,280 @@ require_relative "model/item"
 
 module Relaton
   module Calconnect
-    module Scraper
-      extend Core::HashKeysSymbolizer
-      extend Core::ArrayWrapper
+    class Scraper
+      include Core::HashKeysSymbolizer
+      include Core::ArrayWrapper
 
       DOMAIN = "https://standards.calconnect.org/".freeze
       SCHEME, HOST = DOMAIN.split(%r{:?/?/})
       # DOMAIN = "http://127.0.0.1:4000/".freeze
 
-      class << self
-        #
-        # Parse document page
-        #
-        # @papam hit [Hash] document hash
-        #
-        # @return [Relaton::Calconnect::ItemData] bibliographic item
-        #
-        def parse_page(hit) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-          hash = symbolize_hash_keys hit
-          links = array(hash[:link])
-          link = links.detect { |l| l[:type] == "rxl" }
-          if link
-            bib = fetch_bib_xml link[:content]
-            update_links bib, links
-          else
-            hash.delete :fetched
-            bib = hash_to_item hash
-          end
-          update_sources bib
-          bib
-        end
+      # @param errors [Hash] error tracking hash
+      def initialize(errors = {})
+        @errors = errors
+      end
 
-        private
-
-        #
-        # Fetch bibliographic item from XML source
-        #
-        # @param url [String] URL to fetch
-        #
-        # @return [RelatonCalconnect::CcBibliographicItem] bibliographic item
-        #
-        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
-            uri_xml = rxl.xpath("//uri").to_xml
-            rxl = get_rxl uri_rxl.text
-            docid = rxl.at "//docidentifier"
-            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"')
-          Item.from_xml xml
+      #
+      # Parse document page
+      #
+      # @papam hit [Hash] document hash
+      #
+      # @return [Relaton::Calconnect::ItemData] bibliographic item
+      #
+      def parse_page(hit) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+        hash = symbolize_hash_keys hit
+        links = array(hash[:link])
+        link = links.detect { |l| l[:type] == "rxl" }
+        if link
+          bib = fetch_bib_xml link[:content]
+          update_links bib, links
+        else
+          hash.delete :fetched
+          bib = hash_to_item hash
         end
+        update_sources bib
+        bib
+      end
 
-        # @param path [String]
-        # @return [Nokogiri::XML::Document]
-        def get_rxl(path)
-          resp = Faraday.get DOMAIN + path
-          Nokogiri::XML resp.body
+      private
+
+      #
+      # Fetch bibliographic item from XML source
+      #
+      # @param url [String] URL to fetch
+      #
+      # @return [RelatonCalconnect::CcBibliographicItem] bibliographic item
+      #
+      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
+          uri_xml = rxl.xpath("//uri").to_xml
+          rxl = get_rxl uri_rxl.text
+          docid = rxl.at "//docidentifier"
+          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"')
+        Item.from_xml xml
+      end
 
-        #
-        # Fix editorial group
-        #
-        # @param [Hash] doc
-        #
-        # @return [Hash]
-        #
-        def hash_to_item(hash)
-          hash_to_title hash
-          hash_to_source hash
-          hash_to_docid hash
-          hash_to_date hash
-          hash_to_contributor hash
-          hash_to_edition hash
-          hash_to_version hash
-          hosh_to_abstract hash
-          hash_to_status hash
-          hash_to_relation hash
-          hash_to_copyrigh hash
-          hash_to_keyword hash
-          hash_to_editorialgroup hash
-          hash_to_ext hash
-          ItemData.new(**hash)
-        end
+      # @param path [String]
+      # @return [Nokogiri::XML::Document]
+      def get_rxl(path)
+        resp = Faraday.get DOMAIN + path
+        Nokogiri::XML resp.body
+      end
 
-        def hash_to_title(hash)
-          hash[:title] = array(hash[:title]).map do |t|
-            t[:language] = t[:language].first if t[:language].is_a? Array
-            t[:script] = t[:script].first if t[:script].is_a? Array
-            t.delete :format
-            Bib::Title.new(**t)
-          end
-        end
+      #
+      # Fix editorial group
+      #
+      # @param [Hash] doc
+      #
+      # @return [Hash]
+      #
+      def hash_to_item(hash)
+        hash_to_title hash
+        hash_to_source hash
+        hash_to_docid hash
+        hash_to_date hash
+        hash_to_contributor hash
+        hash_to_edition hash
+        hash_to_version hash
+        hosh_to_abstract hash
+        hash_to_status hash
+        hash_to_relation hash
+        hash_to_copyrigh hash
+        hash_to_keyword hash
+        hash_to_editorialgroup hash
+        hash_to_ext hash
+        ItemData.new(**hash)
+      end
 
-        def hash_to_source(hash)
-          hash[:source] = array(hash[:link]).map { |link| Bib::Uri.new(type: "src", **link) }
+      def hash_to_title(hash)
+        hash[:title] = array(hash[:title]).map do |t|
+          t[:language] = t[:language].first if t[:language].is_a? Array
+          t[:script] = t[:script].first if t[:script].is_a? Array
+          t.delete :format
+          Bib::Title.new(**t)
         end
+        @errors[:title] &&= hash[:title].empty?
+      end
 
-        def hash_to_docid(hash)
-          docid = hash.delete(:docid)
-          return unless docid
+      def hash_to_source(hash)
+        hash[:source] = array(hash[:link]).map { |link| Bib::Uri.new(type: "src", **link) }
+        @errors[:source] &&= hash[:source].empty?
+      end
 
-          docid_types = %w[CC CSD]
-          hash[:docidentifier] = array(docid).map do |id|
-            id[:primary] = true if docid_types.include? id[:type].upcase
-            id[:content] = id.delete(:id) if id[:id]
-            Bib::Docidentifier.new(**id)
-          end
+      def hash_to_docid(hash)
+        docid = hash.delete(:docid)
+        @errors[:docid] &&= docid.nil?
+        return unless docid
+
+        docid_types = %w[CC CSD]
+        hash[:docidentifier] = array(docid).map do |id|
+          id[:primary] = true if docid_types.include? id[:type].upcase
+          id[:content] = id.delete(:id) if id[:id]
+          Bib::Docidentifier.new(**id)
         end
+      end
 
-        def hash_to_date(hash)
-          hash[:date] = array(hash[:date]).map do |d|
-            d[:at] = d.delete(:value) if d[:value]
-            Bib::Date.new(**d)
-          end
+      def hash_to_date(hash)
+        hash[:date] = array(hash[:date]).map do |d|
+          d[:at] = d.delete(:value) if d[:value]
+          Bib::Date.new(**d)
         end
+        @errors[:date] &&= hash[:date].empty?
+      end
 
-        def hash_to_contributor(hash)
-          hash[:contributor] = array(hash[:contributor]).map do |contrib|
-            if contrib[:organization]
-              contrib[:organization] = create_organization contrib[:organization]
-            elsif contrib[:person]
-              contrib[:person] = create_person contrib[:person]
-            end
-            contrib[:role] = array(contrib[:role]).map do |role|
-              role[:description] = array(role[:description]).map do |desc|
-                Bib::LocalizedMarkedUpString.new content: desc
-              end
-              Bib::Contributor::Role.new(**role)
+      def hash_to_contributor(hash)
+        hash[:contributor] = array(hash[:contributor]).map do |contrib|
+          if contrib[:organization]
+            contrib[:organization] = create_organization contrib[:organization]
+          elsif contrib[:person]
+            contrib[:person] = create_person contrib[:person]
+          end
+          contrib[:role] = array(contrib[:role]).map do |role|
+            role[:description] = array(role[:description]).map do |desc|
+              Bib::LocalizedMarkedUpString.new content: desc
             end
-            Bib::Contributor.new(**contrib)
+            Bib::Contributor::Role.new(**role)
           end
+          Bib::Contributor.new(**contrib)
         end
+        @errors[:contributor] &&= hash[:contributor].empty?
+      end
 
-        def create_organization(org_hash)
-          org_name = array(org_hash[:name]).each { |name| Bib::TypedLocalizedString.new(**name) }
-          contact = create_contact org_hash[:contact]
-          Bib::Organization.new(name: org_name, **contact)
-        end
+      def create_organization(org_hash)
+        org_name = array(org_hash[:name]).each { |name| Bib::TypedLocalizedString.new(**name) }
+        contact = create_contact org_hash[:contact]
+        Bib::Organization.new(name: org_name, **contact)
+      end
 
-        def create_contact(contact_hash)
-          array(contact_hash).each_with_object({address: [], email: [], uri: []}) do |cont, acc|
-            case cont
-            in { address: addr_hash }
-              acc[:address] = Bib::Address.new(**addr_hash)
-            in { email: email }
-              acc[:email] << email
-            in { uri: uri }
-              acc[:uri] << Bib::Uri.new(content: uri)
-            end
+      def create_contact(contact_hash)
+        array(contact_hash).each_with_object({address: [], email: [], uri: []}) do |cont, acc|
+          case cont
+          in { address: addr_hash }
+            acc[:address] = Bib::Address.new(**addr_hash)
+          in { email: email }
+            acc[:email] << email
+          in { uri: uri }
+            acc[:uri] << Bib::Uri.new(content: uri)
           end
         end
+      end
 
-        def create_person(person_hash)
-          completename = Bib::LocalizedString.new(**person_hash[:name][:completename])
-          name = Bib::FullName.new completename: completename
-          affiliation = array(person_hash[:affiliation]).map do |aff|
-            org = create_organization aff[:organization]
-            Bib::Affiliation.new(organization: org)
-          end
-          contact = create_contact person_hash[:contact]
-          Bib::Person.new(name: name, affiliation: affiliation, **contact)
+      def create_person(person_hash)
+        completename = Bib::LocalizedString.new(**person_hash[:name][:completename])
+        name = Bib::FullName.new completename: completename
+        affiliation = array(person_hash[:affiliation]).map do |aff|
+          org = create_organization aff[:organization]
+          Bib::Affiliation.new(organization: org)
         end
+        contact = create_contact person_hash[:contact]
+        Bib::Person.new(name: name, affiliation: affiliation, **contact)
+      end
 
-        def hash_to_edition(hash)
-          number = hash.dig(:edition, :content)
-          hash[:edition] = Bib::Edition.new(number: number) if number
-        end
+      def hash_to_edition(hash)
+        number = hash.dig(:edition, :content)
+        @errors[:edition] &&= number.nil?
+        hash[:edition] = Bib::Edition.new(number: number) if number
+      end
 
-        def hash_to_version(hash)
-          hash[:version] = array(hash[:version]).map do |ver|
-            Bib::Version.new(revision_date: ver[:revision_date])
-          end
+      def hash_to_version(hash)
+        hash[:version] = array(hash[:version]).map do |ver|
+          Bib::Version.new(revision_date: ver[:revision_date])
         end
+      end
 
-        def hosh_to_abstract(hash)
-          hash[:abstract] = array(hash[:abstract]).map do |abs|
-            Bib::LocalizedMarkedUpString.new(**abs)
-          end
+      def hosh_to_abstract(hash)
+        hash[:abstract] = array(hash[:abstract]).map do |abs|
+          Bib::Abstract.new(**abs)
         end
+        @errors[:abstract] &&= hash[:abstract].empty?
+      end
 
-        def hash_to_status(hash)
-          docstatus = hash.delete(:docstatus)
-          return unless docstatus
+      def hash_to_status(hash)
+        docstatus = hash.delete(:docstatus)
+        @errors[:status] &&= docstatus.nil?
+        return unless docstatus
 
-          stage = Bib::Status::Stage.new content: docstatus.dig(:stage, :value)
-          hash[:status] = Bib::Status.new stage: stage
-        end
+        stage = Bib::Status::Stage.new content: docstatus.dig(:stage, :value)
+        hash[:status] = Bib::Status.new stage: stage
+      end
 
-        def hash_to_relation(hash)
-          hash[:relation] = array(hash[:relation]).map do |rel|
-            Bib::Relation.new(type: rel[:type], bibitem: hash_to_item(rel[:bibitem]))
-          end
+      def hash_to_relation(hash)
+        hash[:relation] = array(hash[:relation]).map do |rel|
+          Bib::Relation.new(type: rel[:type], bibitem: hash_to_item(rel[:bibitem]))
         end
+        @errors[:relation] &&= hash[:relation].empty?
+      end
 
-        def hash_to_copyrigh(hash)
-          hash[:copyright] = array(hash[:copyright]).map do |cr|
-            cr[:owner] = array(cr[:owner]).map do |owner|
-              org_name = array(owner[:name]).map do |name|
-                Bib::TypedLocalizedString.new(**name)
-              end
-              Bib::ContributionInfo.new organization: Bib::Organization.new(name: org_name)
+      def hash_to_copyrigh(hash)
+        hash[:copyright] = array(hash[:copyright]).map do |cr|
+          cr[:owner] = array(cr[:owner]).map do |owner|
+            org_name = array(owner[:name]).map do |name|
+              Bib::TypedLocalizedString.new(**name)
             end
-            Bib::Copyright.new(**cr)
+            Bib::ContributionInfo.new organization: Bib::Organization.new(name: org_name)
           end
+          Bib::Copyright.new(**cr)
         end
+        @errors[:copyright] &&= hash[:copyright].empty?
+      end
 
-        def hash_to_keyword(hash)
-          hash[:keyword] = array(hash[:keyword]).map do |kw|
-            taxon = Bib::LocalizedString.new(**kw)
-            Bib::Keyword.new(taxon: taxon)
-          end
+      def hash_to_keyword(hash)
+        hash[:keyword] = array(hash[:keyword]).map do |kw|
+          vocab = Bib::LocalizedString.new(**kw)
+          Bib::Keyword.new(vocab: vocab)
         end
+        @errors[:keyword] &&= hash[:keyword].empty?
+      end
 
-        def hash_to_ext(hash)
-          return unless hash[:ext]
+      def hash_to_ext(hash)
+        return unless hash[:ext]
 
-          hash_to_doctype hash[:ext]
-          hash[:ext] = Ext.new(flavor: "calconnect", **hash.delete(:ext))
-        end
+        hash_to_doctype hash[:ext]
+        hash[:ext] = Ext.new(flavor: "calconnect", **hash.delete(:ext))
+      end
 
-        def hash_to_doctype(ext)
-          return unless ext[:doctype]
+      def hash_to_doctype(ext)
+        @errors[:doctype] &&= ext[:doctype].nil?
+        return unless ext[:doctype]
 
-          ext[:doctype] = Doctype.new content: ext.dig(:doctype, :type), abbreviation: ext.dig(:doctype, :abbreviation)
-        end
+        ext[:doctype] = Doctype.new content: ext.dig(:doctype, :type), abbreviation: ext.dig(:doctype, :abbreviation)
+      end
 
-        def hash_to_editorialgroup(hash)
-          eg = hash.delete(:editorialgroup) || (hash[:ext] && hash[:ext].delete(:editorialgroup))
-          return unless eg
-
-          # Handle old format: { technical_committee: { name: "X" } }
-          eg = eg[:technical_committee] if eg[:technical_committee]
-
-          subdiv_name = Bib::TypedLocalizedString.new content: eg[:name]
-          subdivision = Bib::Subdivision.new(type: "technical-committee", name: [subdiv_name])
-          org_name = Bib::TypedLocalizedString.new content: "CalConnect"
-          org = Bib::Organization.new name: [org_name], subdivision: [subdivision]
-          description = Bib::LocalizedMarkedUpString.new content: "committee"
-          role = Bib::Contributor::Role.new type: "author", description: [description]
-          hash[:contributor] ||= []
-          hash[:contributor] << Bib::Contributor.new(organization: org, role: [role])
-        end
+      def hash_to_editorialgroup(hash)
+        eg = hash.delete(:editorialgroup) || (hash[:ext] && hash[:ext].delete(:editorialgroup))
+        @errors[:editorialgroup] &&= eg.nil?
+        return unless eg
+
+        # Handle old format: { technical_committee: { name: "X" } }
+        eg = eg[:technical_committee] if eg[:technical_committee]
+
+        subdiv_name = Bib::TypedLocalizedString.new content: eg[:name]
+        subdivision = Bib::Subdivision.new(type: "technical-committee", name: [subdiv_name])
+        org_name = Bib::TypedLocalizedString.new content: "CalConnect"
+        org = Bib::Organization.new name: [org_name], subdivision: [subdivision]
+        description = Bib::LocalizedMarkedUpString.new content: "committee"
+        role = Bib::Contributor::Role.new type: "author", description: [description]
+        hash[:contributor] ||= []
+        hash[:contributor] << Bib::Contributor.new(organization: org, role: [role])
+      end
 
-        def update_links(bib, links)
-          links.each do |l|
-            tu = l.transform_keys(&:to_sym)
-            bib.source << Relaton::Bib::Uri.new(**tu) unless bib.source(l[:type])
-          end
-          bib
+      def update_links(bib, links)
+        links.each do |l|
+          tu = l.transform_keys(&:to_sym)
+          bib.source << Relaton::Bib::Uri.new(**tu) unless bib.source(l[:type])
         end
+        bib
+      end
 
-        def update_sources(bib)
-          bib.source.each do |l|
-            uri = Addressable::URI.parse l.content
-            l.content = uri.merge(scheme: SCHEME, host: HOST).to_s unless uri.host
-          end
+      def update_sources(bib)
+        bib.source.each do |l|
+          uri = Addressable::URI.parse l.content
+          l.content = uri.merge(scheme: SCHEME, host: HOST).to_s unless uri.host
         end
       end
     end

data/lib/relaton/calconnect/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Calconnect
-    VERSION = "2.0.0-alpha.2".freeze
+    VERSION = "2.0.0-alpha.3".freeze
   end
 end

data/relaton_calconnect.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 3.2.0")
 
   spec.add_dependency "faraday", "~> 2.7.0"
-  spec.add_dependency "relaton-bib", "~> 2.0.0-alpha.4"
-  spec.add_dependency "relaton-core", "~> 0.0.8"
+  spec.add_dependency "relaton-bib", "~> 2.0.0-alpha.7"
+  spec.add_dependency "relaton-core", "~> 0.0.12"
   spec.add_dependency "relaton-index", "~> 0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relaton-calconnect
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.2
+  version: 2.0.0.pre.alpha.3
 platform: ruby
 authors:
 - Ribose Inc.
@@ -29,28 +29,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.alpha.4
+        version: 2.0.0.pre.alpha.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.alpha.4
+        version: 2.0.0.pre.alpha.7
 - !ruby/object:Gem::Dependency
   name: relaton-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 0.0.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 0.0.12
 - !ruby/object:Gem::Dependency
   name: relaton-index
   requirement: !ruby/object:Gem::Requirement