relaton-bipm 1.13.0 → 1.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60cc8b3979fffe05b9bc5d554e7bc6b486867a5a32f332b30c8fb30601b49b18
-  data.tar.gz: 3e20d99bb7d1055b6bedc2ab42a8c9eb074738ee8ebd8d26aba67f824a4935d0
+  metadata.gz: 5f3d34a19f9952368e46e0287dc3121b14b2bf2524613caa67e8810b17c0ad44
+  data.tar.gz: 024e1fa96b0082b61bc80ddd49fe9e2d906607d538badbb8df5a4e58c5603236
 SHA512:
-  metadata.gz: 5a59447492ae98160a67ed7a5f2843f211edbca658a452e685f521a5a940d102ee47d2b7d39265077407ff5a0cf9892f9d9c19e0719ad7c46e304b9f797e4709
-  data.tar.gz: d0c55fe5d12003e400cc660c6561bcf5878741b955785951089405ee64b4e94bc3067b8181f72b88ec7bb04a27dd93163cf19b289bdd3c3c1ccfff68b85579a1
+  metadata.gz: 8948a30ac51fbc1626ad445ffba402a781b7fe931ea0305ed50b1cd82b4d807ed6cfe4cbbbdd28cd133284e14ea5e616cb66160cbef251690b9f657181cc175a
+  data.tar.gz: efad783da2ee6f69c42384b7d1b2c198783ddb44e19a95547a6a3d4574bca0af87bb545c130f3835e8fd36e603112fa6ae79c0fb30dd9b3ae36bbf98ba136dbb

data/.github/workflows/release.yml

@@ -0,0 +1,22 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
+name: release
+
+on:
+  workflow_dispatch:
+    inputs:
+      next_version:
+        description: |
+          Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
+        required: true
+        default: 'skip'
+  push:
+    tags: [ v* ]
+
+jobs:
+  release:
+    uses: relaton/support/.github/workflows/release.yml@master
+    with:
+      next_version: ${{ github.event.inputs.next_version }}
+    secrets:
+      rubygems-api-key: ${{ secrets.RELATON_CI_RUBYGEMS_API_KEY }}

data/README.adoc

@@ -39,35 +39,35 @@ Or install it yourself as:
 
 Allowed document names are:
 
-- guide-ccem-ampere-realization
-- guide-ccl-metre-realization-1
-- guide-ccl-metre-realization-2
-- guide-ccl-metre-realization-3
-- guide-ccm-kilogram-calibration
-- guide-ccm-kilogram-dissemination
-- mep-ampere-definition
-- mep-candela-definition
-- mep-candela-rapport
-- mep-kelvin-absolute-uncertainty
-- mep-kelvin-absolute
-- mep-kelvin-definition
-- mep-kelvin-lt-johnson-noise
-- mep-kelvin-relative
-- mep-kilogram-definition
-- mep-metre-definition
-- mep-mole-definition
-- mep-second-definition
-- si-brochure
-- sib-a4
+- CCEM-GD-RSI-1
+- CCL-GD-MeP-1
+- CCL-GD-MeP-2
+- CCL-GD-MeP-3
+- CCM-GD-RSI-1
+- CCM-GD-RSI-2
+- SI MEP A1
+- SI MEP Cd1
+- Rapport BIPM-2019/05
+- SI MEP KUPRTM
+- SI MEP KAPRT
+- SI MEP K1
+- SI MEP KLJNT
+- SI MEP KRPRT
+- SI MEP Kg1
+- SI MEP M1
+- SI MEP Mol1
+- SI MEP S1
+- SI Brochure
+- SI Brochure, Appendix 4
 
 ==== Reference structire for Metrologia documents
 
-`BIPM Metrologia {JOURNAL} {VOLUME} {ISSUE} {ARTICLE}`
+`BIPM Metrologia {JOURNAL} {VOLUME} {ISSUE} {PAGE}`
 
 - `{JOURNAL}` - number of journal, required
 - `{VOLUME}` - number of volume, optional
 - `{ISSUE}` - number of issue, optional
-- `{ARTICLE}` - number of article, optional
+- `{PAGE}` - number of page, optional
 
 ==== Reference structures for CCTF (CCDS), CGMP, CIPM documents
 
@@ -94,13 +94,13 @@ require 'relaton_bipm'
 => true
 
 # get BIPM brochure
-item = RelatonBipm::BipmBibliography.get "BIPM si-brochure"
-[relaton-bipm] ("BIPM si-brochure") fetching...
-[relaton-bipm] ("BIPM si-brochure") found si-brochure
+item = RelatonBipm::BipmBibliography.get "BIPM SI Brochure"
+[relaton-bipm] ("BIPM SI Brochure") fetching...
+[relaton-bipm] ("BIPM SI Brochure") found BIPM SI Brochure
 => #<RelatonBipm::BipmBibliographicItem:0x007ffb83982fe8
 ...
 
