relaton-bipm 1.7.2 → 1.9.0

data/grammars/reqt.rng

@@ -30,15 +30,34 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="number"/>
+    </optional>
     <optional>
       <attribute name="subsequence"/>
     </optional>
+    <optional>
+      <attribute name="keep-with-next">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="keep-lines-together">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <attribute name="id">
       <data type="ID"/>
     </attribute>
     <optional>
       <attribute name="filename"/>
     </optional>
+    <optional>
+      <attribute name="model"/>
+    </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="reqtitle"/>
     </optional>
@@ -48,9 +67,9 @@
     <optional>
       <ref name="subject"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="reqinherit"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="classification"/>
     </zeroOrMore>
@@ -135,6 +154,16 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="keep-with-next">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="keep-lines-together">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <oneOrMore>
       <ref name="BasicBlock"/>
     </oneOrMore>

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]
@@ -234,10 +207,10 @@ module RelatonBipm
       # @param agent [Mechanize]
       # @return [RelatonBipm::BipmBibliographicItem]
       def get_article(path, vol, ish, agent) # rubocop:disable Metrics/AbcSize
-        url = URI IOP_DOMAIN + path
-        rsp = agent.get url
+        rsp = agent.get path
+        url = rsp.uri
         bib = rsp.link_with(text: "BibTeX").href
-        rsp = agent.get URI IOP_DOMAIN + bib
+        rsp = agent.get bib
         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,
@@ -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.7.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

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
                        "bibliographic use using the BibliographicItem model"
   spec.homepage      = "https://github.com/relaton/relaton-bipm"
   spec.license       = "BSD-2-Clause"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
 
@@ -36,14 +36,14 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   # spec.add_development_dependency "debase"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "pry-byebug"
-  spec.add_development_dependency "rake", "~> 10.0"
+  # spec.add_development_dependency "rake", "~> 13.0"
   # spec.add_development_dependency "ruby-debug-ide"
   spec.add_development_dependency "ruby-jing"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "mechanize", "~> 2.7.6"
-  spec.add_dependency "relaton-bib", "~> 1.7.0"
+  spec.add_dependency "mechanize", "~> 2.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.7.2
+  version: 1.9.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-20 00:00:00.000000000 Z
+date: 2021-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement
@@ -128,28 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.6
+        version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.6
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: relaton-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: serrano
   requirement: !ruby/object:Gem::Requirement
@@ -218,7 +204,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="