relaton-bipm 1.12.0 → 1.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34c3cc924311be1a1be33e18480b8521f168e1c72a46976045e9ccba69c38459
-  data.tar.gz: 4d929d15878f08fd5b696ecbc7fc3b0e5e94ad05e245c5fbc74125cc77ae0b8e
+  metadata.gz: b6da8165d7298a3658db3d941f2e0540e61bc53ddd726a79383cc36dc77f1b9a
+  data.tar.gz: 6748ecb244655bbbe8ef3226c5f72572d89104f591c256fe3db9f59cd3730b83
 SHA512:
-  metadata.gz: 020f3459446a2a48e0d571933811888bfe4fbcd91263c482609de7a34a98df38a27fe30af2dfedaba79dbd796b9cd161049573fc2209093b73c78ead725f0389
-  data.tar.gz: f638c858d2384822f59dbe04d39fa0ab6f9cb9bbd42fffb2e9e57c917a5f8d64782ff7176abe98a3968b73eca59be0ed95d0822be32349c549c9b2d8b6213db9
+  metadata.gz: c58dfe2d3407b0b0ec5bcc42a412eb740ff7834559a533e7f8677789590f78016ef58111936cc7021a76b263f6f4dfce5d636b559d0fd83a5484c822a2aa2bb4
+  data.tar.gz: b5e9ad9000dd8605eefc6cc06957d9841e9b283f3f471616ba681f64086ffc70004ca929c0d291dd66a3b46a56491cf96ca4dceaf2e36de599a876f84aef40d0

data/README.adoc

@@ -263,7 +263,7 @@ RelatonBipm::BipmBibliographicItem.from_hash hash
 
 This gem uses following datasets as data sources:
 - `bipm-data-outcomes` - looking for local directory with the repository https://github.com/metanorma/bipm-data-outcomes
-- `si-brochute` - looking for local directory with the repository https://github.com/metanorma/bipm-si-brochure
+- `bipm-si-brochute` - looking for local directory with the repository https://github.com/metanorma/bipm-si-brochure
 
 The method `RelatonBipm::DataFetcher.fetch(sourece, output: "data", format: "yaml")` fetches all the documents from the datast and save them to the `./data` folder in YAML format.
 Arguments:
@@ -280,7 +280,7 @@ Stopped at: 2022-06-23 09:36:58 +0200
 Done in: 2 sec.
 => nil
 
-RelatonBipm::DataFetcher.fetch "si-brochure"
+RelatonBipm::DataFetcher.fetch "bipm-si-brochure"
 Started at: 2022-06-23 09:37:12 +0200
 Stopped at: 2022-06-23 09:37:12 +0200
 Done in: 0 sec.

data/lib/relaton_bipm/data_fetcher.rb

@@ -25,7 +25,7 @@ module RelatonBipm
     def self.fetch(source, output: "data", format: "yaml")
       t1 = Time.now
       puts "Started at: #{t1}"
-      FileUtils.mkdir_p output unless Dir.exist? output
+      FileUtils.mkdir_p output
       new(output, format).fetch(source)
       t2 = Time.now
       puts "Stopped at: #{t2}"
@@ -40,7 +40,7 @@ module RelatonBipm
     def fetch(source)
       case source
       when "bipm-data-outcomes" then parse_bipm_data_outcomes
-      when "si-brochure" then parse_si_brochure
+      when "bipm-si-brochure" then parse_si_brochure
       end
       File.write @index_path, @index.to_yaml, encoding: "UTF-8"
     end
@@ -137,9 +137,9 @@ module RelatonBipm
       fr_file = en_file.sub "en", "fr"
       fr = RelatonBib.parse_yaml File.read(fr_file, encoding: "UTF-8"), [Date]
       fr_md = fr["metadata"]
-      gh_src = "https://raw.githubusercontent.com/metanorma/"
-      src_en = gh_src + en_file.split("/")[1..].insert(1, "main").join("/")
-      src_fr = gh_src + fr_file.split("/")[1..].insert(1, "main").join("/")
+      gh_src = "https://raw.githubusercontent.com/metanorma/bipm-data-outcomes/"
+      src_en = gh_src + en_file.split("/")[-3..].unshift("main").join("/")
+      src_fr = gh_src + fr_file.split("/")[-3..].unshift("main").join("/")
       src = [{ type: "src", content: src_en }, { type: "src", content: src_fr }]
 
       /^(?<num>\d+)(?:-_(?<part>\d+))?-\d{4}$/ =~ en_md["url"].split("/").last
@@ -189,8 +189,11 @@ module RelatonBipm
       args[:en]["resolutions"].each.with_index do |r, i| # rubocop:disable Metrics/BlockLength
         hash = { fetched: Date.today.to_s, title: [], doctype: r["type"] }
         hash[:title] << title(r["title"], "en") if r["title"]
-        fr_title = args[:fr]["resolutions"][i]["title"]
-        hash[:title] << title(fr_title, "fr") if fr_title
+        fr_resolution = args[:fr]["resolutions"].fetch(i, nil)
+        if fr_resolution
+          fr_title = fr_resolution["title"]
+          hash[:title] << title(fr_title, "fr") if fr_title
+        end
         date = r["dates"].first.to_s
         hash[:date] = [{ type: "published", on: date }]
         num = r["identifier"].to_s.split("-").last
@@ -278,7 +281,7 @@ module RelatonBipm
       hash[:id] = args[:id].gsub " ", "-"
       hash[:docnumber] = args[:id]
       hash[:link] = [{ type: "src", content: args[:en]["url"] }]
-      hash[:link] << { type: "pdf", content: args[:pdf] } if args[:pdf]
+      RelatonBib.array(args[:pdf]).each { |pdf| hash[:link] << { type: "pdf", content: pdf } }
       hash[:link] += args[:src] if args[:src]&.any?
       hash[:language] = %w[en fr]
       hash[:script] = ["Latn"]

data/lib/relaton_bipm/hash_converter.rb

@@ -28,7 +28,7 @@ module RelatonBipm
 
       # @param ret [Hash]
       def title_hash_to_bib(ret)
-        ret[:title] &&= array(ret[:title])
+        ret[:title] &&= RelatonBib.array(ret[:title])
           .reduce(RelatonBib::TypedTitleStringCollection.new) do |m, t|
           m << if t.is_a? Hash
                  RelatonBib::TypedTitleString.new(**t)
@@ -45,7 +45,7 @@ module RelatonBipm
 
       # @param ret [Hash]
       # def project_group_hash_to_bib(ret)
-      #   ret[:project_group] &&= array(ret[:project_group]).map do |pg|
+      #   ret[:project_group] &&= RelatonBib.array(ret[:project_group]).map do |pg|
       #     wg = RelatonBib::FormattedString.new pg[:workgroup]
       #     ProjectTeam.new(committee: pg[:committee], workgroup: wg)
       #   end
@@ -77,14 +77,14 @@ module RelatonBipm
             Committee.new(**c)
           end
         end
-        wg = array(ret[:editorialgroup][:workgroup]).map do |w|
+        wg = RelatonBib.array(ret[:editorialgroup][:workgroup]).map do |w|
           w.is_a?(Hash) ? WorkGroup.new(**w) : WorkGroup.new(content: w)
         end
         ret[:editorialgroup] = EditorialGroup.new committee: cmt, workgroup: wg
       end
 
       def committee_variants(cmt)
-        array(cmt[:variants]).each_with_object([]) do |v, a|
+        RelatonBib.array(cmt[:variants]).each_with_object([]) do |v, a|
           c = v[:content] || (ac = acronyms[cmt[:acronym]]) && ac[v[:language]]
           a << RelatonBib::LocalizedString.new(c, v[:language], v[:script]) if c
         end

data/lib/relaton_bipm/processor.rb

@@ -9,7 +9,7 @@ module RelatonBipm
       @prefix = "BIPM"
       @defaultprefix = %r{^(?:BIPM|CCTF|CCDS|CGPM|CIPM)(?!\w)}
       @idtype = "BIPM"
-      @datasets = %w[bipm-data-outcomes si-brochure]
+      @datasets = %w[bipm-data-outcomes bipm-si-brochure]
     end
 
     # @param code [String]

data/lib/relaton_bipm/version.rb

@@ -1,3 +1,3 @@
 module RelatonBipm
-  VERSION = "1.12.0".freeze
+  VERSION = "1.12.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bipm
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.12.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-25 00:00:00.000000000 Z
+date: 2022-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug