relaton-bipm 1.19.0 → 1.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f192fd171fc919d9b30fabc3ba8f0e17ecc1a3c58e0ade979f42847c4266ed06
-  data.tar.gz: bcf449487cef0842578309f4c00305ac25dd0da5154748c662c2499a1e04cc21
+  metadata.gz: d26cb426c0ebdcd6e4544117b76fabc440ce698ae86511d2fa13022fedc0fa33
+  data.tar.gz: b0dae1c393906430b924171c4bc9dc0ddc723108372fd7ac351092845153cb6b
 SHA512:
-  metadata.gz: 0da90de53422e0c080b29fb73cd5472a36018beeece575afe413eac28a698497b7be6d7a3ba352684d7dda6467136be08a3f6bfe0ef99a992991303a54257cc5
-  data.tar.gz: 866df7ec30e56762cc588bb710450b2dcf58ca2b8f066f9473410957f340034856e8426d7705223fc44357c4142d54fca88525554ca3fa649363cdde80929978
+  metadata.gz: bfcf6fc883da15803965d74ef0faee65f5aabc637b382e55586d63ace8647f988862748a88269fe3bc33c27308c41a2801c5d5bed7c408e736c451e1b7ba1f03
+  data.tar.gz: 6a1b674e7285565be0fd400f4b27fa9066483fb2500bea43bde9aec6f8c95aa483602d74946b1acb0a669203467a8739bd8e4e5b11eb2ef01958203058651780

data/lib/relaton_bipm/bipm_bibliography.rb

@@ -2,7 +2,7 @@ require "mechanize"
 
 module RelatonBipm
   class BipmBibliography
-    GH_ENDPOINT = "https://raw.githubusercontent.com/relaton/relaton-data-bipm/master/".freeze
+    GH_ENDPOINT = "https://raw.githubusercontent.com/relaton/relaton-data-bipm/main/".freeze
     INDEX_FILE = "index2.yaml".freeze
 
     class << self

data/lib/relaton_bipm/committee.rb

@@ -1,27 +1,31 @@
 module RelatonBipm
-  class Committee
+  class Committee < RelatonBib::LocalizedString
+    ACRONYMS = YAML.load_file File.join(__dir__, "acronyms.yaml")
+
     # @return [String]
     attr_reader :acronym
 
     # @return [RelatonBib::LocalizedString]
     attr_reader :content
 
-    # @param acronym [String]
-    # @param content [RelatonBib::LocalisedString, String, nil]
-    def initialize(acronym:, content: nil)
-      acronyms = YAML.load_file File.join(__dir__, "acronyms.yaml")
-      unless acronyms[acronym]
+    # @param [String] acronym
+    # @param [Hash] args
+    # @option args [RelatonBib::LocalisedString, String, nil] :content
+    # @option args [String, nil] :language
+    # @option args [String, nil] :script
+    def initialize(acronym:, **args)
+      unless ACRONYMS[acronym]
         Util.warn "Invalid acronym: `#{acronym}`. Allowed " \
-                  "values: `#{acronyms.map { |k, _v| k }.join '`, `'}`"
+                  "values: `#{ACRONYMS.map { |k, _v| k }.join '`, `'}`"
       end
 
       @acronym = acronym
-      @content = localized_content content, acronyms[acronym]
+      super(*localized_args(acronym, **args))
     end
 
     # @param builder [Nokogiri::XML::Builder]
     def to_xml(builder)
-      builder.committee(acronym: acronym) { |b| content.to_xml b }
+      builder.committee(acronym: acronym) { |b| super b }
     end
 
     # @param prefix [String]
@@ -32,13 +36,13 @@ module RelatonBipm
       pref += "committee"
       out = count > 1 ? "#{pref}::\n" : ""
       out += "#{pref}.acronym:: #{acronym}\n"
-      out + content.to_asciibib(pref)
+      out + super(pref)
     end
 
     # @return [Hash]
     def to_hash
       hash = { "acronym" => acronym }
