relaton-bipm 1.17.0 → 1.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d6ca7c2babd9a223b0ed3493818df34cee58241d4589edb19c640d28d2d473d
-  data.tar.gz: 42a2f2b7c16a9e06be43c0ddcfea027220a9bbcd4d9fe7aeed67b1fc579135c2
+  metadata.gz: 4b1fb15e763da98895e7053e9fc0e9c8d171e479e4b89e6a0353dd1399955a0d
+  data.tar.gz: ac9db3bb0fc7bccebf5eb8e11cc392b98a8f16514e07aa5436b3817e4b54253d
 SHA512:
-  metadata.gz: 4375e47c892a72b1f9c7a246d303fc2deb3334b42ca505121133246bdd59584338e12d4c8a6afcd791787267cd1c4574a145f72ede538cffcf87dab20b1d8d1b
-  data.tar.gz: b384da3f7d91958f0c1c8c8f4ef41e1f74cd2faa2a4e631684c93fdf2d9af8dd180cde2213d4a7e7a37bd99fce66c6f5e4a06e7e2fb30b2b4d6e33af8bcaf1c2
+  metadata.gz: d2b145a2a5facc0782ad9600c7240357e80367f191205fe5e2e40a0e2b1c36019cb638d77130b17183cca67b2f35ab1868a30aa097913dbcc1c83e2598cdf127
+  data.tar.gz: 2dd15163fcfb619fa3c5b63705cdce127d13d17799e120d5a4e506747042d52133929c92e8f2a5e40012bb8a2a052928ca2f51021b6d37a19adc28c3698e7d80

data/grammars/basicdoc.rng

@@ -914,44 +914,47 @@
   -->
   <define name="image">
     <element name="image">
-      <attribute name="id">
-        <data type="ID"/>
+      <ref name="Image"/>
+    </element>
+  </define>
+  <define name="Image">
+    <attribute name="id">
+      <data type="ID"/>
+    </attribute>
+    <attribute name="src">
+      <data type="anyURI"/>
+    </attribute>
+    <attribute name="mimetype"/>
+    <optional>
+      <attribute name="filename"/>
+    </optional>
+    <optional>
+      <attribute name="width">
+        <choice>
+          <data type="int"/>
+          <value>auto</value>
+        </choice>
       </attribute>
-      <attribute name="src">
+    </optional>
+    <optional>
+      <attribute name="height">
+        <choice>
+          <data type="int"/>
+          <value>auto</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="alt"/>
+    </optional>
+    <optional>
+      <attribute name="title"/>
+    </optional>
+    <optional>
+      <attribute name="longdesc">
         <data type="anyURI"/>
       </attribute>
-      <attribute name="mimetype"/>
-      <optional>
-        <attribute name="filename"/>
-      </optional>
-      <optional>
-        <attribute name="width">
-          <choice>
-            <data type="int"/>
-            <value>auto</value>
-          </choice>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="height">
-          <choice>
-            <data type="int"/>
-            <value>auto</value>
-          </choice>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="alt"/>
-      </optional>
-      <optional>
-        <attribute name="title"/>
-      </optional>
-      <optional>
-        <attribute name="longdesc">
-          <data type="anyURI"/>
-        </attribute>
-      </optional>
-    </element>
+    </optional>
   </define>
   <define name="video">
     <element name="video">

data/grammars/biblio.rng

@@ -348,6 +348,9 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
+      <optional>
+        <ref name="logo"/>
+      </optional>
     </element>
   </define>
   <define name="orgname">
@@ -366,6 +369,21 @@
       </choice>
     </element>
   </define>
+  <define name="logo">
+    <element name="logo">
+      <ref name="image"/>
+    </element>
+  </define>
+  <define name="depiction">
+    <element name="depiction">
+      <optional>
+        <attribute name="scope"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="image"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="NameWithVariants">
     <element name="primary">
       <ref name="LocalizedString"/>
@@ -752,6 +770,9 @@
     <optional>
       <ref name="validity"/>
     </optional>
+    <optional>
+      <ref name="depiction"/>
+    </optional>
   </define>
   <define name="ReducedBibliographicItem">
     <optional>

data/lib/relaton_bipm/bipm_bibliography.rb

@@ -50,7 +50,8 @@ module RelatonBipm
         rows = index.search { |r| ref_id == r[:id] }
         return unless rows.any?
 
-        url = "#{GH_ENDPOINT}#{rows.first[:file]}"
+        row = rows.sort_by { |r| r[:id][:year] }.last
+        url = "#{GH_ENDPOINT}#{row[:file]}"
         resp = Mechanize.new.get url
         return unless resp.code == "200"
 

data/lib/relaton_bipm/id_parser.rb

@@ -94,9 +94,9 @@ module RelatonBipm
     #
     def ==(other) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/AbcSize
       other_hash = other.is_a?(Id) ? other.to_hash : normalize_hash(other)
-      hash = to_hash
-      hash.delete(:number) if other_hash[:number].nil? && hash[:number] == "1" and hash[:year]
-      other_hash.delete(:number) if hash[:number].nil? && other_hash[:number] == "1"
+      hash = to_hash.dup
+      hash.delete(:number) if other_hash[:number].nil? && hash[:number] == "1" && hash[:year]
+      other_hash.delete(:number) if hash[:number].nil? && other_hash[:number] == "1" && other_hash[:year]
       # hash.delete(:year) unless other_hash[:year]
       other_hash.delete(:year) unless hash[:year]
       hash.delete(:lang) unless other_hash[:lang]

data/lib/relaton_bipm/version.rb

@@ -1,3 +1,3 @@
 module RelatonBipm
-  VERSION = "1.17.0".freeze
+  VERSION = "1.17.1".freeze
 end

data/lib/relaton_bipm.rb

@@ -28,7 +28,7 @@ require "relaton_bipm/rawdata_bipm_metrologia/article_parser"
 module RelatonBipm
   class Error < StandardError; end
 
-  # Returns hash of XML reammar
+  # Returns hash of gems versions used to generate the data model.
   # @return [String]
   def grammar_hash
     # gem_path = File.expand_path "..", __dir__

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bipm
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.17.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-27 00:00:00.000000000 Z
+date: 2023-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday