relaton-bipm 1.9.0 → 1.10.2

data/grammars/reqt.rng

@@ -58,15 +58,23 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="tag"/>
+    </optional>
+    <optional>
+      <attribute name="multilingual-rendering">
+        <ref name="MultilingualRenderingType"/>
+      </attribute>
+    </optional>
     <optional>
       <ref name="reqtitle"/>
     </optional>
     <optional>
       <ref name="label"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="subject"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="reqinherit"/>
     </zeroOrMore>
@@ -80,6 +88,7 @@
         <ref name="verification"/>
         <ref name="import"/>
         <ref name="description"/>
+        <ref name="component"/>
       </choice>
     </zeroOrMore>
     <optional>
@@ -100,17 +109,23 @@
   </define>
   <define name="label">
     <element name="label">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="subject">
     <element name="subject">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="reqinherit">
     <element name="inherit">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="measurementtarget">
@@ -138,6 +153,12 @@
       <ref name="RequirementSubpart"/>
     </element>
   </define>
+  <define name="component">
+    <element name="component">
+      <attribute name="class"/>
+      <ref name="RequirementSubpart"/>
+    </element>
+  </define>
   <define name="reqt_references">
     <element name="references">
       <oneOrMore>
@@ -164,6 +185,14 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="tag"/>
+    </optional>
+    <optional>
+      <attribute name="multilingual-rendering">
+        <ref name="MultilingualRenderingType"/>
+      </attribute>
+    </optional>
     <oneOrMore>
       <ref name="BasicBlock"/>
     </oneOrMore>

data/lib/relaton_bipm/bipm_bibliographic_item.rb

@@ -28,12 +28,12 @@ module RelatonBipm
     def initialize(**args) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
       if args[:docstatus] && !STATUSES.include?(args[:docstatus].stage.value)
         warn "[relaton-bipm] Warning: invalid docstatus: #{args[:docstatus].stage.value}. "\
-        "It should be one of: #{STATUSES}"
+             "It should be one of: #{STATUSES}"
       end
 
       if args[:si_aspect] && !SI_ASPECTS.include?(args[:si_aspect])
         warn "[relaton-bipm] Warning: invalid si_aspect: #{args[:si_aspect]}. "\
-        "It should be one of: #{SI_ASPECTS}"
+             "It should be one of: #{SI_ASPECTS}"
       end
 
       @comment_period = args.delete :comment_period

data/lib/relaton_bipm/bipm_bibliography.rb

@@ -24,8 +24,9 @@ module RelatonBipm
       def magent # rubocop:disable Metrics/MethodLength
         a = Mechanize.new
         a.request_headers = {
-          "Accept" => "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,"\
-            "*/*;q=0.8,application/signed-exchange;v=b3;q=0.9",
+          "Accept" => "text/html,application/xhtml+xml,application/xml;q=0.9,"\
+                      "image/avif,image/webp,image/apng,"\
+                      "*/*;q=0.8,application/signed-exchange;v=b3;q=0.9",
           "Accept-Encoding" => "gzip, deflate, br",
           "Accept-Language" => "en-US,en;q=0.9,ru-RU;q=0.8,ru;q=0.7",
           "Cache-Control" => "max-age=0",
@@ -39,8 +40,9 @@ module RelatonBipm
       # @param agent [Mechanize]
       # @return [RelatonBipm::BipmBibliographicItem]
       def get_bipm(ref, agent)
-        url = "#{GH_ENDPOINT}#{ref.downcase.split.join '-'}.yaml"
+        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])
@@ -66,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
@@ -87,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
@@ -115,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
@@ -187,7 +192,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]
@@ -198,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
 
@@ -208,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,
@@ -292,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.9.0".freeze
+  VERSION = "1.10.2".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.9.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.9.0
+  version: 1.10.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-26 00:00:00.000000000 Z
+date: 2022-02-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.9.0
+        version: 1.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.10.1
 - !ruby/object:Gem::Dependency
   name: serrano
   requirement: !ruby/object:Gem::Requirement