relaton-bipm 1.13.0 → 1.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60cc8b3979fffe05b9bc5d554e7bc6b486867a5a32f332b30c8fb30601b49b18
-  data.tar.gz: 3e20d99bb7d1055b6bedc2ab42a8c9eb074738ee8ebd8d26aba67f824a4935d0
+  metadata.gz: edb89c4c5c98e541ba6c2b6dceb5e3c0133679d3058c88a28a873ef24a4b132d
+  data.tar.gz: f73db142b9080babed9748cb846e803dd2b8fbe76764d644ce072f2d614be704
 SHA512:
-  metadata.gz: 5a59447492ae98160a67ed7a5f2843f211edbca658a452e685f521a5a940d102ee47d2b7d39265077407ff5a0cf9892f9d9c19e0719ad7c46e304b9f797e4709
-  data.tar.gz: d0c55fe5d12003e400cc660c6561bcf5878741b955785951089405ee64b4e94bc3067b8181f72b88ec7bb04a27dd93163cf19b289bdd3c3c1ccfff68b85579a1
+  metadata.gz: 9252968e4aafe5721c843620e3515046f5360f6e1b492f341fe951314ed7de7894941052959a6c9c4a0bda18eba4cdbac47857fa58a4c0065199540128215253
+  data.tar.gz: 434e30bc8487085bf50d69b3be05443e53e235e813ba0a14937531a46b635a2eaa6fd919db4b1d21a2f96943c97a981b7704409963c8b77dd14f540b384dacc7

data/README.adoc

@@ -39,35 +39,34 @@ 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
 
 ==== 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 +93,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 +171,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 +205,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]
@@ -329,11 +340,13 @@ module RelatonBipm
       #
       def check_response(rsp) # rubocop:disable Metrics/AbcSize
         if rsp.code == "302"
+          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, "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

@@ -63,17 +63,20 @@ module RelatonBipm
       # puts "Ls #{Dir['bipm-si-brochure/site/*']}"
       # puts "Ls #{Dir['bipm-si-brochure/site/documents/*']}"
       Dir["bipm-si-brochure/site/documents/*.rxl"].each do |f|
+        next if f.include?("sib-a4")
+
         puts "Parsing #{f}"
         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 +88,14 @@ module RelatonBipm
       end
     end
 
+    def fix_si_brochure_id(hash)
+      hash["id"] = hash["id"].sub(/^BIPMBrochure$/, "BIPMSIBrochure")
+      hash["docnumber"] = hash["docnumber"].sub(/^Brochure$/i, "SI Brochure")
+      did = hash["docid"].detect { |id| id["type"] == "BIPM" }
+      did["primary"] = true
+      did["id"] = did["id"].sub(/^BIPM Brochure$/, "BIPM SI Brochure")
+    end
+
     #
     # Deep merge two hashes
     #

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.1".freeze
 end

metadata

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