relaton-cen 1.13.0 → 1.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b403da68faea3063767d909923df969dba82c71f00caac6dfb7b787a7771f830
-  data.tar.gz: 28a689559d7310f708820681bd9f7547a7361d34694d806f45c8d6340522b119
+  metadata.gz: 97f7e94eea61650c826d444f99d41dd11b0a506b9b5f26b552034db3c5790e69
+  data.tar.gz: 6490ba9f131c3411b1c3b891a9fd7c9b254d6bfafcfc999d47c0405d53ad2eae
 SHA512:
-  metadata.gz: 7268e0fcbbe69777496bbcfbbc1abab0c9f64ce954e2aa5fc6545af96138d83bc5724c807edf62faf4ba8e79a10ae5cfb70c0fb7b691e298bff36ac0181e1d80
-  data.tar.gz: 2f746e026680b62fffcda5db28de43d06e83249e3d2fa496f9ed9efacca0f5fcef7f447837644ce965be6ac3f1680378ed276adfda8192703e2a5fdcce3c66e7
+  metadata.gz: a6fd2c4264184ee2f48a305307234dc7a9d4ccdf8ad5d2073676dd2813868b40996069664231618a1ad791e91e7f715b3084e765746480584eab9cc4f8a42c0c
+  data.tar.gz: 2fc22a3cbf50790f86fc567eb116344dc0a447f5a476fcc11eb3d61ab451e054efb92906aa46c594ea36d1825d7d146db793f51796d7b8e32c93335fcbb8cfb6

data/.github/workflows/rake.yml

@@ -5,7 +5,6 @@ name: rake
 on:
   push:
     branches: [ master, main ]
-    tags: [ v* ]
   pull_request:
 
 jobs:

data/.github/workflows/release.yml

@@ -0,0 +1,23 @@
+# 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'
+  repository_dispatch:
+    types: [ do-release ]
+
+
+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/.rubocop.yml

@@ -7,6 +7,6 @@ require: rubocop-rails
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.7
 Rails:
   Enabled: false

data/Gemfile

@@ -5,6 +5,14 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in relaton_cen.gemspec
 gemspec
 
+gem "equivalent-xml", "~> 0.6"
+gem "pry-byebug"
 gem "rake", "~> 13.0"
-
 gem "rspec", "~> 3.0"
+gem "rubocop", "~> 1.17.0"
+gem "rubocop-performance", "~> 1.11.0"
+gem "rubocop-rails", "~> 2.10.0"
+gem "ruby-jing"
+gem "simplecov"
+gem "vcr", "~> 5.0.0"
+gem "webmock"

data/README.adoc

@@ -32,6 +32,7 @@ Or install it yourself as:
 [source,ruby]
 ----
 require 'relaton_cen'
+=> true
 
 hit_collection = RelatonCen::CenBibliography.search("CEN ISO/TS 21003-7")
 => <RelatonCen::HitCollection:0x00000000017de0 @ref=ISO/TS 21003-7 @fetched=false>
@@ -44,112 +45,27 @@ item = hit_collection[0].fetch
 === XML serialization
 [source,ruby]
 ----
