relaton-bipm 1.8.2 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f50f16e84fc01b3abbf19cac52ba2ebb265e5bb9dee2d5bc3b9838cc9246842
-  data.tar.gz: 96358aff1452e3bcd2577b1f7e812c840b6a868348c7c4e813018761d07158b5
+  metadata.gz: a37dd98a306be1bde644dfe27bc307910628ec86f85a28c217ae2c23557a803b
+  data.tar.gz: a1d913261195a1ea7000610575be81e01c0b17b41041f6793e36612e5aa0e7ee
 SHA512:
-  metadata.gz: 16d31cad3f3ebc75b1e0e0d36dded2b348c9c8e66f33ac06f512cb2dab120a98f5104b784d5269a8294fd222679861cc9dab71ec34be5ff94b859771bd5efc6b
-  data.tar.gz: 232e89f4a68d18ebcfaba7ecf52a17a7a06950e42e65fdc50cb95dcf29476176f82d62ad7e635939e2ba6f9ff3525f2ff263db20660f0876d02fcd46458a6913
+  metadata.gz: b7ed6f8ffa91da6c628398f1b17e840c674367a44d25be5034b2a3faa9f118a28f52a9a5c77d4106fec0a00ffa11473cbb8e7c7e9b87e22d6c7698c549dbe8ca
+  data.tar.gz: 12995c75ce50f208205f88450bb24d7d1f9e40f7cb1b17485d96fc7b6f86519538231d53ba9faf34447304a854999da6df2fd09a0b34545be782af879217e85d

data/.github/workflows/rake.yml

