relaton-bipm 1.10.1 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bc3bc46660a7a7852fd963502f27eb135b9f65bb75a5d24d69e59243fc90ad2
-  data.tar.gz: 4311d9bf2198fe3204f1075a9d088ab9bc24c327c9e2d07dcf5abbe0b00b4059
+  metadata.gz: 9a82c0e9b55d960a68829f47fe01690401a924a1b61df376e6834a107159b488
+  data.tar.gz: 007aee78882b5e154ff6219d1b1429b727110600f254be691e8dced237e1120d
 SHA512:
-  metadata.gz: b6d914ecd5376914dda72e7f9aebb392c2685f0b29871531e434cf6402291383b72815497c74f263f6ba4e37fa88f46ddcb3d78bfc4ba7e1371c246ca6f333b7
-  data.tar.gz: 2c13012defdb97df5e6884b6f36807bdee455ad39d8feec34441115f2f4796a0a1e46e81101f8ca30c7c3fb7e1b58c15189523b28a1644cf26efedf038cb7731
+  metadata.gz: 81058113d2ba56ea79734d19f9c1bb45e4cbcb71df6d7fc8fb14b5ab09d8c55924dda3118db4d6588a15d0790e55b5cc393a41e67539c4f9b5d78c31d9663a69
+  data.tar.gz: 1fc0397bb7b6b693fe8233d9577214684a72af2ec3c2a8fef5b130a3a4d10413c6980aefe4c7c638b9dfe0ba6726d1aa612577e63a853ec232827e8b16f673c0

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

@@ -677,6 +677,9 @@
     <zeroOrMore>
       <ref name="extent"/>
     </zeroOrMore>
+    <optional>
+      <ref name="bibliographic_size"/>
+    </optional>
     <zeroOrMore>
       <ref name="accesslocation"/>
     </zeroOrMore>
@@ -922,9 +925,29 @@
       <text/>
     </element>
   </define>
+  <define name="sizevalue">
+    <element name="value">
+      <attribute name="type"/>
+      <text/>
+    </element>
+  </define>
+  <define name="bibliographic_size">
+    <element name="size">
+      <oneOrMore>
+        <ref name="sizevalue"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="extent">
     <element name="extent">
-      <ref name="BibItemLocality"/>
+      <choice>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="localityStack"/>
+        </zeroOrMore>
+      </choice>
     </element>
   </define>
   <define name="series">

data/grammars/bipm.rng

@@ -59,7 +59,7 @@
             <data type="boolean"/>
           </attribute>
         </optional>
-        <text/>
+        <ref name="XrefBody"/>
       </element>
     </define>
     <define name="Clause-Section">

data/grammars/isodoc.rng

@@ -152,9 +152,7 @@
             <data type="boolean"/>
           </attribute>
         </optional>
-        <oneOrMore>
-          <ref name="PureTextElement"/>
-        </oneOrMore>
+        <ref name="XrefBody"/>
       </element>
     </define>
     <define name="erefType">
@@ -188,6 +186,42 @@
         <ref name="PureTextElement"/>
       </oneOrMore>
     </define>
+    <define name="localityStack">
+      <element name="localityStack">
+        <optional>
+          <attribute name="connective">
+            <choice>
+              <value>and</value>
+              <value>or</value>
+              <value>from</value>
+              <value>to</value>
+              <value/>
+            </choice>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="sourceLocalityStack">
+      <element name="sourceLocalityStack">
+        <optional>
+          <attribute name="connective">
+            <choice>
+              <value>and</value>
+              <value>or</value>
+              <value>from</value>
+              <value>to</value>
+              <value/>
+            </choice>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="sourceLocality"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="ul">
       <element name="ul">
         <attribute name="id">
@@ -1098,6 +1132,16 @@
     </define>
   </include>
   <!-- end overrides -->
+  <define name="image" combine="choice">
+    <element name="svg">
+      <oneOrMore>
+        <choice>
+          <text/>
+          <ref name="AnyElement"/>
+        </choice>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="MultilingualRenderingType">
     <choice>
       <value>common</value>
@@ -2631,4 +2675,30 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="XrefBody">
+    <zeroOrMore>
+      <ref name="XrefTarget"/>
+    </zeroOrMore>
+    <oneOrMore>
+      <ref name="PureTextElement"/>
+    </oneOrMore>
+  </define>
+  <define name="XrefTarget">
+    <element name="location">
+      <attribute name="target">
+        <data type="string">
+          <param name="pattern">\i\c*|\c+#\c+</param>
+        </data>
+      </attribute>
+      <attribute name="connective">
+        <choice>
+          <value>and</value>
+          <value>or</value>
+          <value>from</value>
+          <value>to</value>
+          <value/>
+        </choice>
+      </attribute>
+    </element>
+  </define>
 </grammar>

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)
-        url = "#{GH_ENDPOINT}#{ref.upcase.split.join '-'}.yaml"
+      def get_bipm(ref, agent) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+        url = "#{GH_ENDPOINT}#{ref.gsub(/[()]/, "").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
@@ -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.1".freeze
+  VERSION = "1.11.0".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.1"
+  spec.add_dependency "relaton-bib", "~> 1.11.0"
   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.1
+  version: 1.11.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-09 00:00:00.000000000 Z
+date: 2022-04-10 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.1
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: serrano
   requirement: !ruby/object:Gem::Requirement