-puts item.to_xml
-"<bibitem id="CENISO/TS21003-7-2019" type="standard">
-  <fetched>2021-05-30</fetched>
-  <title type="title-main" format="text/plain" language="en" script="Latn">Multilayer piping systems for hot and cold water installations inside buildings</title>
-  <title type="title-part" format="text/plain" language="en" script="Latn">Part 7: Guidance for the assessment of conformity (ISO/TS 21003-7:2019)</title>
-  <title type="main" format="text/plain" language="en" script="Latn">Multilayer piping systems for hot and cold water installations inside buildings - Part 7: Guidance for the assessment of conformity (ISO/TS 21003-7:2019)</title>
-  <uri type="src">https://standards.cen.eu/dyn/www/f?p=204:110:0::::FSP_PROJECT,FSP_ORG_ID:68120,6137&amp;cs=124CA2347A9843B3165EE35F066A30B7C</uri>
-  <docidentifier type="CEN">CEN ISO/TS 21003-7:2019</docidentifier>
-  <date type="adapted">
-    <on>2019-03-28</on>
-  </date>
-  <date type="issued">
-    <on>2019-05-29</on>
-  </date>
-  <date type="announced">
-    <on>2019-08-31</on>
-  </date>
-  <language>en</language>
-  <script>Latn</script>
-  <abstract format="text/plain" language="en" script="Latn">This document gives requirements and guidance for the assessment of conformity of compounds, products, and assemblies in accordance with the applicable part(s) of ISO 21003 intended to be included in the manufacturer's quality plan as part of the quality management system and for the establishment of certification procedures.
-In conjunction with the other parts of ISO 21003 (see Foreword), this document is applicable to multilayer piping systems intended to be used for hot and cold water installations within buildings for the conveyance of water, whether or not intended for human consumption (domestic systems) and for heating systems, under design pressures and temperatures appropriate to the class of application (see ISO 21003-1:2008, Table 1).</abstract>
-  <status>
-    <stage>Published</stage>
-  </status>
-  <copyright>
-    <from>2019</from>
-    <owner>
-      <organization>
-        <name>European Committee for Standardization</name>
-        <abbreviation>CEN</abbreviation>
-        <uri>https://cen.eu</uri>
-      </organization>
-    </owner>
-  </copyright>
-  <relation type="obsoletes">
-    <bibitem type="standard">
-      <formattedref format="text/plain" language="en" script="Latn">CEN ISO/TS 21003-7:2008/A1:2010</formattedref>
-      <uri type="src">https://standards.cen.eu/dyn/www/f?p=CENWEB:110:0::::FSP_PROJECT:34670&amp;cs=1739483DB0A85EDABBC435CE39F54C548</uri>
-    </bibitem>
-  </relation>
-  <relation type="obsoletes">
-    <bibitem type="standard">
-      <formattedref format="text/plain" language="en" script="Latn">CEN ISO/TS 21003-7:2008</formattedref>
-      <uri type="src">https://standards.cen.eu/dyn/www/f?p=CENWEB:110:0::::FSP_PROJECT:29120&amp;cs=157CFB37153811CB6097F253DF9B57B89</uri>
-    </bibitem>
-  </relation>
-  <relation type="cites">
-    <bibitem type="standard">
-      <formattedref format="text/plain" language="en" script="Latn">ISO 17456</formattedref>
-      <uri type="src">https://standards.cen.eu/dyn/www/f?p=204:111:0::::FSP_PROJECT_CROSSREF,FSP_PROJECT:ISO-SPACE-17456,68120&amp;cs=1FD4205F9B0E21546A862E6AEB321BD3D</uri>
-    </bibitem>
-  </relation>
-  <relation type="cites">
-    <bibitem type="standard">
-      <formattedref format="text/plain" language="en" script="Latn">ISO 21003-1</formattedref>
-      <uri type="src">https://standards.cen.eu/dyn/www/f?p=204:111:0::::FSP_PROJECT_CROSSREF,FSP_PROJECT:ISO-SPACE-21003-1,68120&amp;cs=1E3BAF63C2639CA9E5C4B5F6B7F300413</uri>
-    </bibitem>
-  </relation>
-  <relation type="cites">
-    <bibitem type="standard">
-      <formattedref format="text/plain" language="en" script="Latn">ISO 21003-2</formattedref>
-      <uri type="src">https://standards.cen.eu/dyn/www/f?p=204:111:0::::FSP_PROJECT_CROSSREF,FSP_PROJECT:ISO-SPACE-21003-2,68120&amp;cs=14788DF9FA188AC4B4ECBD949EB95F25C</uri>
-    </bibitem>
-  </relation>
-  <relation type="cites">
-    <bibitem type="standard">
-      <formattedref format="text/plain" language="en" script="Latn">ISO 21003-3</formattedref>
-      <uri type="src">https://standards.cen.eu/dyn/www/f?p=204:111:0::::FSP_PROJECT_CROSSREF,FSP_PROJECT:ISO-SPACE-21003-3,68120&amp;cs=1DF2256C557AAF0DDCF7D85765E85640B</uri>
-    </bibitem>
-  </relation>
-  <relation type="cites">
-    <bibitem type="standard">
-      <formattedref format="text/plain" language="en" script="Latn">ISO 21003-5</formattedref>
-      <uri type="src">https://standards.cen.eu/dyn/www/f?p=204:111:0::::FSP_PROJECT_CROSSREF,FSP_PROJECT:ISO-SPACE-21003-5,68120&amp;cs=196D7C9FE2A53D9185BE4E4A2DEE23636</uri>
-    </bibitem>
-  </relation>
-  <place>London</place>
-</bibitem>"
+item.to_xml
+=> "<bibitem id="CENISO/TS21003-7-2019" type="standard" schema-version="v1.2.1">
+      <fetched>2022-12-03</fetched>
+      <title type="title-main" format="text/plain" language="en" script="Latn">Multilayer piping systems for hot and cold water installations inside buildings</title>
+      ...
+    </bibitem>"
 ----
 
 With `bibdata: true` option XML output wrapped with `bibdata` element and `ext` element added.
 [source,ruby]
 ----
