relaton-bipm 1.16.5 → 1.16.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1d91960ac9f8357a2ced7209b3dcb7c3ff4637b899639c09a622c2715fe7d36
-  data.tar.gz: 56536641e820e1d14336f8d40efce9a1be829c9356d362761740fc09a39d5b6f
+  metadata.gz: fed200c28077ec8e08f755b1185ec918797d15bf6937b884f207efd95837e230
+  data.tar.gz: e252b80a27cf21e0fd9c66af2bec464eea8cc578b6da66b4c51316b707aa4b39
 SHA512:
-  metadata.gz: 57a28e5cc70fd280b02caa1d267fa79d8aff4e7b120847bae458e283977e631190d622b727c1830fa442c0507a46227548cee50666bf0010fe50fa242b62edc6
-  data.tar.gz: cf74e9ff7b2ad3d2db08b17f8c4139b42d43cfe8bba98d7bd81bf154ea51341ecd821e596780b9415e839f47b664adf6d085b8e678fa3497f773211beb64d015
+  metadata.gz: 7d73f4d65055a47285532d0bcc0f812e58fa75a0790fc92a1e396d40b444732a84192e9f81467246552c61d0ae780a6449333186417f2a0154c756ae555e5097
+  data.tar.gz: 7415e3f9f5bb4cacaa3e28f79b25a08a22814a6de7c52e5effd21f53632c59bcce41a6d4ef52a84169ad996efdd8e82687c7404f32cd22b199ee50a6cfbd77f8

data/lib/relaton_bipm/bipm_bibliography.rb

@@ -62,7 +62,7 @@ module RelatonBipm
 
       def index
         Relaton::Index.find_or_create(
-          :bipm, url: "#{GH_ENDPOINT}index2.zip", file: INDEX_FILE, id_keys: %i[group type number year]
+          :bipm, url: "#{GH_ENDPOINT}index2.zip", file: INDEX_FILE, id_keys: %i[group type number year corr]
         )
       end
 

data/lib/relaton_bipm/id_parser.rb

@@ -14,7 +14,7 @@ module RelatonBipm
       rule(:lang) { comma >> space? >> match["A-Z"].repeat(1, 2).as(:lang) }
       rule(:lang?) { lang.maybe }
 
-      rule(:numdash) { match["0-9-"].repeat(1).as(:number) }
+      rule(:numdash) { match["A-Z0-9-"].repeat(1).as(:number) }
       rule(:number) { numdash >> space? }
       rule(:number?) { number.maybe }
       rule(:num_suff) { numdash >> match["a-z"].repeat(1, 2) >> space }
@@ -47,7 +47,11 @@ module RelatonBipm
 
       rule(:metrologia) { str("Metrologia").as(:group) >> (space >> match["a-zA-Z0-9\s"].repeat(1).as(:number)).maybe }
 
-      rule(:result) { outcome | brochure | metrologia }
+      rule(:corr) { space >> str("Corrigendum").as(:corr) }
+      rule(:corr?) { corr.maybe }
+      rule(:jcgm) { group >> space >> numdash >> (str(":") >> year).maybe >> corr? }
+
+      rule(:result) { outcome | brochure | metrologia | jcgm }
 
       root :result
     end
@@ -93,7 +97,7 @@ module RelatonBipm
       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.delete(:year) unless other_hash[:year]
+      # hash.delete(:year) unless other_hash[:year]
       other_hash.delete(:year) unless hash[:year]
       hash.delete(:lang) unless other_hash[:lang]
       other_hash.delete(:lang) unless hash[:lang]
@@ -124,6 +128,7 @@ module RelatonBipm
       norm_num = normalized_number(src)
       hash[:number] = norm_num unless norm_num.nil? || norm_num.empty?
       hash[:year] = src[:year].to_s if src[:year]
+      hash[:corr] = true if src[:corr]
       hash[:lang] = src[:lang].to_s if src[:lang]
       hash
     end

data/lib/relaton_bipm/version.rb

@@ -1,3 +1,3 @@
 module RelatonBipm
-  VERSION = "1.16.5".freeze
+  VERSION = "1.16.6".freeze
 end

metadata

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