relaton-bipm 1.20.3 → 1.20.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d1539848f18eda46cb7357eb8861594434a26b7248878477b9430ae09aabcac
-  data.tar.gz: f06a0572b5a70a5fd1d4457d731fac35458372f728f14ec2794bcaf6d73ab6c7
+  metadata.gz: 4f22d6e95a7abfb3746767ce7563d0e92a562856d3e8ced8831a77fa05624349
+  data.tar.gz: 2c30572b6d1f260dc51c7fa280dd56a79565b8d30bfed8c4d60537a73bb95ebf
 SHA512:
-  metadata.gz: 2e42be1fbbc4f9971c688b83a9f3e9de80a4a529be73699c11efb9c095471072cd73f07aaf39b0f94964446e2dbd1a76d16f530cc72d6ee5f45c4ba53c083477
-  data.tar.gz: 9565d9d1069aee7a2029af710d60d39c8c0f0ddfd9b0b2f4bda900f7befb4c5b5580d8acafb1d45bd15776db922026451c7b32e5f42f47d4f73900e6fce4097e
+  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/id_parser.rb

@@ -91,7 +91,7 @@ module RelatonBipm
     #
     def parse(id)
       # str = StringScanner.new id
-      match = parse_outcome(id) || parse_brochure(id) || parse_brochure_other(id) || parse_metrologia(id) || parse_jcgm(id)
+      match = parse_outcome(id) || parse_brochure(id) || parse_metrologia(id) || parse_jcgm(id)
       @id = match.named_captures.compact.transform_keys(&:to_sym)
       self
     rescue StandardError => e
@@ -127,9 +127,13 @@ 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
 

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.3".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.3
+  version: 1.20.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-19 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