-puts item.to_xml(bibdata: true)
-"bibdata type="standard">
-  <fetched>2021-05-30</fetched>
-  <title type="title-main" format="text/plain" language="en" script="Latn">Multilayer piping systems for hot and cold water installations inside buildings</title>
-  ...
-  <ext>
-    <doctype>international-standard</doctype>
-    <editorialgroup>
-      <technical-committee number="155" type="TC">Plastics piping systems and ducting systems</technical-committee>
-    </editorialgroup>
-    <ics>
-      <code>23.040.20</code>
-      <text>Plastics pipes</text>
-    </ics>
-    <ics>
-      <code>91.140.60</code>
-      <text>Water supply systems</text>
-    </ics>
-    <structuredidentifier type="CEN">
-      <project-number part="7">21003</project-number>
-    </structuredidentifier>
-  </ext>
-</bibdata>"
+item.to_xml bibdata: true
+=> "<bibdata type="standard" schema-version="v1.2.1">
+      <fetched>2022-12-03</fetched>
+      <title type="title-main" format="text/plain" language="en" script="Latn">Multilayer piping systems for hot and cold water installations inside buildings</title>
+      ...
+      <ext schema-version="v1.0.1">
+        <doctype>international-standard</doctype>
+        ...
+      </ext>
+    </bibdata>"
 ----
 
 === Typed links
@@ -165,7 +81,7 @@ item.link
 === Get code, and year
 [source,ruby]
 ----
-elatonCen::CenBibliography.get "CEN ISO/TS 21003-7:2019"
+RelatonCen::CenBibliography.get "CEN ISO/TS 21003-7:2019"
 [relaton-cen] ("CEN ISO/TS 21003-7") fetching...
 [relaton-cen] ("CEN ISO/TS 21003-7") found CEN ISO/TS 21003-7:2019
 => #<RelatonIsoBib::IsoBibliographicItem:0x00007fadcd596c58
@@ -185,16 +101,16 @@ hash = YAML.load_file 'spec/fixtures/bibdata.yaml'
 => {"id"=>"CENISO/TS21003-7-2019",
 ...
 
-RelatonIsoBib::IsoBibliographicItem.from_hash hash
-=> #<RelatonIsoBib::IsoBibliographicItem:0x00007fb21485d450
+ RelatonCen::BibliographicItem.from_hash hash
+=> #<RelatonCen::BibliographicItem:0x00007f9d0118cb58
 ...
 ----
 
 === Create bibliographic item from XML
 [source,ruby]
 ----
-RelatonBsi::XMLParser.from_xml File.read("spec/fixtures/bibdata.xml", encoding: "UTF-8")
-=> #<RelatonBsi::BsiBibliographicItem:0x007feb14d50b68
+RelatonCen::XMLParser.from_xml File.read("spec/fixtures/bibdata.xml", encoding: "UTF-8")
+=> #<RelatonCen::BibliographicItem:0x00007f9cf12bc5b0
 ...
 ----
 

data/grammars/basicdoc.rng

@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <include href="biblio.rng">
-    <start>
-      <ref name="document"/>
-    </start>
-  </include>
   <define name="document">
     <element name="document">
       <optional>
@@ -527,7 +522,6 @@
       <value>tip</value>
       <value>important</value>
       <value>caution</value>
-      <value>statement</value>
     </choice>
   </define>
   <define name="figure">
@@ -688,6 +682,9 @@
   </define>
   <define name="underline">
     <element name="underline">
+      <optional>
+        <attribute name="style"/>
+      </optional>
       <zeroOrMore>
         <ref name="PureTextElement"/>
       </zeroOrMore>
@@ -1125,26 +1122,4 @@
       </zeroOrMore>
     </element>
   </define>
-  <define name="ext">
-    <element name="ext">
-      <ref name="BibDataExtensionType"/>
-    </element>
-  </define>
-  <define name="BibDataExtensionType">
-    <ref name="doctype"/>
-  </define>
-  <define name="doctype">
-    <element name="doctype">
-      <ref name="DocumentType"/>
-    </element>
-  </define>
-  <define name="DocumentType">
-    <value>document</value>
-  </define>
-  <define name="BibData">
-    <ref name="BibliographicItem"/>
-    <optional>
-      <ref name="ext"/>
-    </optional>
-  </define>
 </grammar>

data/grammars/biblio-standoc.rng

@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar xmlns="http://relaxng.org/ns/structure/1.0">
+  <!--
+    Add-ons to biblio.rnc for standoc model: defines the extension point BibDataExtensionType
+    of relaton
+    
+    Specialisations as for biblio.rnc. Extension point can be redefined completely for a flavour of standoc
+    (SDO); but other elements in Bibdata can only be extended (more specialised vocabularies for Bibdata)
+  -->
+  <include href="biblio.rng">
+    <define name="BibData">
+      <ref name="BibliographicItem"/>
+      <optional>
+        <ref name="ext"/>
+      </optional>
+    </define>
+  </include>
+  <define name="ext">
+    <element name="ext">
+      <ref name="BibDataExtensionType"/>
+    </element>
+  </define>
+  <define name="BibDataExtensionType">
+    <optional>
+      <attribute name="schema-version"/>
+    </optional>
+    <ref name="doctype"/>
+    <optional>
+      <ref name="docsubtype"/>
+    </optional>
+    <optional>
+      <ref name="editorialgroup"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="ics"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="structuredidentifier"/>
+    </zeroOrMore>
+  </define>
+  <define name="doctype">
+    <element name="doctype">
+      <optional>
+        <attribute name="abbreviation"/>
+      </optional>
+      <ref name="DocumentType"/>
+    </element>
+  </define>
+  <define name="DocumentType">
+    <text/>
+  </define>
+  <define name="docsubtype">
+    <element name="subdoctype">
+      <ref name="DocumentSubtype"/>
+    </element>
+  </define>
+  <define name="DocumentSubtype">
+    <text/>
+  </define>
+  <define name="editorialgroup">
+    <element name="editorialgroup">
+      <oneOrMore>
+        <ref name="technical-committee"/>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="technical-committee">
+    <element name="technical-committee">
+      <ref name="IsoWorkgroup"/>
+    </element>
+  </define>
+  <define name="IsoWorkgroup">
+    <optional>
+      <attribute name="number"/>
+    </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
+    <optional>
+      <attribute name="identifier"/>
+    </optional>
+    <optional>
+      <attribute name="prefix"/>
+    </optional>
+    <text/>
+  </define>
+  <define name="ics">
+    <element name="ics">
+      <element name="code">
+        <text/>
+      </element>
+      <optional>
+        <element name="text">
+          <text/>
+        </element>
+      </optional>
+    </element>
+  </define>
+  <define name="structuredidentifier">
+    <element name="structuredidentifier">
+      <optional>
+        <attribute name="type"/>
+      </optional>
+      <oneOrMore>
+        <element name="agency">
+          <text/>
+        </element>
+      </oneOrMore>
+      <optional>
+        <element name="class">
+          <text/>
+        </element>
+      </optional>
+      <element name="docnumber">
+        <text/>
+      </element>
+      <optional>
+        <element name="partnumber">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="edition">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="version">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="supplementtype">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="supplementnumber">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="amendment">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="corrigendum">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="language">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="year">
+          <text/>
+        </element>
+      </optional>
+    </element>
+  </define>
+</grammar>