relaton-bipm 1.13.4 → 1.13.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 163a9f60eeb667aff478312eb3325fa8d89ac00f4ed11dda2d24be353c7dee38
-  data.tar.gz: 5cc2a287138fe56e118ec4d3ef10b13d2da5568e69f186c9d303fa99fbe33b69
+  metadata.gz: aeddd651dcb48a277d10ad9351ba46351b7fe43eb8b136a359148d83a23ca7c0
+  data.tar.gz: 5b25f339d03c0278660b58a7b190e88e5a1c05ab0bcbec007fb8fdd6108efa7d
 SHA512:
-  metadata.gz: e585b21ae150bda7dc70203d696f4bfd9e9903a3d0b7e66b1f73b0b86312a59c171b35ab0cfe1b9ab3bcf9bce6a02f496354d5df0c95d0aab4e1258e89936e77
-  data.tar.gz: 425b7ff50a80c6e6971c1bccc42330f5785cdad5afff6632a08f4eec1271b7416514c9ed5c4a5468c15790d13138c43fe27e4dde03c1c688166bcaec6fc1da4f
+  metadata.gz: 3b913ce825a85cb4e751bb149422427f6828f009fe6324b08c18c25ab6573c0e365f266d7954940a79e63bacd8fb52ee81d37aa983749d1d0403c3fee0c1dcd1
+  data.tar.gz: 202619fe86dde21f5bfe8efb221177ab3cd078c4fcd57078b1584baf6609fed489d1c16e0d84b4fe5aa63bd88f59dd53b8b5d36c4d10931c6f57702c0b909ad0

data/README.adoc

@@ -33,6 +33,14 @@ Or install it yourself as:
 
 === Search for a standard using keywords
 
+The Metrologia website employs anti-DDoS protection, which may cause the search to fail. If this happens, open provided link in a browser and solve the captcha.
+
+----
+[relaton-bipm] ("BIPM Metrologia 50 4 385") fetching...
+[relaton-bipm] This source employs anti-DDoS measures that unfortunately affects automated requests.
+[relaton-bipm] Please visit this link in your browser to resolve the CAPTCHA, then retry: https://iopscience.iop.org/article/10.1088/0026-1394/50/4/385
+----
+
 ==== References for Si-Brochure documents
 
 `BIPM {DOCUMENT_NAME}`

data/lib/relaton_bipm/bipm_bibliography.rb

@@ -25,6 +25,7 @@ module RelatonBipm
         end
 
         warn("[relaton-bipm] (\"#{text}\") found #{item.docidentifier[0].id}")
+        item.fetched = Date.today.to_s
         item
       rescue Mechanize::ResponseCodeError => e
         raise RelatonBib::RequestError, e.message unless e.response_code == "404"
@@ -43,6 +44,7 @@ module RelatonBipm
           "Upgrade-Insecure-Requests" => "1",
         }
         a.user_agent_alias = Mechanize::AGENT_ALIASES.map(&:first).shuffle.first
+        # a.user_agent_alias = "Mac Safari"
         a
       end
 
@@ -226,8 +228,8 @@ module RelatonBipm
         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(', ')})"
+          warn "[relaton-bipm] No article is available at the specified start page \"#{art}\" in issue \"BIPM Metrologia #{vol} #{ish}\"."
+          warn "[relaton-bipm] Available articles in the issue start at the following pages: (#{arts.join(', ')})"
           return
         end
 
@@ -240,6 +242,7 @@ module RelatonBipm
       # @param agent [Mechanize]
       # @return [RelatonBipm::BipmBibliographicItem]
       def get_article(path, vol, ish, agent) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+        agent.agent.allowed_error_codes = [403]
         rsp = agent.get path
         check_response rsp
         url = rsp.uri
@@ -304,15 +307,17 @@ module RelatonBipm
       # @param bibtex [BibTeX::Entry]
       # @return [Array<Hash>]
       def btcontrib(bibtex)
-        surname, initial = bibtex.author.split ", "
-        initial = initial.split.map { |i| RelatonBib::LocalizedString.new i, "en", "Latn" }
-        surname = RelatonBib::LocalizedString.new surname, "en", "Latn"
-        name = RelatonBib::FullName.new surname: surname, initial: initial
-        author = RelatonBib::Person.new name: name
-        [
-          { entity: { name: bibtex.publisher.to_s }, role: [{ type: "publisher" }] },
-          { entity: author, role: [{ type: "author" }] },
-        ]
+        contribs = [{
+          entity: { name: bibtex.publisher.to_s }, role: [{ type: "publisher" }]
+        }]
+        return contribs unless bibtex.author
+
+        bibtex.author.split(" and ").inject(contribs) do |mem, name|
+          cname = RelatonBib::LocalizedString.new name, "en", "Latn"
+          name = RelatonBib::FullName.new completename: cname
+          author = RelatonBib::Person.new name: name
+          mem << { entity: author, role: [{ type: "author" }] }
+        end
       end
 
       #
@@ -353,7 +358,7 @@ module RelatonBipm
           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"
