relaton-bipm 1.10.0 → 1.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62e2b0e8e3e760434471aee77019fa507d36cab63dc64efe988723adc198c87a
-  data.tar.gz: 305943e857f09997c5d883967ef2bc25904ff6958bce9ccd2788199aa1b3cbee
+  metadata.gz: 82921528d18ccbfc6bbba60ae832fd711d92c9d338b887c19b500d81f911098b
+  data.tar.gz: 21db3cbf7e095003a51224b8c7c8a11f0b46164d52f161f45c83acd5677b65ad
 SHA512:
-  metadata.gz: 5ecfd3a440ccd9d40d88b93a8621e5cac30b340acccc18cad7f44fd383334f0354f3ceb7963b99b4dc4eb58ff9a397565d940dd3d1463304faa1358a0dd78967
-  data.tar.gz: 013f356a1d17c03058f359b7e9ce20b5338d45e90f25a9bcbc8481239acad75949b26472bf1bf654dcfae868197702f7c0337e186ca0137a108683e18b8cadf9
+  metadata.gz: 5df3c90e1dce934b765a738283b8cefc1de1516ffc869698bc5c161ca5a3ae290a30f799c00de19fe67513d589934ea469d3a9a4c5c3144e1afc6ca3174eea7b
+  data.tar.gz: 5516be3766704271ef92b49621fdf4ee38e01520ba986917f8ff0a8fd4d34eabb3530dadb8fc500dbbedf762d0128115c3987476cb430930c21cbe516e248cab

data/README.adoc

@@ -8,7 +8,7 @@ image:https://codeclimate.com/github/relaton/relaton-bipm/badges/gpa.svg["Code C
 image:https://img.shields.io/github/issues-pr-raw/relaton/relaton-bipm.svg["Pull Requests", link="https://github.com/relaton/relaton-bipm/pulls"]
 image:https://img.shields.io/github/commits-since/relaton/relaton-bipm/latest.svg["Commits since latest",link="https://github.com/relaton/relaton-bipm/releases"]
 
-RelatonIec is a Ruby gem that implements the https://github.com/metanorma/metanorma-model-iso#iso-bibliographic-item[IsoBibliographicItem model].
+RelatonBipm is a Ruby gem that implements the https://github.com/metanorma/metanorma-model-iso#iso-bibliographic-item[IsoBibliographicItem model].
 
 You can use it to retrieve metadata of BIPM Standards from https://www.bipm.org, and access such metadata through the `BipmBibliographicItem` object.
 
@@ -53,17 +53,17 @@ bib = RelatonBipm::BipmBibliography.get "BIPM Metrologia 29 6 373"
 ...
 
 # get CGPM resolutions
-RelatonBipm::BipmBibliography.get "BIPM CGPM01 1"
-[relaton-bipm] ("BIPM CGPM01 1") fetching...
-[relaton-bipm] ("BIPM CGPM01 1") found CGPM01-1
-=> #<RelatonBipm::BipmBibliographicItem:0x00007f9e92817968
+RelatonBipm::BipmBibliography.get "BIPM CR 01"
+[relaton-bipm] ("BIPM CR 01") fetching...
+[relaton-bipm] ("BIPM CR 01") found BIPM CR 01
+=> #<RelatonBipm::BipmBibliographicItem:0x00007fd4f7cba038
 ...
 
 # get CIPM resolutions
-RelatonBipm::BipmBibliography.get "BIPM CIPM101 1"
-[relaton-bipm] ("BIPM CIPM101 1") fetching...
-[relaton-bipm] ("BIPM CIPM101 1") found CIPM101-1
-=> #<RelatonBipm::BipmBibliographicItem:0x00007f9e9293d658
+RelatonBipm::BipmBibliography.get "BIPM PV 101(I)"
+[relaton-bipm] ("BIPM PV 101(I)") fetching...
+[relaton-bipm] ("BIPM PV 101(I)") found BIPM PV 101(I)
+=> #<RelatonBipm::BipmBibliographicItem:0x00007fd5072301c0
 ...
 ----
 

data/grammars/biblio.rng

@@ -209,9 +209,6 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="uri"/>
-      </zeroOrMore>
     </element>
   </define>
   <define name="fullname">
@@ -828,6 +825,11 @@
       <optional>
         <attribute name="scope"/>
       </optional>
+      <optional>
+        <attribute name="primary">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <text/>
     </element>
   </define>

data/lib/relaton_bipm/bipm_bibliography.rb

@@ -39,12 +39,18 @@ module RelatonBipm
       # @param ref [String]
       # @param agent [Mechanize]
       # @return [RelatonBipm::BipmBibliographicItem]
-      def get_bipm(ref, agent)
+      def get_bipm(ref, agent) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         url = "#{GH_ENDPOINT}#{ref.upcase.split.join '-'}.yaml"
         resp = agent.get url
+        check_response resp
         return unless resp.code == "200"
 
-        bib_hash = HashConverter.hash_to_bib YAML.safe_load(resp.body, [Date])
+        yaml = if Gem::Version.new(Psych::VERSION) >= Gem::Version.new("3.1.0.pre1")
+                 YAML.safe_load(resp.body, permitted_classes: [Date])
+               else
+                 YAML.safe_load(resp.body, [Date])
+               end
+        bib_hash = HashConverter.hash_to_bib yaml
         BipmBibliographicItem.new(**bib_hash)
       end
 
@@ -67,6 +73,7 @@ module RelatonBipm
       def get_journal(agent)
         url = "#{IOP_DOMAIN}/journal/0026-1394"
         rsp = agent.get url
+        check_response rsp
         rel = rsp.xpath('//select[@id="allVolumesSelector"]/option').map do |v|
           { type: "partOf", bibitem: journal_rel(v) }
         end
@@ -88,6 +95,7 @@ module RelatonBipm
       def get_volume(vol, agent)
         url = "#{IOP_DOMAIN}/volume/0026-1394/#{vol}"
         rsp = agent.get url
+        check_response rsp
         rel = rsp.xpath('//li[@itemprop="hasPart"]').map do |i|
           { type: "partOf", bibitem: volume_rel(i, vol) }
         end
@@ -116,9 +124,10 @@ module RelatonBipm
       # @param ish [String]
       # @param agent [Mechanize]
       # @return [RelatonBipm::BipmBibliographicItem]
-      def get_issue(vol, ish, agent) # rubocop:disable Metrics/AbcSize
+      def get_issue(vol, ish, agent) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         url = issue_url vol, ish
         rsp = agent.get url
+        check_response rsp
         rel = rsp.xpath('//div[@class="art-list-item-body"]').map do |a|
           { type: "partOf", bibitem: issue_rel(a, vol, ish) }
         end
@@ -188,7 +197,7 @@ module RelatonBipm
       # @return [RelatonBib::DocumentIdentifier]
       def doc_id(args)
         id = args.clone.unshift "Metrologia"
-        RelatonBib::DocumentIdentifier.new(type: "BIPM", id: id.join(" "))
+        RelatonBib::DocumentIdentifier.new(type: "BIPM", id: id.join(" "), primary: true)
       end
 
       # @param vol [String]
@@ -199,6 +208,7 @@ module RelatonBipm
       def get_article_from_issue(vol, ish, art, agent)
         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
       end
 
@@ -209,9 +219,11 @@ module RelatonBipm
       # @return [RelatonBipm::BipmBibliographicItem]
       def get_article(path, vol, ish, agent) # rubocop:disable Metrics/AbcSize
         rsp = agent.get path
+        check_response rsp
         url = rsp.uri
         bib = rsp.link_with(text: "BibTeX").href
         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,
@@ -293,6 +305,26 @@ module RelatonBipm
       def get(ref, year = nil, opts = {})
         search(ref, year, opts)
       end
+
+      private
+
+      #
+      # Check HTTP response. Warn and rise error if response is not 200
+      #   or redirect to CAPTCHA.
+      #
+      # @param [Mechanize] rsp response
+      #
+      # @raise [RelatonBib::RequestError] if response is not 200
+      #
+      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']}"
+        elsif rsp.code != "200"
+          warn "[read_bipm] can't acces #{rsp.uri} #{rsp.code}"
+          raise RelatonBib::RequestError, "can't acces #{rsp.uri} #{rsp.code}"
+        end
+      end
     end
   end
 end

data/lib/relaton_bipm/version.rb

@@ -1,3 +1,3 @@
 module RelatonBipm
-  VERSION = "1.10.0".freeze
+  VERSION = "1.10.3".freeze
 end

data/relaton_bipm.gemspec

@@ -44,6 +44,6 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.add_development_dependency "webmock"
 
   spec.add_dependency "mechanize", "~> 2.8.0"
-  spec.add_dependency "relaton-bib", "~> 1.10.0"
+  spec.add_dependency "relaton-bib", "~> 1.10.1"
   spec.add_dependency "serrano", "~> 1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bipm
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.10.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-30 00:00:00.000000000 Z
+date: 2022-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.10.1
 - !ruby/object:Gem::Dependency
   name: serrano
   requirement: !ruby/object:Gem::Requirement