@@ -16,19 +16,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.7', '2.6', '2.5' ]
+        ruby: [ '3.0', '2.7', '2.6', '2.5' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
         experimental: [ false ]
-        include:
-          - ruby: '3.0'
-            os: 'ubuntu-latest'
-            experimental: true
-          - ruby: '3.0'
-            os: 'windows-latest'
-            experimental: true
-          - ruby: '3.0'
-            os: 'macos-latest'
-            experimental: true
     steps:
       - uses: actions/checkout@v2
         with:

data/grammars/biblio.rng

@@ -787,6 +787,7 @@
       <value>adapted</value>
       <value>vote-started</value>
       <value>vote-ended</value>
+      <value>announced</value>
     </choice>
   </define>
   <define name="bdate">

data/grammars/bipm.rng

@@ -245,6 +245,9 @@
       <optional>
         <ref name="doctype"/>
       </optional>
+      <optional>
+        <ref name="docsubtype"/>
+      </optional>
       <ref name="editorialgroup"/>
       <optional>
         <ref name="comment-period"/>

data/grammars/isodoc.rng

@@ -45,6 +45,11 @@
         <optional>
           <attribute name="alt"/>
         </optional>
+        <optional>
+          <attribute name="updatetype">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <text/>
       </element>
     </define>
@@ -199,6 +204,18 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="dt">
+      <element name="dt">
+        <optional>
+          <attribute name="id">
+            <data type="ID"/>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="TextElement"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="example">
       <element name="example">
         <attribute name="id">
@@ -543,6 +560,9 @@
     </define>
     <define name="BibDataExtensionType">
       <ref name="doctype"/>
+      <optional>
+        <ref name="docsubtype"/>
+      </optional>
       <optional>
         <ref name="editorialgroup"/>
       </optional>
@@ -890,6 +910,14 @@
     </define>
   </include>
   <!-- end overrides -->
+  <define name="docsubtype">
+    <element name="subdoctype">
+      <ref name="DocumentSubtype"/>
+    </element>
+  </define>
+  <define name="DocumentSubtype">
+    <text/>
+  </define>
   <define name="colgroup">
     <element name="colgroup">
       <oneOrMore>
@@ -939,7 +967,34 @@
   <define name="concept">
     <element name="concept">
       <optional>
-        <attribute name="term"/>
+        <attribute name="ital">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="ref">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <element name="refterm">
+          <zeroOrMore>
+            <choice>
+              <ref name="PureTextElement"/>
+              <ref name="stem"/>
+            </choice>
+          </zeroOrMore>
+        </element>
+      </optional>
+      <optional>
+        <element name="renderterm">
+          <zeroOrMore>
+            <choice>
+              <ref name="PureTextElement"/>
+              <ref name="stem"/>
+            </choice>
+          </zeroOrMore>
+        </element>
       </optional>
       <choice>
         <ref name="eref"/>
@@ -965,6 +1020,9 @@
       </attribute>
       <attribute name="name"/>
       <attribute name="action"/>
+      <optional>
+        <attribute name="class"/>
+      </optional>
       <zeroOrMore>
         <choice>
           <ref name="TextElement"/>
@@ -1191,13 +1249,17 @@
   </define>
   <define name="IsoWorkgroup">
     <optional>
-      <attribute name="number">
-        <data type="int"/>
-      </attribute>
+      <attribute name="number"/>
     </optional>
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="identifier"/>
+    </optional>
+    <optional>
+      <attribute name="prefix"/>
+    </optional>
     <text/>
   </define>
   <define name="ics">
@@ -1459,26 +1521,26 @@
     <optional>
       <ref name="section-title"/>
     </optional>
-    <group>
+    <choice>
       <choice>
         <group>
-          <zeroOrMore>
+          <oneOrMore>
             <ref name="BasicBlock"/>
-          </zeroOrMore>
+          </oneOrMore>
           <zeroOrMore>
             <ref name="note"/>
           </zeroOrMore>
         </group>
         <ref name="amend"/>
       </choice>
-      <zeroOrMore>
+      <oneOrMore>
         <choice>
           <ref name="clause-subsection"/>
           <ref name="terms"/>
           <ref name="definitions"/>
         </choice>
-      </zeroOrMore>
-    </group>
+      </oneOrMore>
+    </choice>
   </define>
   <define name="Annex-Section">
     <optional>

data/lib/relaton_bipm/bipm_bibliographic_item.rb

@@ -46,7 +46,7 @@ module RelatonBipm
     # @return [RelatonBipm::BipmBibliographicItem]
     def self.from_hash(hash)
       item_hash = ::RelatonBipm::HashConverter.hash_to_bib(hash)
-      new **item_hash
+      new(**item_hash)
     end
 
     # @param opts [Hash]
@@ -83,7 +83,7 @@ module RelatonBipm
     # @param prefix [String]
     # @return [String]
     def to_asciibib(prefix = "")
-      pref = prefix.empty? ? prefix : prefix + "."
+      pref = prefix.empty? ? prefix : "#{prefix}."
       out = super
       out += comment_period.to_asciibib prefix if comment_period
       out += "#{pref}si_aspect:: #{si_aspect}\n" if si_aspect

data/lib/relaton_bipm/bipm_bibliography.rb

@@ -4,38 +4,11 @@ module RelatonBipm
   class BipmBibliography
     GH_ENDPOINT = "https://raw.githubusercontent.com/relaton/relaton-data-bipm/master/data/".freeze
     IOP_DOMAIN = "https://iopscience.iop.org".freeze
-    USERAGENTS = [
-      "Mozilla/5.0 CK={} (Windows NT 6.1; WOW64; Trident/7.0; rv:11.0) like Gecko",
-      "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.121 Safari/537.36",
-      "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 1.1.4322)",
-      "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)",
-      "Mozilla/5.0 (Windows NT 6.1; WOW64; Trident/7.0; rv:11.0) like Gecko",
-      "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; WOW64; Trident/5.0; KTXN)",
-      "Mozilla/5.0 (Windows NT 5.1; rv:7.0.1) Gecko/20100101 Firefox/7.0.1",
-      "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)",
-      "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:54.0) Gecko/20100101 Firefox/54.0",
-      "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:40.0) Gecko/20100101 Firefox/40.1",
-      "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.157 Safari/537.36",
-      "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0)",
-      "Mozilla/5.0 (Windows NT 10.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.121 Safari/537.36",
-      "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_5) AppleWebKit/605.1.15 (KHTML, like Gecko)",
-      "Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; rv:11.0) like Gecko",
-      "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:18.0) Gecko/20100101 Firefox/18.0",
-      "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 1.1.4322; .NET CLR 2.0.50727)",
-      "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/605.1.15 (KHTML, like Gecko)",
-      "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; .NET CLR 1.1.4322)",
-      "Mozilla/5.0 (Windows NT 6.1; Trident/7.0; rv:11.0) like Gecko",
-      "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0)",
-      "Mozilla/5.0 (Linux; U; Android 2.2) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1",
-      "Mozilla/5.0 (Windows NT 5.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.71 Safari/537.36",
-      "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.1 (KHTML, like Gecko) Chrome/21.0.1180.83 Safari/537.1",
-      "Mozilla/4.0 (compatible; MSIE 9.0; Windows NT 6.1)",
-    ].freeze
 
     class << self
       # @param text [String]
       # @return [RelatonBipm::BipmBibliographicItem]
-      def search(text, _year = nil, _opts = {})
+      def search(text, _year = nil, _opts = {}) # rubocop:disable Metrics/AbcSize
         warn "[relaton-bipm] (\"#{text}\") fetching..."
         ref = text.sub(/^BIPM\s/, "")
         item = ref.match?(/^Metrologia/i) ? get_metrologia(ref, magent) : get_bipm(ref, magent)
@@ -48,7 +21,7 @@ module RelatonBipm
       end
 
       # @return [Mechanize]
-      def magent
+      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,"\
@@ -57,8 +30,8 @@ module RelatonBipm
           "Accept-Language" => "en-US,en;q=0.9,ru-RU;q=0.8,ru;q=0.7",
           "Cache-Control" => "max-age=0",
           "Upgrade-Insecure-Requests" => "1",
-          "User-Agent" => USERAGENTS.shuffle.first,
         }
+        a.user_agent_alias = Mechanize::AGENT_ALIASES.map(&:first).shuffle.first
         a
       end
 
@@ -66,12 +39,12 @@ 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.downcase.split.join '-'}.yaml"
         resp = agent.get url
         return unless resp.code == "200"
 
         bib_hash = HashConverter.hash_to_bib YAML.safe_load(resp.body, [Date])
-        BipmBibliographicItem.new **bib_hash
+        BipmBibliographicItem.new(**bib_hash)
       end
 
       # @param ref [String]
@@ -79,7 +52,7 @@ module RelatonBipm
       # @return [RelatonBipm::BipmBibliographicItem]
       def get_metrologia(ref, agent)
         agent.redirect_ok = false
-        ref_arr = ref.split(" ")
+        ref_arr = ref.split
         case ref_arr.size
         when 1 then get_journal agent
         when 2 then get_volume ref_arr[1], agent
@@ -91,7 +64,7 @@ module RelatonBipm
       # @param agent [Mechanize]
       # @return [RelatonBipm::BipmBibliographicItem]
       def get_journal(agent)
-        url = IOP_DOMAIN + "/journal/0026-1394"
+        url = "#{IOP_DOMAIN}/journal/0026-1394"
         rsp = agent.get url
         rel = rsp.xpath('//select[@id="allVolumesSelector"]/option').map do |v|
           { type: "partOf", bibitem: journal_rel(v) }
@@ -129,7 +102,7 @@ module RelatonBipm
         docid = doc_id [vol, ish]
         t = elm.at "p"
         title_fref = t ? { title: titles(t.text) } : { formattedref: fref(docid.id) }
-        BipmBibliographicItem.new **title_fref, docid: [docid], link: blink(url)
+        BipmBibliographicItem.new(**title_fref, docid: [docid], link: blink(url))
       end
 
       # @param title [String]
@@ -248,7 +221,7 @@ module RelatonBipm
       # @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: "standard", language: ["en"], script: ["Latn"], **args,
         )
       end
 
@@ -291,7 +264,7 @@ module RelatonBipm
       # @return [Array<Hash>]
       def btcontrib(bibtex)
         surname, initial = bibtex.author.split ", "
-        initial = initial.split(" ").map { |i| RelatonBib::LocalizedString.new i, "en", "Latn" }
+        initial = initial.split.map { |i| RelatonBib::LocalizedString.new i, "en", "Latn" }
         surname = RelatonBib::LocalizedString.new surname, "en", "Latn"
         name = RelatonBib::FullName.new surname: surname, initial: initial
         author = RelatonBib::Person.new name: name

data/lib/relaton_bipm/comment_periond.rb

@@ -31,7 +31,7 @@ module RelatonBipm
     # @param prefix [String]
     # @return [String]
     def to_asciibib(prefix)
-      pref = prefix.empty? ? prefix : prefix + "."
+      pref = prefix.empty? ? prefix : "#{prefix}."
       pref += "commentperiod"
       out = "#{pref}.from:: #{from}\n"
       out += "#{pref}.to:: #{to}\n" if to

data/lib/relaton_bipm/committee.rb

