relaton-bipm 1.14.6 → 1.14.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f72520efca5d2a8525b052758d95563c5ca6d57d22b85b146e4ff77e02ee2594
-  data.tar.gz: 57803ee16e558e356c0529599ffa8ba881ef85dba99d8b28a1f936a577f711f7
+  metadata.gz: fca66f613215d88c2a6211038fa877a18c3239a6dc967058935d656f93a38bbf
+  data.tar.gz: 973ef9e8f3ae01e4a993c5b1fa5499cecd41c070b1ece0ec45b947d07e6bc009
 SHA512:
-  metadata.gz: e44f8da41d1c91944196344e85921988c14e5771f976af31471b14bfa216084717942b43b5e3ddc0053891c23e5bb4b7c9d4d9f07ad1abd9b825028fb2b49cd1
-  data.tar.gz: 1b6de32f1454222514c9867d86a1bf970d0b42fce78b8f927459e8907a9715ebaf45c17366acfbe2112599fd3c07fc5a93d9729fd43e7565e67dee6acbeb52c3
+  metadata.gz: '0387b51f65c91b25c0957ee23d4781de82914bf8e6e32fd03ec7aa6cfb0506648983cf724cfed09a061e3e01967863d24a2948c074b76e83a6cab852ee452028'
+  data.tar.gz: 9cec1161eb66bb984ae573b0b880da67b4085b574acae5c6f44c80669a2f57f10ab422bbd7a54e419f65c159925ccf1815f08ac1ace269e2ac0808cce1e10791

data/lib/relaton_bipm/bipm_si_brochure_parser.rb

@@ -36,8 +36,6 @@ module RelatonBipm
         basename = File.join @data_fetcher.output, File.basename(f).sub(/(?:-(?:en|fr))?\.rxl$/, "")
         outfile = "#{basename}.#{@data_fetcher.ext}"
         key = hash1["docnumber"] || basename
-        @data_fetcher.index[[key]] = outfile
-        @data_fetcher.index_new.add_or_update [key], outfile
         @data_fetcher.index2.add_or_update Id.new(key).to_hash, outfile
         hash = if File.exist? outfile
                  warn_duplicate = false

data/lib/relaton_bipm/data_fetcher.rb

@@ -1,6 +1,6 @@
 module RelatonBipm
   class DataFetcher
-    attr_reader :output, :format, :ext, :files, :index, :index_new, :index2
+    attr_reader :output, :format, :ext, :files, :index2
 
     #
     # Initialize fetcher
@@ -13,9 +13,6 @@ module RelatonBipm
       @format = format
       @ext = format.sub(/^bib/, "")
       @files = []
-      @index_path = "index.yaml"
-      @index = File.exist?(@index_path) ? YAML.load_file(@index_path) : {}
-      @index_new = Relaton::Index.find_or_create :BIPM, file: "index-bipm.yaml"
       @index2 = Relaton::Index.find_or_create :BIPM, file: "index2.yaml"
     end
 
@@ -47,8 +44,6 @@ module RelatonBipm
       when "bipm-si-brochure" then BipmSiBrochureParser.parse(self)
       when "rawdata-bipm-metrologia" then RawdataBipmMetrologia::Fetcher.fetch(self)
       end
-      File.write @index_path, index.to_yaml, encoding: "UTF-8"
-      index_new.save
       index2.save
     end
 

data/lib/relaton_bipm/data_outcomes_parser.rb

@@ -61,7 +61,7 @@ module RelatonBipm
     # @param [String] body name of body
     #
     def fetch_type(dir, body) # rubocop:disable Metrics/AbcSize
-      type = dir.split("/").last.split("-").first.sub(/s$/, "")
+      type = dir.split("/").last.split("-").first.sub(/s$/, "").capitalize
       body_dir = File.join @data_fetcher.output, body.downcase
       FileUtils.mkdir_p body_dir
       outdir = File.join body_dir, type.downcase
@@ -74,7 +74,7 @@ module RelatonBipm
     #
     # @param [String] en_file Path to English file
     # @param [String] body Body name
-    # @param [String] type Type of Recommendation/Decision/Resolution
+    # @param [String] type meeting
     # @param [String] dir output directory
     #
     def fetch_meeting(en_file, body, type, dir) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
@@ -84,7 +84,7 @@ module RelatonBipm
 
       file = "#{num}.#{@data_fetcher.ext}"
       path = File.join dir, file
-      hash = bibitem body: body, type: type, en: en_md, fr: fr_md, num: num, src: src, pdf: en["pdf"]
+      hash = meeting_bibitem body: body, type: type, en: en_md, fr: fr_md, num: num, src: src, pdf: en["pdf"]
       if @data_fetcher.files.include?(path) && part
         add_part hash, part
         item = RelatonBipm::BipmBibliographicItem.new(**hash)
@@ -95,7 +95,7 @@ module RelatonBipm
         path = File.join dir, "#{num}-#{part}.#{@data_fetcher.ext}"
       elsif part
         hash[:title].each { |t| t[:content] = t[:content].sub(/\s\(.+\)$/, "") }
-        h = bibitem body: body, type: type, en: en_md, fr: fr_md, num: num, src: src, pdf: en["pdf"]
+        h = meeting_bibitem body: body, type: type, en: en_md, fr: fr_md, num: num, src: src, pdf: en["pdf"]
         add_part h, part
         part_item = RelatonBipm::BipmBibliographicItem.new(**h)
         part_item_path = File.join dir, "#{num}-#{part}.#{@data_fetcher.ext}"
@@ -171,9 +171,9 @@ module RelatonBipm
         num = "0" if num == year
         num_justed = num.rjust 2, "0"
         type = r["type"].capitalize
-        docnum = create_docnum args[:body], type, num, date
+        docnum = create_resolution_docnum args[:body], type, num, date
         hash[:id] = create_id(args[:body], type, num_justed, date)
-        hash[:docid] = create_docids docnum
+        hash[:docid] = create_resolution_docids args[:body], type, num, date
         hash[:docnumber] = docnum
         hash[:language] = %w[en fr]
         hash[:script] = ["Latn"]
@@ -230,11 +230,8 @@ module RelatonBipm
     # @param [String] path path to YAML file
     #
     def add_to_index(item, path) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-      key = item.docidentifier.select { |i| i.type == "BIPM" }.map &:id
-      @data_fetcher.index[key] = path
-      @data_fetcher.index_new.add_or_update key, path
-      key2 = Id.new(item.docnumber).to_hash
-      @data_fetcher.index2.add_or_update key2, path
+      key = Id.new(item.docnumber).to_hash
+      @data_fetcher.index2.add_or_update key, path
     end
 
     #
@@ -373,20 +370,20 @@ module RelatonBipm
     end
 
     #
-    # Create hash from BIPM meeting/resolution
+    # Create hash from BIPM meeting
     #
     # @param [Hash] **args Hash of arguments
-    # @option args [String] :type Type of meeting/resolution
+    # @option args [String] :type meeting
     # @option args [Hash] :en Hash of English metadata
     # @option args [Hash] :fr Hash of French metadata
-    # @option args [String] :id ID of meeting/resolution
-    # @option args [String] :num Number of meeting/resolution
+    # @option args [String] :id ID of meeting
+    # @option args [String] :num Number of meeting
     # @option args [Array<Hash>] :src Array of links to bipm-data-outcomes
     # @option args [String] :pdf link to PDF
     #
     # @return [Hash] Hash of BIPM meeting/resolution
     #
-    def bibitem(**args) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity
+    def meeting_bibitem(**args) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity
       docnum = create_meeting_docnum args[:body], args[:type], args[:num], args[:en]["date"]
       hash = { title: [], type: "proceedings", doctype: args[:type],
                place: [RelatonBib::Place.new(city: "Paris")] }
@@ -428,49 +425,51 @@ module RelatonBipm
     end
 
     #
-    # Creata a document number
+    # Creata resolution document number
     #
-    # @param [<Type>] body <description>
-    # @param [<Type>] type <description>
-    # @param [<Type>] num <description>
-    # @param [<Type>] date <description>
+    # @param [String] body CIPM, CGPM, CCTF
+    # @param [String] type Recommendation, Resolution, Decision
+    # @param [String] num number of recommendation, resolution, decision
+    # @param [String] date date of publication
     #
-    # @return [<Type>] <description>
+    # @return [String] document number
     #
-    def create_docnum(body, type, num, date)
+    def create_resolution_docnum(body, type, num, date)
       year = Date.parse(date).year
-      # if special_id_case? body, type, year
-      #   id = "#{type.capitalize} #{body}"
-      #   id += "/#{num}" if num.to_i.positive?
-      # else
       id = "#{body} #{SHORTTYPE[type.capitalize]}"
       id += " #{num}" if num.to_i.positive?
-      # end
       "#{id} (#{year})"
     end
 
+    #
+    # Create meeting document number
+    #
+    # @param [String] body CIPM, CGPM, CCTF
+    # @param [String] type meeting
+    # @param [String] num number of meeting
+    # @param [String] date date of publication
+    #
+    # @return [String] <description>
+    #
     def create_meeting_docnum(body, type, num, date)
       year = Date.parse(date).year
-      "#{body} #{num}th #{type} (#{year})"
+      ord = %w[th st nd rd th th th th th th][num.to_i % 10]
+      "#{body} #{num}#{ord} #{type} (#{year})"
     end
 
     #
     # Create ID
     #
-    # @param [String] body body of meeting
-    # @param [String] type type of meeting
-    # @param [String, nil] num part number
+    # @param [String] body CIPM, CGPM, CCTF
+    # @param [String] type meeting, recommendation, resolution, decision
+    # @param [String, nil] num number of meeting, recommendation, resolution, decision
     # @param [String] date published date
     #
     # @return [String] ID
     #
     def create_id(body, type, num, date)
       year = Date.parse(date).year
-      # if special_id_case?(body, type, year)
-      #   [type.capitalize, body, year]
-      # else
       [body, SHORTTYPE[type.capitalize], year, num].compact.join("-")
-      # end
     end
 
     #
@@ -482,10 +481,10 @@ module RelatonBipm
     #
     # @return [Boolean] is special case
     #
-    # def special_id_case?(body, type, year)
-    #   (body == "CIPM" && type == "Decision" && year.to_i > 2011) ||
-    #     (body == "JCRB" && %w[recomendation resolution descision].include?(type))
-    # end
+    def special_id_case?(body, type, year)
+      (body == "CIPM" && type == "Decision" && year.to_i > 2011) ||
+        (body == "JCRB" && %w[Recomendation Resolution Descision].include?(type))
+    end
 
     #
     # Create documetn IDs
@@ -494,38 +493,62 @@ module RelatonBipm
     #
     # @return [Array<RelatonBib::DocumentIdentifier>] document IDs
     #
-    def create_docids(id)
-      en_id = id.sub(/(\s\(\d{4})(\))$/, '\1, E\2')
-      fr_id = id.sub(/(\s\(\d{4})(\))$/, '\1, F\2')
-      [
-        make_docid(id: id, type: "BIPM", primary: true),
-        make_docid(id: en_id, type: "BIPM", primary: true, language: "en", script: "Latn"),
-        make_docid(id: fr_id, type: "BIPM", primary: true, language: "fr", script: "Latn"),
-        # create_docid_fr(en_id),
-      ]
+    def create_resolution_docids(body, type, num, date)
+      year = Date.parse(date).year
+      ids = []
+      resolution_short_ids(body, type, num, year) { |id| ids << id }
+      resolution_long_ids(body, type, num, year) { |id| ids << id }
+    end
+
+    def resolution_short_ids(body, type, num, year, &_block)
+      short_type = SHORTTYPE[type]
+      id = "#{body} #{short_type}"
+      id += " #{num}" if num.to_i.positive?
+
+      short = "#{id} (#{year})"
+      yield make_docid(id: short, type: "BIPM", primary: true)
+
+      en = "#{id} (#{year}, E)"
+      yield make_docid(id: en, type: "BIPM", primary: true, language: "en", script: "Latn")
+
+      fr = "#{id} (#{year}, F)"
+      yield make_docid(id: fr, type: "BIPM", primary: true, language: "fr", script: "Latn")
+    end
+
+    def resolution_long_ids(body, type, num, year, &_block)
+      en = "#{body} #{type}"
+      en += " #{num}" if num.to_i.positive?
+      en += " (#{year})"
+      yield make_docid id: en, type: "BIPM-long", language: "en", script: "Latn"
+
+      fr = resolution_fr_long_id(body, type, num, year)
+      yield make_docid id: fr, type: "BIPM-long", language: "fr", script: "Latn"
+
+      yield make_docid(id: "#{en} / #{fr}", type: "BIPM-long")
+    end
+
+    def resolution_fr_long_id(body, type, num, year)
+      fr = TRANSLATIONS[type] || type
+      if special_id_case? body, type, year
+        fr += " #{body}"
+        fr += "/#{num}" if num.to_i.positive?
+      else
+        fr += " #{num}" if num.to_i.positive?
+        fr += body == "CGPM" ? " de la" : " du"
+        fr += " #{body}"
+      end
+      "#{fr} (#{year})"
     end
 
     def create_meeting_docids(en_id)
-      fr_id = en_id.sub(/(\d+)th/, '\1e').sub("meeting", "réunion")
+      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, type: "BIPM", primary: true, language: "fr", script: "Latn"),
+        make_docid(id: "#{en_id} / #{fr_id}", type: "BIPM", primary: true),
       ]
     end
 
-    #
-    # Create French document ID
-    #
-    # @param [String] en_id English document ID
-    #
-    # @return [RelatonBib::DocumentIdentifier] french document ID
-    #
-    # def create_docid_fr(en_id)
-    #   tr = TRANSLATIONS.detect { |_, v| en_id.include? v }
-    #   id = tr ? en_id.sub(tr[1], tr[0]) : en_id
-    #   make_docid(id: id, type: "BIPM", primary: true, language: "fr", script: "Latn")
-    # end
-
     #
     # Create doucment ID
     #

data/lib/relaton_bipm/id_parser.rb

@@ -87,9 +87,11 @@ module RelatonBipm
     #
     # @return [Boolean] true if the two Id objects are equal
     #
-    def ==(other)
+    def ==(other) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/AbcSize
       other_hash = other.is_a?(Id) ? other.to_hash : normalize_hash(other)
       hash = to_hash
+      hash.delete(:number) if other_hash[:number].nil? && hash[:number] == "1"
+      other_hash.delete(:number) if hash[:number].nil? && other_hash[:number] == "1"
       hash.delete(:year) unless other_hash[:year]
       other_hash.delete(:year) unless hash[:year]
       hash.delete(:lang) unless other_hash[:lang]

data/lib/relaton_bipm/rawdata_bipm_metrologia/fetcher.rb

@@ -33,8 +33,6 @@ module RelatonBipm
           item = ArticleParser.parse path
           file = "#{item.docidentifier.first.id.downcase.gsub(' ', '-')}.#{@data_fetcher.ext}"
           out_path = File.join(@data_fetcher.output, file)
-          @data_fetcher.index[[item.docidentifier.first.id]] = out_path
-          @data_fetcher.index_new.add_or_update [item.docidentifier.first.id], out_path
           key = Id.new(item.docidentifier.first.id).to_hash
           @data_fetcher.index2.add_or_update key, out_path
           @data_fetcher.write_file out_path, item
@@ -78,8 +76,6 @@ module RelatonBipm
         )
         file = "#{id.downcase.gsub(' ', '-')}.#{@data_fetcher.ext}"
         path = File.join(@data_fetcher.output, file)
-        @data_fetcher.index[[id]] = path
-        @data_fetcher.index_new.add_or_update [id], path
         @data_fetcher.index2.add_or_update Id.new(id).to_hash, path
         @data_fetcher.write_file path, item
       end

data/lib/relaton_bipm/version.rb

@@ -1,3 +1,3 @@
 module RelatonBipm
-  VERSION = "1.14.6".freeze
+  VERSION = "1.14.7".freeze
 end

data/relaton_bipm.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
 
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
 
-  spec.add_dependency "faraday", "~> 1.0"
+  spec.add_dependency "faraday", "~> 2.7.0"
   spec.add_dependency "mechanize", "~> 2.8.0"
   spec.add_dependency "parslet", "~> 2.0.0"
   spec.add_dependency "relaton-bib", "~> 1.14.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bipm
 version: !ruby/object:Gem::Version
-  version: 1.14.6
+  version: 1.14.7
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-03 00:00:00.000000000 Z
+date: 2023-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
@@ -175,7 +175,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/relaton/relaton-bipm
   source_code_uri: https://github.com/relaton/relaton-bipm
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -190,8 +190,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.9
-signing_key:
+rubygems_version: 3.3.26
+signing_key: 
 specification_version: 4
 summary: 'RelatonBipm: retrieve BIPM Standards for bibliographic use using the BibliographicItem
   model'