relaton-bipm 1.10.1 → 1.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bc3bc46660a7a7852fd963502f27eb135b9f65bb75a5d24d69e59243fc90ad2
-  data.tar.gz: 4311d9bf2198fe3204f1075a9d088ab9bc24c327c9e2d07dcf5abbe0b00b4059
+  metadata.gz: 4b2dba1f1f291abb29c9a90122c060265b1165ef5c8a667fe7aa3cc1bc28c367
+  data.tar.gz: 3782195ed79911afc17f0f235bb1bfb82484c06ca7fef87c869aa8d68017d6e6
 SHA512:
-  metadata.gz: b6d914ecd5376914dda72e7f9aebb392c2685f0b29871531e434cf6402291383b72815497c74f263f6ba4e37fa88f46ddcb3d78bfc4ba7e1371c246ca6f333b7
-  data.tar.gz: 2c13012defdb97df5e6884b6f36807bdee455ad39d8feec34441115f2f4796a0a1e46e81101f8ca30c7c3fb7e1b58c15189523b28a1644cf26efedf038cb7731
+  metadata.gz: 8c5484395aeca285a53cf84ba9f50ca55db768cb7fbbe162fc8219424aa201af53423b34f5c9ecb8e6a25b776905447f5e987bc4a03e93b62dc808142d2b1501
+  data.tar.gz: f2a4039b7e63b4ab8b8e721042b109b9cd6abb3200254e004970a52c74b6593ae0954a39105eaaaff3ea21f47839c99c492d4fc8977f58e1257122e42d369582

data/README.adoc

@@ -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/lib/relaton_bipm/bipm_bibliography.rb

@@ -42,6 +42,7 @@ module RelatonBipm
       def get_bipm(ref, agent)
         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])
@@ -67,6 +68,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 +90,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 +119,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
@@ -199,6 +203,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 +214,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 +300,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.1".freeze
+  VERSION = "1.10.2".freeze
 end

metadata

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