@@ -28,7 +28,7 @@ module RelatonBipm
     # @param count [Integer]
     # @return [String]
     def to_asciibib(prefix, count = 1)
-      pref = prefix.empty? ? prefix : prefix + "."
+      pref = prefix.empty? ? prefix : "#{prefix}."
       pref += "committee"
       out = count > 1 ? "#{pref}::\n" : ""
       out += "#{pref}.acronym:: #{acronym}\n"
@@ -39,8 +39,9 @@ module RelatonBipm
     def to_hash
       hash = { "acronym" => acronym }
       cnt = content.to_hash
-      if cnt.is_a? Array then hash["variants"] = cnt
-      elsif cnt.is_a? Hash then hash.merge! cnt
+      case cnt
+      when Array then hash["variants"] = cnt
+      when Hash then hash.merge! cnt
       else hash["content"] = cnt
       end
       hash

data/lib/relaton_bipm/editorial_group.rb

@@ -23,7 +23,7 @@ module RelatonBipm
     # @param prefix [String]
     # @return [String]
     def to_asciibib(prefix = "") # rubocop:disable Metrics/AbcSize
-      pref = prefix.empty? ? prefix : prefix + "."
+      pref = prefix.empty? ? prefix : "#{prefix}."
       pref += "editorialgroup"
       out = ""
       committee.each { |c| out += c.to_asciibib pref, committee.size }

data/lib/relaton_bipm/hash_converter.rb

@@ -23,14 +23,13 @@ module RelatonBipm
       # @param item_hash [Hash]
       # @return [RelatonBib::BibliographicItem]
       def bib_item(item_hash)
-        BipmBibliographicItem.new **item_hash
+        BipmBibliographicItem.new(**item_hash)
       end
 
       # @param ret [Hash]
       def title_hash_to_bib(ret)
-        ret[:title] &&= array(ret[:title]).reduce(
-          RelatonBib::TypedTitleStringCollection.new
-        ) do |m, t|
+        ret[:title] &&= array(ret[:title])
+          .reduce(RelatonBib::TypedTitleStringCollection.new) do |m, t|
           m << if t.is_a? Hash
                  RelatonBib::TypedTitleString.new(**t)
                else
@@ -55,16 +54,14 @@ module RelatonBipm
       # @param ret [Hash]
       def dates_hash_to_bib(ret)
         super
-        ret[:date] &&= ret[:date].map do |d|
-          BibliographicDate.new **d
-        end
+        ret[:date] &&= ret[:date].map { |d| BibliographicDate.new(**d) }
       end
 
       # @param ret [Hash]
       def relations_hash_to_bib(ret)
         super
         ret[:relation] &&= ret[:relation].map do |r|
-          RelatonBipm::DocumentRelation.new **r
+          RelatonBipm::DocumentRelation.new(**r)
         end
       end
 
@@ -77,7 +74,7 @@ module RelatonBipm
             content = RelatonBib::LocalizedString.new vars
             Committee.new acronym: c[:acronym], content: content
           else
-            Committee.new **c
+            Committee.new(**c)
           end
         end
         wg = array(ret[:editorialgroup][:workgroup]).map do |w|
@@ -100,7 +97,7 @@ module RelatonBipm
       # @param ret [Hash]
       def structuredidentifier_hash_to_bib(ret)
         ret[:structuredidentifier] &&= StructuredIdentifier.new(
-          **ret[:structuredidentifier]
+          **ret[:structuredidentifier],
         )
       end
     end

data/lib/relaton_bipm/version.rb

@@ -1,3 +1,3 @@
 module RelatonBipm
-  VERSION = "1.8.2".freeze
+  VERSION = "1.9.0".freeze
 end

data/lib/relaton_bipm/xml_parser.rb

@@ -20,7 +20,7 @@ module RelatonBipm
       # @param item_hash [Hash]
       # @return [RelatonBipm::BipmBibliographicItem]
       def bib_item(item_hash)
-        BipmBibliographicItem.new **item_hash
+        BipmBibliographicItem.new(**item_hash)
       end
 
       # @param item [Nokogiri::XML::Element]

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.8.0"
+  spec.add_dependency "relaton-bib", "~> 1.9.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.8.2
+  version: 1.9.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-01 00:00:00.000000000 Z
+date: 2021-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: serrano
   requirement: !ruby/object:Gem::Requirement