relaton-calconnect 1.12.1 → 1.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c71eddd571ec418180e331f1e1070679e2065400178c40a8a5c0aec25d846537
-  data.tar.gz: da7fabc685eed3f50ecdf481ac99380a0892f15d0a9e271d927a72ddc2397643
+  metadata.gz: 472e2e5fa6688de1b2437d22f1ec7cbe720bbfa3f15020083b9667f5cf153863
+  data.tar.gz: ee3ea9b65ba53b75aae4fb92b83b147869ea639eed7dddf6b95ddf97fb5bc1a8
 SHA512:
-  metadata.gz: 2cf5660d7c13feaaa7a0d9a4d5b5bc46051a8f42e61d9e62dea45e0da964ff14cd7cba69de89f9711b2ced3de984969a82934251edb9fee554c2a79e2e474879
-  data.tar.gz: 8f12e07949cb161c3224503861e0e0b13ef747505d01c10745c2361e3f2fa2dd0af72c5c71f7ee7600b5337a57d7bba6edb510ae17966aa5629bc0c64da945d0
+  metadata.gz: fe3271ea3e47ee2d29b39961062c5c85a9604ed0e5af2ec66240abdeb18233e96d4facfea08ab94bcbae31acb015361b280286dfaf82bc4903efea8b023ef824
+  data.tar.gz: 5c284c28bc437bcd77cdf26c1001e12b491e903c810806ac9c207c07093ea1498ca3fad08ba290c11cfc563babc357f46ae21254d985c898615a6a5f1eb43589

data/.github/workflows/release.yml

@@ -0,0 +1,22 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
+name: release
+
+on:
+  workflow_dispatch:
+    inputs:
+      next_version:
+        description: |
+          Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
+        required: true
+        default: 'skip'
+  push:
+    tags: [ v* ]
+
+jobs:
+  release:
+    uses: relaton/support/.github/workflows/release.yml@master
+    with:
+      next_version: ${{ github.event.inputs.next_version }}
+    secrets:
+      rubygems-api-key: ${{ secrets.RELATON_CI_RUBYGEMS_API_KEY }}

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_calconnect/scrapper.rb

@@ -5,8 +5,13 @@ module RelatonCalconnect
     # DOMAIN = "http://127.0.0.1:4000/".freeze
 
     class << self
-      # papam hit [Hash]
-      # @return [RelatonOgc::OrcBibliographicItem]
+      #
+      # Parse document page
+      #
+      # @papam hit [Hash] document hash
+      #
+      # @return [RelatonCalconnect::CcBibliographicItem] bibliographic item
+      #
       def parse_page(hit) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         links = array(hit["link"])
         link = links.detect { |l| l["type"] == "rxl" }
@@ -15,6 +20,7 @@ module RelatonCalconnect
           update_links bib, links
           # XMLParser.from_xml bib_xml
         else
+          hit.delete "fetched"
           bib = RelatonCalconnect::CcBibliographicItem.from_hash doc_to_hash hit
         end
         bib.link.each do |l|
@@ -25,8 +31,13 @@ module RelatonCalconnect
 
       private
 
-      # @param url [String]
-      # @return [String] XML
+      #
+      # 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']")
@@ -61,7 +72,8 @@ module RelatonCalconnect
           eg.merge!(tc) if tc
         end
         dtps = %w[CC CSD]
-        array(doc["docid"]).detect { |id| dtps.include? id["type"].upcase }["primary"] = true
+        did = array(doc["docid"]).detect { |id| dtps.include? id["type"].upcase }
+        did["primary"] = true if did
         doc
       end
 

data/lib/relaton_calconnect/version.rb

@@ -1,3 +1,3 @@
 module RelatonCalconnect
-  VERSION = "1.12.1".freeze
+  VERSION = "1.13.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", "~> 1.0"
-  spec.add_dependency "relaton-bib", "~> 1.12.0"
+  spec.add_dependency "relaton-bib", "~> 1.13.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-calconnect
 version: !ruby/object:Gem::Version
-  version: 1.12.1
+  version: 1.13.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-19 00:00:00.000000000 Z
+date: 2022-10-25 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.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
 description: 'RelatonIso: retrieve CC Standards for bibliographic use using the IsoBibliographicItem
   model'
 email:
@@ -145,6 +145,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/rake.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"