-# get BIPM Metrologia article
+# get BIPM Metrologia page
 bib = RelatonBipm::BipmBibliography.get "BIPM Metrologia 29 6 373"
 [relaton-bipm] ("BIPM Metrologia 29 6 373") fetching...
 [relaton-bipm] ("BIPM Metrologia 29 6 373") found Metrologia 29 6 373
@@ -172,11 +172,12 @@ RelatonBipm::BipmBibliography.get "CIPM Recommendation 1948"
 [source,ruby]
 ----
 item.to_xml
-=> "<bibitem id="si-brochure" type="standard">
+=> "<bibitem id="BIPMSIBrochure" type="standard">
       <fetched>2021-01-10</fetched>
       <title format="text/plain" language="en" script="Latn">The International System of Units (SI)</title>
       <title format="text/plain" language="fr" script="Latn">Le Système international d’unités (SI)</title>
-      <docidentifier type="BIPM">si-brochure</docidentifier>
+      <uri type="src">https://www.bipm.org/en/publications/si-brochure</uri>
+      <docidentifier type="BIPM">BIPM SI Brochure</docidentifier>
       <date type="updated">
         <on>2019-05-20</on>
       </date>
@@ -205,7 +206,7 @@ item.to_xml bibdata: true
       <title format="text/plain" language="en" script="Latn">The International System of Units (SI)</title>
       <title format="text/plain" language="fr" script="Latn">Le Système international d’unités (SI)</title>
       <uri type="src">https://www.bipm.org/en/publications/si-brochure</uri>
-      <docidentifier type="BIPM">si-brochure</docidentifier>
+      <docidentifier type="BIPM">BIPM SI Brochure</docidentifier>
       <date type="updated">
         <on>2019-05-20</on>
       </date>

data/lib/relaton_bipm/bipm_bibliography.rb

@@ -15,11 +15,14 @@ module RelatonBipm
     class << self
       # @param text [String]
       # @return [RelatonBipm::BipmBibliographicItem]
-      def search(text, _year = nil, _opts = {}) # rubocop:disable Metrics/AbcSize
+      def search(text, _year = nil, _opts = {}) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         warn "[relaton-bipm] (\"#{text}\") fetching..."
         ref = text.sub(/^BIPM\s/, "")
         item = ref.match?(/^Metrologia/i) ? get_metrologia(ref, magent) : get_bipm(ref, magent)
-        return unless item
+        unless item
+          warn "[relaton-bipm] (\"#{text}\") not found."
+          return
+        end
 
         warn("[relaton-bipm] (\"#{text}\") found #{item.docidentifier[0].id}")
         item
@@ -216,11 +219,19 @@ module RelatonBipm
       # @param art [String]
       # @param agent [Mechanize]
       # @return [RelatonBipm::BipmBibliographicItem]
-      def get_article_from_issue(vol, ish, art, agent)
+      def get_article_from_issue(vol, ish, art, agent) # rubocop:disable Metrics/MethodLength
         url = issue_url vol, ish
         rsp = agent.get url
         check_response rsp
-        get_article rsp.at("//div[@class='indexer'][.='#{art}']/../div/a")[:href], vol, ish, agent
+        link = rsp.at("//div[@class='indexer'][.='#{art}']/../div/a")
+        unless link
+          arts = rsp.xpath("//div[@class='indexer']").map(&:text)
+          warn "[relaton-bipm] Page #{art} not found in \"BIPM Metrologia #{vol} #{ish}\" issue."
+          warn "[relaton-bipm] Availabe pages in the issue are: (#{arts.join(', ')})"
+          return
+        end
+
+        get_article link[:href], vol, ish, agent
       end
 
       # @param path [String]
@@ -228,7 +239,7 @@ module RelatonBipm
       # @param ish [String]
       # @param agent [Mechanize]
       # @return [RelatonBipm::BipmBibliographicItem]
-      def get_article(path, vol, ish, agent) # rubocop:disable Metrics/AbcSize
+      def get_article(path, vol, ish, agent) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         rsp = agent.get path
         check_response rsp
         url = rsp.uri
@@ -236,16 +247,19 @@ module RelatonBipm
         rsp = agent.get bib
         check_response rsp
         bt = BibTeX.parse(rsp.body).first
-        bibitem(docid: btdocid(bt), title: titles(bt.title.to_s), abstract: btabstract(bt), doctype: bt.type.to_s,
-                link: btlink(bt, url), date: btdate(bt), contributor: btcontrib(bt), series: series,
-                extent: btextent(vol, ish, bt))
+        bibitem(
+          docid: btdocid(bt), title: titles(bt.title.to_s), date: btdate(bt),
+          abstract: btabstract(bt), doctype: bt.type.to_s, series: series,
+          link: btlink(bt, url), contributor: btcontrib(bt),
+          extent: btextent(vol, ish, bt.pages.to_s)
+        )
       end
 
       # @param args [Hash]
       # @return [RelatonBipm::BipmBibliographicItem]
       def bibitem(**args)
         BipmBibliographicItem.new(
-          fetched: Date.today.to_s, type: "standard", language: ["en"], script: ["Latn"], **args,
+          fetched: Date.today.to_s, type: "article", language: ["en"], script: ["Latn"], **args,
         )
       end
 
@@ -258,7 +272,10 @@ module RelatonBipm
       # @return [Array<RelatonBib::DocumentIdentifier>]
       def btdocid(bibtex)
         id = "#{bibtex.journal} #{bibtex.volume} #{bibtex.number} #{bibtex.pages.match(/^\d+/)}"
-        [RelatonBib::DocumentIdentifier.new(type: "BIPM", id: id)]
+        [
+          RelatonBib::DocumentIdentifier.new(type: "BIPM", id: id, primary: true),
+          RelatonBib::DocumentIdentifier.new(type: "DOI", id: bibtex.doi),
+        ]
       end
 
       # @param bibtex [BibTeX::Entry]
@@ -298,14 +315,17 @@ module RelatonBipm
         ]
       end
 
-      # @param vol [String]
-      # @param ish [String]
-      # @param bibtex [BibTeX::Entry]
+      #
+      # @param vol [String] volume
+      # @param ish [String] issue
+      # @param pgs [String] pages
+      #
       # @return [Array<RelatonBib::BibItemLocality>]
-      def btextent(vol, ish = nil, bibtex = nil)
-        ext = [RelatonBib::BibItemLocality.new("volume", vol)]
-        ext << RelatonBib::BibItemLocality.new("issue", ish) if ish
-        ext << RelatonBib::BibItemLocality.new("page", *bibtex.pages.split("--")) if bibtex
+      #
+      def btextent(vol, ish = nil, pgs = nil)
+        ext = [RelatonBib::Locality.new("volume", vol)]
+        ext << RelatonBib::Locality.new("issue", ish) if ish
+        ext << RelatonBib::Locality.new("page", *pgs.split("--")) if pgs
         ext
       end
 
@@ -329,11 +349,13 @@ module RelatonBipm
       #
       def check_response(rsp) # rubocop:disable Metrics/AbcSize
         if rsp.code == "302"
-          warn "[relaton-bipm] #{rsp.uri} is redirected to #{rsp.header['location']}"
-          raise RelatonBib::RequestError, "redirected to #{rsp.header['location']}"
+          warn "[relaton-bipm] This source employs anti-DDoS measures that unfortunately affects automated requests."
+          warn "[relaton-bipm] Please visit this link in your browser to resolve the CAPTCHA, then retry: #{rsp.uri}"
+          # warn "[relaton-bipm] #{rsp.uri} is redirected to #{rsp.header['location']}"
+          raise RelatonBib::RequestError, "cannot access #{rsp.uri}"
         elsif rsp.code != "200"
           warn "[read_bipm] can't acces #{rsp.uri} #{rsp.code}"
-          raise RelatonBib::RequestError, "can't acces #{rsp.uri} #{rsp.code}"
+          raise RelatonBib::RequestError, "cannot acces #{rsp.uri} #{rsp.code}"
         end
       end
     end

data/lib/relaton_bipm/data_fetcher.rb

@@ -67,13 +67,14 @@ module RelatonBipm
         docstd = Nokogiri::XML File.read f
         doc = docstd.at "/bibdata"
         hash1 = RelatonBipm::XMLParser.from_xml(doc.to_xml).to_hash
+        fix_si_brochure_id hash1
         hash1["fetched"] = Date.today.to_s
-        hash1["docid"].detect { |id| id["type"] == "BIPM" }["primary"] = true
         outfile = File.join @output, File.basename(f).sub(/(?:-(?:en|fr))?\.rxl$/, ".yaml")
         @index[[hash1["docnumber"] || File.basename(outfile, ".yaml")]] = outfile
         hash = if File.exist? outfile
                  warn_duplicate = false
                  hash2 = YAML.load_file outfile
+                 fix_si_brochure_id hash2
                  deep_merge hash1, hash2
                else
                  warn_duplicate = true
@@ -85,6 +86,29 @@ module RelatonBipm
       end
     end
 
+    #
+    # Update ID of SI brochure
+    #
+    # @param [Hash] hash hash of bibitem
+    #
+    # @return [void]
+    #
+    def fix_si_brochure_id(hash) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      did = hash["docid"].detect { |id| id["type"] == "BIPM" }
+      did["primary"] = true
+      return unless did["id"] == "BIPM Brochure"
+
+      isbn = hash["docid"].detect { |id| id["type"] == "ISBN" }
+      num = if isbn && isbn["id"] == "978-92-822-2272-0"
+              "SI Brochure"
+            else
+              "SI Brochure, Appendix 4"
+            end
+      hash["id"] = hash["id"].sub(/(?<=^BIPM)Brochure$/i, num.gsub(/[,\s]/, ""))
+      hash["docnumber"] = hash["docnumber"].sub(/^Brochure$/i, num)
+      did["id"] = did["id"].sub(/(?<=^BIPM\s)Brochure$/i, num)
+    end
+
     #
     # Deep merge two hashes
     #
@@ -194,7 +218,7 @@ module RelatonBipm
     #
     def fetch_resolution(**args) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       args[:en]["resolutions"].each.with_index do |r, i| # rubocop:disable Metrics/BlockLength
-        hash = { fetched: Date.today.to_s, title: [], doctype: r["type"] }
+        hash = { type: "proceedings", fetched: Date.today.to_s, title: [], doctype: r["type"] }
         hash[:title] << title(r["title"], "en") if r["title"]
         fr_resolution = args[:fr]["resolutions"].fetch(i, nil)
         if fr_resolution
@@ -276,7 +300,8 @@ module RelatonBipm
     # @return [Hash] Hash of BIPM meeting/resolution
     #
     def bibitem(**args) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity
-      hash = { title: [], doctype: args[:type], fetched: Date.today.to_s }
+      hash = { title: [], type: "proceedings", doctype: args[:type],
+               fetched: Date.today.to_s }
       hash[:title] << title(args[:en]["title"], "en") if args[:en]["title"]
       hash[:title] << title(args[:fr]["title"], "fr") if args[:fr]["title"]
       hash[:date] = [{ type: "published", on: args[:en]["date"] }]

data/lib/relaton_bipm/index.rb

@@ -28,7 +28,7 @@ module RelatonBipm
     def path
       @path ||= begin
         dir = File.join Dir.home, ".relaton", "bipm"
-        FileUtils.mkdir_p dir unless Dir.exist? dir
+        FileUtils.mkdir_p dir
         File.join dir, "index.yaml"
       end
     end

data/lib/relaton_bipm/version.rb

@@ -1,3 +1,3 @@
 module RelatonBipm
-  VERSION = "1.13.0".freeze
+  VERSION = "1.13.3".freeze
 end

data/lib/relaton_bipm/xml_parser.rb

@@ -23,29 +23,18 @@ module RelatonBipm
         BipmBibliographicItem.new(**item_hash)
       end
 
-      # @param item [Nokogiri::XML::Element]
-      # @return [Array<RelatonBib::FormattedString>]
-      def fetch_titles(item)
-        item.xpath("./title").map do |t|
-          RelatonBib::TypedTitleString.new(
-            content: t.text, language: t[:language], script: t[:script],
-            format: t[:format]
-          )
-        end
-      end
-
-      def fetch_dates(item) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
-        item.xpath("./date").reduce([]) do |a, d|
-          type = d[:type].to_s.empty? ? "published" : d[:type]
-          if (on = d.at("on"))
-            a << BibliographicDate.new(type: type, on: on.text,
-                                       to: d.at("to")&.text)
-          elsif (from = d.at("from"))
-            a << BibliographicDate.new(type: type, from: from.text,
-                                       to: d.at("to")&.text)
-          end
-        end
-      end
+      # def fetch_dates(item) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+      #   item.xpath("./date").reduce([]) do |a, d|
+      #     type = d[:type].to_s.empty? ? "published" : d[:type]
+      #     if (on = d.at("on"))
+      #       a << BibliographicDate.new(type: type, on: on.text,
+      #                                  to: d.at("to")&.text)
+      #     elsif (from = d.at("from"))
+      #       a << BibliographicDate.new(type: type, from: from.text,
+      #                                  to: d.at("to")&.text)
+      #     end
+      #   end
+      # end
 
       # @param item [Nokogiri::XML::Element]
       # @param klass [RelatonBipm::DocumentRelation.class]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bipm
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.13.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-21 00:00:00.000000000 Z
+date: 2022-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -187,6 +187,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/rake.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"