relaton-bipm 1.20.2 → 1.20.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea992197c7e29c94560a057b995ac93721cc8e713e09a4d6191294f512f46aa0
-  data.tar.gz: d982f800f01ec696acbc34f4aecc2ea8d28ea7724b69f1901629d3b4623fe10a
+  metadata.gz: 4f22d6e95a7abfb3746767ce7563d0e92a562856d3e8ced8831a77fa05624349
+  data.tar.gz: 2c30572b6d1f260dc51c7fa280dd56a79565b8d30bfed8c4d60537a73bb95ebf
 SHA512:
-  metadata.gz: 63a8182c1b54979c2bbe436eaca66e460e7846d4e5b47b2a9355ec8d031e1cf51e929123f02638cc450ef3533305a07cb108226d969945d2ce72fab27417bcf8
-  data.tar.gz: 93077b3f86f9b906bb5dbc83612e3b64bd92de42f4f66c414fd6bf0facb962d080f8a03f201062d75a197034d8241e5ce4c4fa1488d35861225a74e863efb561
+  metadata.gz: 15f75a91447405b02707631ca6a3e744d62ef623767da504f08f0a33a0f770bb0731cdc03cde57769871bb4ab2e1c662ad79dcfa4c6a21e6f9a883b1cc05bd87
+  data.tar.gz: efd882bc871d9fb20cb1305bc0ff1a9e6f90a57ceb4cb1a419e0358c54d3c498b54cacf7821df6baf82948a2544483cdbb17fdf7114480252f27b5b7e650578b

data/lib/relaton_bipm/bipm_si_brochure_parser.rb

@@ -59,20 +59,34 @@ module RelatonBipm
     #
     # @return [void]
     #
-    def fix_si_brochure_id(hash) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+    def fix_si_brochure_id(hash)
       # isbn = hash["docid"].detect { |id| id["type"] == "ISBN" }
       # num = isbn && isbn["id"] == "978-92-822-2272-0" ?  "SI Brochure" : "SI Brochure, Appendix 4"
 
+      update_id hash
+
+      prid = primary_id hash
+      if hash["docnumber"]
+        hash["docnumber"].sub!(/^Brochure(?:\sConcise|\sFAQ)?$/i, prid.sub(/^BIPM\s/, ""))
+      else
+        hash["docnumber"] = prid.sub(/^BIPM\s/, "")
+      end
+      hash["id"] = prid.gsub(/[,\s]/, "")
+    end
+
+    def update_id(hash)
       hash["docid"].each do |id|
         next unless id["type"] == "BIPM" && id["id"].match?(/BIPM Brochure/i)
 
         id["primary"] = true
         id["id"].sub!(/(?<=^BIPM\s)(Brochure)/i, "SI \\1")
       end
+    end
 
-      num = hash["docid"].detect { |id| id["primary"] && id["language"] == "en" }["id"]
-      hash["docnumber"].sub!(/^Brochure$/i, num.sub(/^BIPM\s/, ""))
-      hash["id"] = num.gsub(/[,\s]/, "")
+    def primary_id(hash)
+      hash["docid"].detect do |id|
+        id["primary"] && (id["language"] == "en" || id["language"].nil?)
+      end["id"]
     end
 
     #

data/lib/relaton_bipm/data_outcomes_parser.rb

@@ -171,7 +171,7 @@ module RelatonBipm
           type: "proceedings", title: [],
           doctype: DocumentType.new(type: r["type"]), place: [RelatonBib::Place.new(city: "Paris")]
         }
-        fr_r = args[:fr]["resolutions"].fetch(i, nil)
+        fr_r = args.dig(:fr, "resolutions", i) # @TODO: create a GH issue when fr is missing
         hash[:title] = resolution_title r, fr_r
         hash[:link] = resolution_link r, fr_r, args[:src]
         date = r["dates"].first.to_s
@@ -345,7 +345,7 @@ module RelatonBipm
     def cipm_org
       names = [
         { content: "International Committee for Weights and Measures", language: "en" },
-        { content: "Comité International des Poids et Mesures", language: "fr" },
+        { content: "Comité international des poids et mesures", language: "fr" },
       ]
       organization names, "CIPM"
     end

data/lib/relaton_bipm/id_parser.rb

@@ -127,12 +127,20 @@ module RelatonBipm
     def num_and_year; "(?:(?:#{number}\\s)?#{year_lang}|#{year}-#{number}|#{number})"; end
 
     def parse_brochure(id)
+      parse_si_brochure(id) || parse_brochure_other(id)
+    end
+
+    def parse_si_brochure(id)
       %r{^
         (?<group>SI)\s(?<type>Brochure)
-        (?:,?\s(?:(?:Part|Partie)\s(?<part>\d+)|(?:Appendix|Annexe)\s(?<append>\d+)))?
+        (?:,?\s(?:(?:Part|Partie)\s(?<part>\d+)|(?:Appendix|Annexe)\s(?<append>\d+)|(?<number>Concise|FAQ)))?
       $}x.match(id)
     end
 
+    def parse_brochure_other(id)
+      %r{^(?<group>CCEM|CCL|CCM|SI|Rapport)[-\s](?<type>GD-RSI|GD-MeP|MEP|BIPM)[-\s](?<number>\w+|\d{4}\/\d{2})$}.match(id)
+    end
+
     def parse_metrologia(id)
       %r{^(?<group>Metrologia)(?:\s(?<number>[a-zA-Z0-9\s]+))?$}.match(id)
     end

data/lib/relaton_bipm/rawdata_bipm_metrologia/article_parser.rb

@@ -330,7 +330,7 @@ module RelatonBipm
       # @return [Array<RelatonBib::Extent>] array of extents
       #
       def parse_extent
-        @meta.xpath("./volume|./issue|./fpage").map do |e|
+        locs = @meta.xpath("./volume|./issue|./fpage").map do |e|
           if e.name == "fpage"
             type = "page"
             to = @meta.at("./lpage")&.text
@@ -339,6 +339,7 @@ module RelatonBipm
           end
           RelatonBib::Locality.new type, e.text, to
         end
+        [RelatonBib::Extent.new(locs)]
         # %w[volume issue page].map.with_index do |t, i|
         #   RelatonBib::Locality.new t, volume_issue_page[i]
         # end

data/lib/relaton_bipm/version.rb

@@ -1,3 +1,3 @@
 module RelatonBipm
-  VERSION = "1.20.2".freeze
+  VERSION = "1.20.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bipm
 version: !ruby/object:Gem::Version
-  version: 1.20.2
+  version: 1.20.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-17 00:00:00.000000000 Z
+date: 2025-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: 'RelatonBipm: retrieve BIPM Standards for bibliographic use using the BibliographicItem