+        elsif rsp.code != "200" && rsp.code != "403"
           warn "[read_bipm] can't acces #{rsp.uri} #{rsp.code}"
           raise RelatonBib::RequestError, "cannot acces #{rsp.uri} #{rsp.code}"
         end

data/lib/relaton_bipm/data_fetcher.rb

@@ -68,7 +68,6 @@ module RelatonBipm
         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
         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
@@ -178,7 +177,7 @@ module RelatonBipm
       file = "#{num}.yaml"
       path = File.join dir, file
       link = "https://raw.githubusercontent.com/relaton/relaton-data-bipm/master/#{path}"
-      hash = bibitem type: type, en: en_md, fr: fr_md, id: id, num: num, src: src, pdf: en["pdf"]
+      hash = bibitem body: body, type: type, en: en_md, fr: fr_md, id: id, num: num, src: src, pdf: en["pdf"]
       if @files.include?(path) && part
         add_part hash, part
         item = RelatonBipm::BipmBibliographicItem.new(**hash)
@@ -190,7 +189,7 @@ module RelatonBipm
       elsif part
         hash[:title].each { |t| t[:content] = t[:content].sub(/\s\(.+\)$/, "") }
         hash[:link] = [{ type: "src", content: link }]
-        h = bibitem type: type, en: en_md, fr: fr_md, id: id, num: num, src: src, pdf: en["pdf"]
+        h = bibitem body: body, type: type, en: en_md, fr: fr_md, id: id, 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}.yaml"
@@ -219,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 = {
-          type: "proceedings", fetched: Date.today.to_s, title: [],
+          type: "proceedings", title: [],
           doctype: r["type"], place: [RelatonBib::Place.new(city: "Paris")]
         }
         hash[:title] << title(r["title"], "en") if r["title"]
@@ -252,10 +251,7 @@ module RelatonBipm
         hash[:link] << { type: "pdf", content: r["reference"] } if r["reference"]
         hash[:language] = %w[en fr]
         hash[:script] = ["Latn"]
-        hash[:contributor] = [{
-          entity: { url: "www.bipm.org", name: "Bureau International des Poids et Mesures", abbreviation: "BIPM" },
-          role: [{ type: "publisher" }],
-        }]
+        hash[:contributor] = contributors date, args[:body]
         hash[:structuredidentifier] = RelatonBipm::StructuredIdentifier.new docnumber: num
         item = RelatonBipm::BipmBibliographicItem.new(**hash)
         file = year
@@ -269,6 +265,39 @@ module RelatonBipm
       end
     end
 
+    def contributors(date, body) # rubocop:disable Metrics/MethodLength
+      if body == "CCTF" && Date.parse(date).year < 1999
+        authors = [{
+          name: [
+            { content: "Consultative Committee for the Definition of the Second",
+              language: "en", script: "Latn" },
+            { content: "Comité Consultatif pour la Définition de la Seconde",
+              language: "fr", script: "Latn" },
+          ],
+          abbreviation: { content: "CCDS", language: ["en", "fr"], script: "Latn" },
+        }]
+      elsif body == "CCTF"
+        authors = [{
+          name: [
+            { content: "Consultative Committee for Time and Frequency",
+              language: "en", script: "Latn" },
+            { content: "Comité consultatif du temps et des fréquences",
+              language: "fr", script: "Latn" },
+          ],
+          abbreviation: { content: body, language: ["en", "fr"], script: "Latn" },
+        }]
+      else authors = []
+      end
+      authors.reduce(
+        [{ entity: {
+             url: "www.bipm.org",
+             name: "Bureau International des Poids et Mesures",
+             abbreviation: "BIPM",
+           },
+           role: [{ type: "publisher" }] }],
+      ) { |a, e| a << { entity: e, role: [{ type: "author" }] } }
+    end
+
     def title(content, language)
       { content: content, language: language, script: "Latn" }
     end
@@ -304,7 +333,7 @@ module RelatonBipm
     #
     def bibitem(**args) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity
       hash = { title: [], type: "proceedings", doctype: args[:type],
-               fetched: Date.today.to_s, place: [RelatonBib::Place.new(city: "Paris")] }
+               place: [RelatonBib::Place.new(city: "Paris")] }
       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"] }]
@@ -320,10 +349,7 @@ module RelatonBipm
       hash[:link] += args[:src] if args[:src]&.any?
       hash[:language] = %w[en fr]
       hash[:script] = ["Latn"]
-      hash[:contributor] = [{
-        entity: { url: "www.bipm.org", name: "Bureau International des Poids et Mesures", abbreviation: "BIPM" },
-        role: [{ type: "publisher" }],
-      }]
+      hash[:contributor] = contributors args[:en]["date"], args[:body]
       hash[:structuredidentifier] = RelatonBipm::StructuredIdentifier.new docnumber: args[:num]
       hash
     end

data/lib/relaton_bipm/version.rb

@@ -1,3 +1,3 @@
 module RelatonBipm
-  VERSION = "1.13.4".freeze
+  VERSION = "1.13.6".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bipm
 version: !ruby/object:Gem::Version
-  version: 1.13.4
+  version: 1.13.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-04 00:00:00.000000000 Z
+date: 2022-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug