relaton-bipm 1.16.4 → 1.16.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eca93d6c95f7d1da1f1b3609fa4d782a97fed79a5793b2d695fa342ec2cdfacf
-  data.tar.gz: 5be9f8e7f259daa7f4f2c8d06f7c87e8d2fe4e1e41bb29faa413c462bc260d71
+  metadata.gz: fed200c28077ec8e08f755b1185ec918797d15bf6937b884f207efd95837e230
+  data.tar.gz: e252b80a27cf21e0fd9c66af2bec464eea8cc578b6da66b4c51316b707aa4b39
 SHA512:
-  metadata.gz: d3903d6d1632947ece2712e2fbdfb4d690c20ae0840b225487e8e751b8d943560e58c5a3d21b971b2cdc1ce81336a70a3d278fda5a794daa08fa0284f1f820a0
-  data.tar.gz: 04d3e61c0d11fe9578c1a8cc42979dd53e4567b035b33350c1fe58ed2f4a535f4f400e85d5c6cfaabdcda482b63663b1c2d6471e7bb41c58739f616fd00e3e81
+  metadata.gz: 7d73f4d65055a47285532d0bcc0f812e58fa75a0790fc92a1e396d40b444732a84192e9f81467246552c61d0ae780a6449333186417f2a0154c756ae555e5097
+  data.tar.gz: 7415e3f9f5bb4cacaa3e28f79b25a08a22814a6de7c52e5effd21f53632c59bcce41a6d4ef52a84169ad996efdd8e82687c7404f32cd22b199ee50a6cfbd77f8

data/README.adoc

@@ -64,11 +64,11 @@ Allowed document names are:
 
 `BIPM Metrologia {JOURNAL} {VOLUME} {ISSUE}`
 
-- `{JOURNAL}` - journal number, required
+- `{JOURNAL}` - journal number, optional
 - `{VOLUME}` - volume number, optional
 - `{ISSUE}` - issue number, optional
 
-==== Reference structures for CCTF (CCDS), CGPM, CIPM documents
+==== Reference structures for Outcomes documents
 
 ===== Basic pattern
 
@@ -83,7 +83,7 @@ Short:
 {group name} {type-abbrev} {number} ({year}, {lang})
 ----
 
-- `group name` - a name of the group, required. A full list of group names is available https://github.com/metanorma/bipm-editor-guides/blob/main/sources/bipm-outcomes-en.adoc#appendix-a-bipm-groups-and-codes[here].
+- `group name` - a name of the group, required. A full list of group names is available https://github.com/metanorma/bipm-editor-guides/blob/main/sources/bipm-references-en.adoc#appendix-a-bipm-groups-and-codes[here].
 - `type` - a type of document, required. A list of types is: Resolution (Résolution), Recommendation (Recommandation), Decision (Décision), Meeting (Réunion), Declaration (Déclaration).
 - `type-abbrev` - an abbreviation of the type, required. A list of abbreviations: RES (Resolution), REC (Recommendation), DECN (Decision).
 - `number` - a number of the document, optional. Can be with part, e.g. `1-2`.

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/processor.rb

@@ -7,7 +7,7 @@ module RelatonBipm
     def initialize
       @short = :relaton_bipm
       @prefix = "BIPM"
-      @defaultprefix = %r{^(?:BIPM|CCTF|CCDS|CGPM|CIPM|JCRB)(?!\w)}
+      @defaultprefix = %r{^(?:BIPM|CCTF|CCDS|CGPM|CIPM|JCRB|JCGM)(?!\w)}
       @idtype = "BIPM"
       @datasets = %w[bipm-data-outcomes bipm-si-brochure rawdata-bipm-metrologia]
     end

data/lib/relaton_bipm/version.rb

@@ -1,3 +1,3 @@
 module RelatonBipm
-  VERSION = "1.16.4".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.4
+  version: 1.16.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-23 00:00:00.000000000 Z
+date: 2023-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday