relaton-bipm 1.19.4 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43be99f1f787252271ae3b9736d74ca0976f03c74b14b705680941c819efda7e
-  data.tar.gz: c3200a477a9066e31a3d90153a031a1e71dc5433109547d17ada0eec4e70dbb8
+  metadata.gz: 98f4b8a04eb9738b1302ff84f91c11f5e604adfdefc2fdfac999279f4d62bf0d
+  data.tar.gz: 4e6dad8f65ca0472b24d178474b69a78fe20b3d784adbc1512d4c79aad576de0
 SHA512:
-  metadata.gz: db81f3968f5d282a2837f55ebfa0b01fd020900ca32c30046a840b193619308cbae6488482666e472dc232b060f37beb51c225b15afc6a9cd2516ec2a1ecb790
-  data.tar.gz: 2350797aafdbfa8881e3fb33fc3e526ae89df1a1cabf8e7686cdfcdf69240a111b3f94dfb5571b7b237b6b15e86ba7645fab49a76cc149ff64f225ed5d31dfd8
+  metadata.gz: d07764ecb8ffba9c394eb01fb17ec617c1209038390cd37e6035a897616e1f717b69ced0830da7d6b721733eeeb8d3ae503bb65a7efc9228142dd90852f1f665
+  data.tar.gz: a97d282c516026bd083a7ec534a0d1357e8eb4ab09f01495aff28e6be8fbabf78b071c422aa572690f12d5700d287ebb5cc2e34a23c7a1c88f041813834b7571

data/lib/relaton_bipm/acronyms.yaml

@@ -54,6 +54,4 @@ JCRB:
 JCTLM:
   en: Joint Committee for Traceability in Laboratory Medicine
 INetQI:
-  en: International Network on Quality Infrastructure
-CCL-CCTF-WGFS:
-  en: CCL-CCTF Frequency Standards Working Group
+  en: International Network on Quality Infrastructure

data/lib/relaton_bipm/bipm_bibliographic_item.rb

@@ -86,12 +86,16 @@ module RelatonBipm
     #
     def to_hash(embedded: false)
       hash = super
-      hash["comment_period"] = comment_period.to_hash if comment_period
-      hash["si_aspect"] = si_aspect if si_aspect
-      hash["meeting_note"] = meeting_note if meeting_note
+      hash["ext"]["comment_period"] = comment_period.to_hash if comment_period
+      hash["ext"]["si_aspect"] = si_aspect if si_aspect
+      hash["ext"]["meeting_note"] = meeting_note if meeting_note
       hash
     end
 
+    def has_ext?
+      super || comment_period || si_aspect || meeting_note
+    end
+
     # @param prefix [String]
     # @return [String]
     def to_asciibib(prefix = "")

data/lib/relaton_bipm/data_outcomes_parser.rb

@@ -88,7 +88,8 @@ module RelatonBipm
       if @data_fetcher.files.include?(path) && part
         add_part hash, part
         item = RelatonBipm::BipmBibliographicItem.new(**hash)
-        has_part_item = parse_file path
+        yaml = RelatonBib.parse_yaml(File.read(path, encoding: "UTF-8"), [Date])
+        has_part_item = RelatonBipm::BipmBibliographicItem.from_hash(yaml)
         has_part_item.relation << RelatonBib::DocumentRelation.new(type: "partOf", bibitem: item)
         @data_fetcher.write_file path, has_part_item, warn_duplicate: false
         path = File.join dir, "#{num}-#{part}.#{@data_fetcher.ext}"
@@ -110,17 +111,6 @@ module RelatonBipm
       fetch_resolution body: body, en: en, fr: fr, dir: dir, src: src, num: num
     end
 
-    def parse_file(path)
-        case @data_fetcher.format
-        when "yaml"
-          yaml = RelatonBib.parse_yaml(File.read(path, encoding: "UTF-8"), [Date])
-          RelatonBipm::BipmBibliographicItem.from_hash(yaml)
-        when "xml"
-          xml = File.read(path, encoding: "UTF-8")
-          RelatonBipm::XMLParser.from_xml xml
-        end
-    end
-
     #
     # Read English and French files
     #
@@ -358,12 +348,8 @@ module RelatonBipm
     #
     # @return [Hash] title
     #
-    def create_title(content, language, format = "text/plain")
-      if language == "fr"
-        content.sub!(/(\d+)(e)/, '\1<sup>\2</sup>')
-        format = "text/html" if content.match?(/<sup>/)
-      end
-      { content: content, language: language, script: "Latn", format: format }
+    def create_title(content, language)
+      { content: content, language: language, script: "Latn" }
     end
 
     #
@@ -555,12 +541,11 @@ module RelatonBipm
     end
 
     def create_meeting_docids(en_id)
-      fr_id = en_id.sub(/(\d+)(?:st|nd|rd|th)/, '\1e').sub("Meeting", "réunion")
-      fr_id_sup = fr_id.sub(/(\d+)(e)/, '\1<sup>\2</sup>')
+      fr_id = en_id.sub(/(\d+)(?:st|nd|rd|th)/, '\1e').sub("Meeting", "Réunion")
       [
         make_docid(id: en_id, type: "BIPM", primary: true, language: "en", script: "Latn"),
-        make_docid(id: fr_id_sup, type: "BIPM", primary: true, language: "fr", script: "Latn"),
-        make_docid(id: "#{en_id} / #{fr_id_sup}", type: "BIPM", primary: true),
+        make_docid(id: fr_id, type: "BIPM", primary: true, language: "fr", script: "Latn"),
+        make_docid(id: "#{en_id} / #{fr_id}", type: "BIPM", primary: true),
       ]
     end
 

data/lib/relaton_bipm/hash_converter.rb

@@ -17,6 +17,7 @@ module RelatonBipm
 
       # project_group_hash_to_bib ret
       commentperiod_hash_to_bib ret
+      ret[:si_aspect] = args["ext"]["si_aspect"] if args.dig("ext", "si_aspect")
       ret
     end
 
@@ -42,7 +43,10 @@ module RelatonBipm
 
     # @param ret [Hash]
     def commentperiod_hash_to_bib(ret)
-      ret[:comment_period] &&= CommentPeriond.new(**ret[:comment_period])
+      compr = ret.dig(:ext, :comment_period) || ret[:comment_period] # @TODO: remove ret[:comment_period] after all data is updated
+      return unless compr
+
+      ret[:comment_period] &&= CommentPeriond.new(**compr)
     end
 
     # @param ret [Hash]
@@ -69,16 +73,17 @@ module RelatonBipm
 
     # @param ret [Hash]
     def editorialgroup_hash_to_bib(ret) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
-      return unless ret[:editorialgroup]
+      ed = ret.dig(:ext, :editorialgroup) || ret[:editorialgroup] # @TODO: remove ret[:editorialgroup] after all data is updated
+      return unless ed
 
-      cmt = ret[:editorialgroup][:committee].map do |c|
+      cmt = ed[:committee].map do |c|
         if (vars = committee_variants c).any?
           Committee.new acronym: c[:acronym], content: vars
         else
           Committee.new(**c)
         end
       end
-      wg = RelatonBib.array(ret[:editorialgroup][:workgroup]).map do |w|
+      wg = RelatonBib.array(ed[:workgroup]).map do |w|
         w.is_a?(Hash) ? WorkGroup.new(**w) : WorkGroup.new(content: w)
       end
       ret[:editorialgroup] = EditorialGroup.new committee: cmt, workgroup: wg
@@ -97,9 +102,10 @@ module RelatonBipm
 
     # @param ret [Hash]
     def structuredidentifier_hash_to_bib(ret)
-      ret[:structuredidentifier] &&= StructuredIdentifier.new(
-        **ret[:structuredidentifier],
-      )
+      struct_id = ret.dig(:ext, :structuredidentifier) || ret[:structuredidentifier] # @TODO: remove ret[:structuredidentifier] after all data is updated
+      return unless struct_id
+
+      ret[:structuredidentifier] = StructuredIdentifier.new(**struct_id)
     end
 
     def create_doctype(**args)

data/lib/relaton_bipm/version.rb

@@ -1,3 +1,3 @@
 module RelatonBipm
-  VERSION = "1.19.4".freeze
+  VERSION = "1.20.0".freeze
 end

data/relaton_bipm.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.add_dependency "faraday", "~> 2.7.0"
   spec.add_dependency "mechanize", "~> 2.10"
   spec.add_dependency "parslet", "~> 2.0.0"
-  spec.add_dependency "relaton-bib", "~> 1.19.0"
+  spec.add_dependency "relaton-bib", "~> 1.20.0"
   spec.add_dependency "relaton-index", "~> 0.2.2"
   spec.add_dependency "rubyzip", "~> 2.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bipm
 version: !ruby/object:Gem::Version
-  version: 1.19.4
+  version: 1.20.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-17 00:00:00.000000000 Z
+date: 2024-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.20.0
 - !ruby/object:Gem::Dependency
   name: relaton-index
   requirement: !ruby/object:Gem::Requirement
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.19
+rubygems_version: 3.3.27
 signing_key:
 specification_version: 4
 summary: 'RelatonBipm: retrieve BIPM Standards for bibliographic use using the BibliographicItem