relaton-bipm 1.13.2 → 1.13.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8684961db2e3b70deffa9ba3a943ac4ce4990edd0b00a0e5311c0d92ca61f344
-  data.tar.gz: 4d585b8f37043d19e14bf2bf9f1a9ee32186978f86db61a9fa2aade824171133
+  metadata.gz: 44b5e29b765a1c5abb4e7d1e30f25924a3aba14462c654da9926e91b4c60c040
+  data.tar.gz: 772df92aa9bfd854f0228bfeaaf0edcda9665a5cf10237ff5bca89a9276f285e
 SHA512:
-  metadata.gz: f426fa79bd1c71061fe411ff764435817c49d0a9c9e56333304ae54390a6f20384dbdaf40fba7e19062c3618ca212fbd2d21dc3180ee461f75d0d2f5d6c6ffe3
-  data.tar.gz: 0b7b9707e8cd16955591edd14592bc59550cb0efb21cfcdceacd5733a471af0d4b8ee4ec39138e8ae6653f22e006144195e1ab8e1a685e95199f2f6408ebdee5
+  metadata.gz: 041beb9bc400b47198472a9ffab00427f3d08bae04121360527d8810354406a67602f68daff60e3ee16e9e195d37d33d0ce968f20b96f4005a5796d1e6caf200
+  data.tar.gz: e509099ba765739a5792f9f56ba58e6e93beb1e84b7f31e0f9cec09e95d34e70b4bd099a427640d5bab4800f138587930dd11a446f88149cb9f0004d14d2a29a

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

@@ -58,6 +58,7 @@ Allowed document names are:
 - SI MEP Mol1
 - SI MEP S1
 - SI Brochure
+- SI Brochure, Appendix 4
 
 ==== Reference structire for Metrologia documents
 

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"
@@ -226,8 +227,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
 
@@ -239,7 +240,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
@@ -247,16 +248,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
 
@@ -269,7 +273,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]
@@ -309,14 +316,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
 
@@ -342,7 +352,7 @@ module RelatonBipm
         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']}"
+          # 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}"

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"
@@ -218,7 +217,10 @@ 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", title: [],
+          doctype: r["type"], place: [RelatonBib::Place.new(city: "Paris")]
+        }
         hash[:title] << title(r["title"], "en") if r["title"]
         fr_resolution = args[:fr]["resolutions"].fetch(i, nil)
         if fr_resolution
@@ -249,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
@@ -266,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
@@ -300,7 +332,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],
+               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"] }]
@@ -316,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.2".freeze
+  VERSION = "1.13.5".freeze
 end

data/lib/relaton_bipm/xml_parser.rb

@@ -23,18 +23,18 @@ module RelatonBipm
         BipmBibliographicItem.new(**item_hash)
       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.2
+  version: 1.13.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-31 00:00:00.000000000 Z
+date: 2022-09-10 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"