relaton-bipm 1.8.2 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f50f16e84fc01b3abbf19cac52ba2ebb265e5bb9dee2d5bc3b9838cc9246842
-  data.tar.gz: 96358aff1452e3bcd2577b1f7e812c840b6a868348c7c4e813018761d07158b5
+  metadata.gz: 3bc3bc46660a7a7852fd963502f27eb135b9f65bb75a5d24d69e59243fc90ad2
+  data.tar.gz: 4311d9bf2198fe3204f1075a9d088ab9bc24c327c9e2d07dcf5abbe0b00b4059
 SHA512:
-  metadata.gz: 16d31cad3f3ebc75b1e0e0d36dded2b348c9c8e66f33ac06f512cb2dab120a98f5104b784d5269a8294fd222679861cc9dab71ec34be5ff94b859771bd5efc6b
-  data.tar.gz: 232e89f4a68d18ebcfaba7ecf52a17a7a06950e42e65fdc50cb95dcf29476176f82d62ad7e635939e2ba6f9ff3525f2ff263db20660f0876d02fcd46458a6913
+  metadata.gz: b6d914ecd5376914dda72e7f9aebb392c2685f0b29871531e434cf6402291383b72815497c74f263f6ba4e37fa88f46ddcb3d78bfc4ba7e1371c246ca6f333b7
+  data.tar.gz: 2c13012defdb97df5e6884b6f36807bdee455ad39d8feec34441115f2f4796a0a1e46e81101f8ca30c7c3fb7e1b58c15189523b28a1644cf26efedf038cb7731

data/.github/workflows/rake.yml

@@ -16,19 +16,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.7', '2.6', '2.5' ]
+        ruby: [ '3.0', '2.7', '2.6', '2.5' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
         experimental: [ false ]
-        include:
-          - ruby: '3.0'
-            os: 'ubuntu-latest'
-            experimental: true
-          - ruby: '3.0'
-            os: 'windows-latest'
-            experimental: true
-          - ruby: '3.0'
-            os: 'macos-latest'
-            experimental: true
     steps:
       - uses: actions/checkout@v2
         with:

data/.rubocop.yml

@@ -2,6 +2,8 @@
 # https://github.com/riboseinc/oss-guides
 # All project-specific additions and overrides should be specified in this file.
 
+require: rubocop-rails
+
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 AllCops:

data/README.adoc

@@ -46,11 +46,25 @@ item = RelatonBipm::BipmBibliography.get "BIPM si-brochure"
 ...
 
 # get BIPM Metrologia article
-RelatonBipm::BipmBibliography.get "BIPM Metrologia 29 6 373"
+bib = RelatonBipm::BipmBibliography.get "BIPM Metrologia 29 6 373"
 [relaton-bipm] ("BIPM Metrologia 29 6 373") fetching...
 [relaton-bipm] ("BIPM Metrologia 29 6 373") found Metrologia 29 6 373
 => #<RelatonBipm::BipmBibliographicItem:0x007f8857f94d40
 ...
+
+# get CGPM resolutions
+RelatonBipm::BipmBibliography.get "BIPM CGPM01 1"
+[relaton-bipm] ("BIPM CGPM01 1") fetching...
+[relaton-bipm] ("BIPM CGPM01 1") found CGPM01-1
+=> #<RelatonBipm::BipmBibliographicItem:0x00007f9e92817968
+...
+
+# get CIPM resolutions
+RelatonBipm::BipmBibliography.get "BIPM CIPM101 1"
+[relaton-bipm] ("BIPM CIPM101 1") fetching...
+[relaton-bipm] ("BIPM CIPM101 1") found CIPM101-1
+=> #<RelatonBipm::BipmBibliographicItem:0x00007f9e9293d658
+...
 ----
 
 === XML serialization
@@ -90,6 +104,7 @@ item.to_xml bibdata: true
       <fetched>2021-01-10</fetched>
       <title format="text/plain" language="en" script="Latn">The International System of Units (SI)</title>
       <title format="text/plain" language="fr" script="Latn">Le Système international d’unités (SI)</title>
+      <uri type="src">https://www.bipm.org/en/publications/si-brochure</uri>
       <docidentifier type="BIPM">si-brochure</docidentifier>
       <date type="updated">
         <on>2019-05-20</on>
@@ -112,6 +127,17 @@ item.to_xml bibdata: true
     </bibdata>"
 ----
 
+=== Typed links
+
+Each BIPM document has `src` type link and optional `doi` type link.
+
+[source,ruby]
+----
+bib.link
+=> [#<RelatonBib::TypedUri:0x00007fa6d6a51728 @content=#<Addressable::URI:0xc29c URI:https://iopscience.iop.org/article/10.1088/0026-1394/29/6/001>, @type="src">,
+ #<RelatonBib::TypedUri:0x00007fa6d6a29250 @content=#<Addressable::URI:0xc2b0 URI:https://doi.org/10.1088/0026-1394/29/6/001>, @type="doi">]
+----
+
 === Create bibliographic item from XML
 
 [source,ruby]

data/grammars/basicdoc.rng

@@ -173,9 +173,11 @@
           <data type="dateTime"/>
         </attribute>
       </optional>
-      <attribute name="from">
-        <data type="IDREF"/>
-      </attribute>
+      <optional>
+        <attribute name="from">
+          <data type="IDREF"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="to">
           <data type="IDREF"/>
@@ -624,6 +626,9 @@
         <choice>
           <ref name="PureTextElement"/>
           <ref name="stem"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -634,6 +639,9 @@
         <choice>
           <ref name="PureTextElement"/>
           <ref name="stem"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -641,7 +649,12 @@
   <define name="tt">
     <element name="tt">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
@@ -822,7 +835,9 @@
       <attribute name="alt"/>
     </optional>
     <ref name="CitationType"/>
-    <text/>
+    <oneOrMore>
+      <ref name="PureTextElement"/>
+    </oneOrMore>
   </define>
   <define name="hyperlink">
     <element name="link">
@@ -835,7 +850,9 @@
       <optional>
         <attribute name="alt"/>
       </optional>
-      <text/>
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="xref">
@@ -849,7 +866,9 @@
       <optional>
         <attribute name="alt"/>
       </optional>
-      <text/>
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="fn">

data/grammars/biblio.rng

@@ -209,9 +209,6 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="uri"/>
-      </zeroOrMore>
     </element>
   </define>
   <define name="fullname">
@@ -401,9 +398,9 @@
       <choice>
         <!-- iso191606 TODO -->
         <group>
-          <oneOrMore>
+          <zeroOrMore>
             <ref name="street"/>
-          </oneOrMore>
+          </zeroOrMore>
           <ref name="city"/>
           <optional>
             <ref name="state"/>
@@ -787,6 +784,7 @@
       <value>adapted</value>
       <value>vote-started</value>
       <value>vote-ended</value>
+      <value>announced</value>
     </choice>
   </define>
   <define name="bdate">
@@ -827,6 +825,11 @@
       <optional>
         <attribute name="scope"/>
       </optional>
+      <optional>
+        <attribute name="primary">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <text/>
     </element>
   </define>

data/grammars/bipm.rng

@@ -16,6 +16,13 @@
             <param name="pattern">\i\c*|\c+#\c+</param>
           </data>
         </attribute>
+        <optional>
+          <attribute name="to">
+            <data type="string">
+              <param name="pattern">\i\c*|\c+#\c+</param>
+            </data>
+          </attribute>
+        </optional>
         <optional>
           <attribute name="type">
             <ref name="ReferenceFormat"/>
@@ -93,14 +100,9 @@
       </optional>
       <group>
         <choice>
-          <group>
-            <zeroOrMore>
-              <ref name="BasicBlock"/>
-            </zeroOrMore>
-            <zeroOrMore>
-              <ref name="note"/>
-            </zeroOrMore>
-          </group>
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
           <ref name="amend"/>
         </choice>
         <zeroOrMore>
@@ -108,6 +110,7 @@
             <ref name="clause-subsection"/>
             <ref name="terms"/>
             <ref name="definitions"/>
+            <ref name="floating-title"/>
           </choice>
         </zeroOrMore>
       </group>
@@ -146,20 +149,16 @@
         <ref name="section-title"/>
       </optional>
       <group>
-        <group>
-          <zeroOrMore>
-            <ref name="BasicBlock"/>
-          </zeroOrMore>
-          <zeroOrMore>
-            <ref name="note"/>
-          </zeroOrMore>
-        </group>
+        <zeroOrMore>
+          <ref name="BasicBlock"/>
+        </zeroOrMore>
         <zeroOrMore>
           <choice>
             <ref name="annex-subsection"/>
             <ref name="terms"/>
             <ref name="definitions"/>
             <ref name="references"/>
+            <ref name="floating-title"/>
           </choice>
         </zeroOrMore>
       </group>
@@ -179,6 +178,14 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="tag"/>
+        </optional>
+        <optional>
+          <attribute name="multilingual-rendering">
+            <ref name="MultilingualRenderingType"/>
+          </attribute>
+        </optional>
         <attribute name="type">
           <choice>
             <value>roman</value>
@@ -245,6 +252,9 @@
       <optional>
         <ref name="doctype"/>
       </optional>
+      <optional>
+        <ref name="docsubtype"/>
+      </optional>
       <ref name="editorialgroup"/>
       <optional>
         <ref name="comment-period"/>
@@ -304,7 +314,7 @@
           <value>CCT</value>
           <value>CCTF</value>
           <value>CCU</value>
-          <value>CCL-CCTF</value>
+          <value>CCL-CCTF-WGFS</value>
           <value>JCGM</value>
           <value>JCRB</value>
           <value>JCTLM</value>