relaton-bipm 1.13.1 → 1.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edb89c4c5c98e541ba6c2b6dceb5e3c0133679d3058c88a28a873ef24a4b132d
-  data.tar.gz: f73db142b9080babed9748cb846e803dd2b8fbe76764d644ce072f2d614be704
+  metadata.gz: 163a9f60eeb667aff478312eb3325fa8d89ac00f4ed11dda2d24be353c7dee38
+  data.tar.gz: 5cc2a287138fe56e118ec4d3ef10b13d2da5568e69f186c9d303fa99fbe33b69
 SHA512:
-  metadata.gz: 9252968e4aafe5721c843620e3515046f5360f6e1b492f341fe951314ed7de7894941052959a6c9c4a0bda18eba4cdbac47857fa58a4c0065199540128215253
-  data.tar.gz: 434e30bc8487085bf50d69b3be05443e53e235e813ba0a14937531a46b635a2eaa6fd919db4b1d21a2f96943c97a981b7704409963c8b77dd14f540b384dacc7
+  metadata.gz: e585b21ae150bda7dc70203d696f4bfd9e9903a3d0b7e66b1f73b0b86312a59c171b35ab0cfe1b9ab3bcf9bce6a02f496354d5df0c95d0aab4e1258e89936e77
+  data.tar.gz: 425b7ff50a80c6e6971c1bccc42330f5785cdad5afff6632a08f4eec1271b7416514c9ed5c4a5468c15790d13138c43fe27e4dde03c1c688166bcaec6fc1da4f

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

@@ -239,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
@@ -247,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
 
@@ -269,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]
@@ -309,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
 
@@ -342,7 +351,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

@@ -63,8 +63,6 @@ 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"
@@ -88,12 +86,27 @@ 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")
+    #
+    # 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
-      did["id"] = did["id"].sub(/^BIPM Brochure$/, "BIPM SI Brochure")
+      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
 
     #
@@ -205,7 +218,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", fetched: Date.today.to_s, 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
@@ -287,7 +303,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, 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"] }]

data/lib/relaton_bipm/version.rb

@@ -1,3 +1,3 @@
 module RelatonBipm
-  VERSION = "1.13.1".freeze
+  VERSION = "1.13.4".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.1
+  version: 1.13.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-31 00:00:00.000000000 Z
+date: 2022-09-04 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"