-      cnt = content.to_hash
+      cnt = super
       case cnt
       when Array then hash["variants"] = cnt
       when Hash then hash.merge! cnt
@@ -49,12 +53,14 @@ module RelatonBipm
 
     private
 
-    def localized_content(cnt, acr)
-      if cnt.is_a? String
-        RelatonBib::LocalizedString.new cnt
-      elsif (cnt.nil? || cnt.empty?) && acr && acr["en"]
-        RelatonBib::LocalizedString.new(acr["en"], "en", "Latn")
-      else cnt
+    def localized_args(accronym, **args)
+      if args[:content].is_a? String
+        [args[:content], args[:language], args[:script]]
+      elsif args[:content].nil?
+        lang = args[:language] || ACRONYMS.dig(acronym, "en") ? "en" : ACRONYMS[acronym]&.keys&.first
+        script = args[:script] || lang == "en" ? "Latn" : nil
+        [ACRONYMS.dig(accronym, lang), lang, script]
+      else [args[:content]]
       end
     end
   end

data/lib/relaton_bipm/hash_converter.rb

@@ -73,8 +73,7 @@ module RelatonBipm
 
       cmt = ret[:editorialgroup][:committee].map do |c|
         if (vars = committee_variants c).any?
-          content = RelatonBib::LocalizedString.new vars
-          Committee.new acronym: c[:acronym], content: content
+          Committee.new acronym: c[:acronym], content: vars
         else
           Committee.new(**c)
         end

data/lib/relaton_bipm/rawdata_bipm_metrologia/article_parser.rb

@@ -161,10 +161,9 @@ module RelatonBipm
       # @return [RelatonBib::FullName] full name
       #
       def fullname(name)
-        fname = forename name.at("./given-names")
-        sname = name.at("./surname").text
-        surname = RelatonBib::LocalizedString.new sname, "en", "Latn"
-        RelatonBib::FullName.new surname: surname, forename: fname
+        cname = [name.at("./given-names"), name.at("./surname")].compact.map(&:text).join(" ")
+        completename = RelatonBib::LocalizedString.new cname, "en", "Latn"
+        RelatonBib::FullName.new completename: completename
       end
 
       #

data/lib/relaton_bipm/rawdata_bipm_metrologia/fetcher.rb

@@ -31,7 +31,7 @@ module RelatonBipm
       def fetch_articles # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         Dir["#{DIR}/**/*.xml"].each do |path|
           item = ArticleParser.parse path
-          file = "#{item.docidentifier.first.id.downcase.gsub(' ', '-')}.#{@data_fetcher.ext}"
+          file = "#{item.docidentifier.first.id.downcase.tr(' ', '-')}.#{@data_fetcher.ext}"
           out_path = File.join(@data_fetcher.output, file)
           key = Id.new.parse(item.docidentifier.first.id).to_hash
           @data_fetcher.index2.add_or_update key, out_path

data/lib/relaton_bipm/version.rb

@@ -1,3 +1,3 @@
 module RelatonBipm
-  VERSION = "1.19.0".freeze
+  VERSION = "1.19.2".freeze
 end

data/lib/relaton_bipm/xml_parser.rb

@@ -58,12 +58,9 @@ module RelatonBipm
 
         cm = eg.xpath("committee").map do |c|
           vars = variants c
-          cnt = if vars.any?
-                  RelatonBib::LocalizedString.new vars
-                else
-                  RelatonBib::LocalizedString.new c.text, c[:language], c[:script]
-                end
-          Committee.new acronym: c[:acronym], content: cnt
+          cnt = vars.any? ? vars : c.text
+          args = c.to_h.transform_keys(&:to_sym).select { |k, _| %i[language script locale].include?(k) }
+          Committee.new acronym: c[:acronym], content: cnt, **args
         end
         wg = eg.xpath("workgroup").map do |w|
           WorkGroup.new content: w.text, acronym: w[:acronym]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bipm
 version: !ruby/object:Gem::Version
-  version: 1.19.0
+  version: 1.19.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-03 00:00:00.000000000 Z
+date: 2024-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday