relaton-un 1.7.1 → 1.10.0

data/grammars/reqt.rng

@@ -30,9 +30,22 @@
         <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>
@@ -40,17 +53,23 @@
       <attribute name="filename"/>
     </optional>
     <optional>
-      <ref name="reqtitle"/>
+      <attribute name="model"/>
     </optional>
     <optional>
-      <ref name="label"/>
+      <attribute name="type"/>
     </optional>
     <optional>
-      <ref name="subject"/>
+      <ref name="reqtitle"/>
     </optional>
     <optional>
-      <ref name="reqinherit"/>
+      <ref name="label"/>
     </optional>
+    <zeroOrMore>
+      <ref name="subject"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="reqinherit"/>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="classification"/>
     </zeroOrMore>
@@ -61,6 +80,7 @@
         <ref name="verification"/>
         <ref name="import"/>
         <ref name="description"/>
+        <ref name="component"/>
       </choice>
     </zeroOrMore>
     <optional>
@@ -86,12 +106,16 @@
   </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">
@@ -119,6 +143,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>
@@ -135,6 +165,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/grammars/un.rng

@@ -96,7 +96,10 @@
     <define name="sections">
       <element name="sections">
         <oneOrMore>
-          <ref name="clause"/>
+          <choice>
+            <ref name="clause"/>
+            <ref name="floating-title"/>
+          </choice>
         </oneOrMore>
       </element>
     </define>
@@ -104,6 +107,9 @@
       <optional>
         <ref name="doctype"/>
       </optional>
+      <optional>
+        <ref name="docsubtype"/>
+      </optional>
       <zeroOrMore>
         <ref name="submissionlanguage"/>
       </zeroOrMore>
@@ -175,19 +181,15 @@
         <ref name="section-title"/>
       </optional>
       <group>
-        <group>
-          <zeroOrMore>
-            <ref name="BasicBlock"/>
-          </zeroOrMore>
-          <zeroOrMore>
-            <ref name="note"/>
-          </zeroOrMore>
-        </group>
+        <zeroOrMore>
+          <ref name="BasicBlock"/>
+        </zeroOrMore>
         <zeroOrMore>
           <choice>
             <ref name="clause-subsection"/>
             <ref name="terms"/>
             <ref name="definitions"/>
+            <ref name="floating-title"/>
           </choice>
         </zeroOrMore>
       </group>
@@ -226,20 +228,16 @@
         <ref name="section-title"/>
       </optional>
       <group>
-        <group>
-          <zeroOrMore>
-            <ref name="BasicBlock"/>
-          </zeroOrMore>
-          <zeroOrMore>
-            <ref name="note"/>
-          </zeroOrMore>
-        </group>
+        <zeroOrMore>
+          <ref name="BasicBlock"/>
+        </zeroOrMore>
         <zeroOrMore>
           <choice>
             <ref name="annex-subsection"/>
             <ref name="terms"/>
             <ref name="definitions"/>
             <ref name="references"/>
+            <ref name="floating-title"/>
           </choice>
         </zeroOrMore>
       </group>
@@ -348,6 +346,9 @@
         </choice>
       </attribute>
       <ref name="bibdata"/>
+      <optional>
+        <ref name="misccontainer"/>
+      </optional>
       <optional>
         <ref name="boilerplate"/>
       </optional>
@@ -358,6 +359,9 @@
       <zeroOrMore>
         <ref name="annex"/>
       </zeroOrMore>
+      <zeroOrMore>
+        <ref name="indexsect"/>
+      </zeroOrMore>
     </element>
   </define>
 </grammar>

data/lib/relaton_un/hit.rb

@@ -75,7 +75,7 @@ module RelatonUn
         distribution: fetch_distribution,
         editorialgroup: fetch_editorialgroup,
         classification: fetch_classification,
-        job_number: hit[:job_number]
+        job_number: hit[:job_number],
       )
     end
     # rubocop:enable Metrics/MethodLength
@@ -109,7 +109,7 @@ module RelatonUn
 
     # @return [Array<RelatonBib::TypedUri>]
     def fetch_link
-      hit[:link].map { |l| RelatonBib::TypedUri.new **l }
+      hit[:link].map { |l| RelatonBib::TypedUri.new(**l) }
     end
 
     # @return [Array<String>]
@@ -128,10 +128,10 @@ module RelatonUn
     end
 
     # @return [RelatonUn::EditorialGroup, NilClass]
-    def fetch_editorialgroup
-      tc = hit[:ref].match(/^[\S]+/).to_s.split(/\/|-/).reduce([]) do |m, v|
+    def fetch_editorialgroup # rubocop:disable Metrics/AbcSize
+      tc = hit[:ref].match(/^\S+/).to_s.split(/\/|-/).reduce([]) do |m, v|
         if BODY[v] then m << BODY[v]
-        elsif v.match? /(AC|C|CN|CONF|GC|SC|Sub|WG).\d+|PC/ then m << v
+        elsif v.match?(/(AC|C|CN|CONF|GC|SC|Sub|WG).\d+|PC/) then m << v
         else m
         end
       end.uniq

data/lib/relaton_un/processor.rb

@@ -29,7 +29,7 @@ module RelatonUn
     # @return [RelatonIsoBib::IsoBibliographicItem]
     def hash_to_bib(hash)
       item_hash = ::RelatonUn::HashConverter.hash_to_bib(hash)
-      ::RelatonUn::UnBibliographicItem.new item_hash
+      ::RelatonUn::UnBibliographicItem.new(**item_hash)
     end
 
     # Returns hash of XML grammar

data/lib/relaton_un/un_bibliographic_item.rb

@@ -25,13 +25,13 @@ module RelatonUn
     def initialize(**args)
       if args[:distribution] && !DISTRIBUTIONS.has_value?(args[:distribution])
         warn "[relaton-un] WARNING: invalid distribution: "\
-        "#{args[:distribution]}"
+             "#{args[:distribution]}"
       end
       @submissionlanguage = args.delete :submissionlanguage
       @distribution = args.delete :distribution
       @session = args.delete :session
       @job_number = args.delete :job_number
-      super **args
+      super(**args)
     end
 
     # @param opts [Hash]
@@ -40,7 +40,7 @@ module RelatonUn
     # @option opts [String] :lang language
     # @return [String] XML
     def to_xml(**opts) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
-      super **opts do |b|
+      super(**opts) do |b|
         b.ext do
           b.doctype doctype if doctype
           submissionlanguage&.each { |sl| b.submissionlanguage sl }
@@ -68,7 +68,7 @@ module RelatonUn
     # @param prefix [String]
     # @return [String]
     def to_asciibib(prefix = "") # rubocop:disable Metrics/AbcSize
-      pref = prefix.empty? ? prefix : prefix + "."
+      pref = prefix.empty? ? prefix : "#{prefix}."
       out = super
       submissionlanguage.each do |sl|
         out += "#{pref}submissionlanguage:: #{sl}\n"

data/lib/relaton_un/un_bibliography.rb

@@ -10,8 +10,8 @@ module RelatonUn
         HitCollection.new text
       rescue SocketError, Errno::EINVAL, Errno::ECONNRESET, EOFError,
              Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,
-             Net::ProtocolError, Net::ReadTimeout, OpenSSL::SSL::SSLError,
-             Errno::ETIMEDOUT => e
+             Net::ProtocolError, Net::ReadTimeout, Net::OpenTimeout,
+             OpenSSL::SSL::SSLError, Errno::ETIMEDOUT => e
         raise RelatonBib::RequestError,
               "Could not access #{HitCollection::DOMAIN}: #{e.message}"
       end
@@ -22,7 +22,7 @@ module RelatonUn
       # @return [RelatonUn::UnBibliographicItem]
       def get(ref, _year = nil, _opts = {})
         warn "[relaton-un] (\"#{ref}\") fetching..."
-        /^(UN\s)?(?<code>.*)/ =~ ref
+        /^(?:UN\s)?(?<code>.*)/ =~ ref
         result = isobib_search_filter(code)
         if result
           warn "[relaton-un] (\"#{ref}\") "\

data/lib/relaton_un/version.rb

@@ -1,3 +1,3 @@
 module RelatonUn
-  VERSION = "1.7.1".freeze
+  VERSION = "1.10.0".freeze
 end

data/lib/relaton_un/xml_parser.rb

@@ -6,7 +6,7 @@ module RelatonUn
       # @param item_hash [Hash]
       # @return [RelatonBib::BibliographicItem]
       def bib_item(item_hash)
-        UnBibliographicItem.new **item_hash
+        UnBibliographicItem.new(**item_hash)
       end
 
       # @param item [Nokogiri::XML::Element]
@@ -27,7 +27,7 @@ module RelatonUn
 
       # @param ext [Nokogiri::XML::Element]
       # @return [RelatonUn::Session]
-      def fetch_session(ext) # rubocop:disable Metrics/CyclomaticComplexity
+      def fetch_session(ext) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
         session = ext.at "./session"
         RelatonUn::Session.new(
           session_number: session.at("number")&.text,
@@ -37,7 +37,7 @@ module RelatonUn
           subitem_name: session.xpath("subitem-name").map(&:text),
           collaborator: session.at("collaborator")&.text,
           agenda_id: session.at("agenda-id")&.text,
-          item_footnote: session.at("item-footnote")&.text
+          item_footnote: session.at("item-footnote")&.text,
         )
       end
       # rubocop:enable Metrics/AbcSize, Metrics/MethodLength

data/relaton_un.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
                        "use using the IsoBibliographicItem model"
   spec.homepage      = "https://github.com/relaton/relaton-un"
   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["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
@@ -32,10 +32,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  # spec.add_development_dependency "debase"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "rake", "~> 10.0"
-  # spec.add_development_dependency "ruby-debug-ide"
   spec.add_development_dependency "ruby-jing"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "vcr"
@@ -43,7 +41,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "faraday"
   spec.add_dependency "http-cookie"
-  spec.add_dependency "relaton-bib", "~> 1.7.0"
+  spec.add_dependency "relaton-bib", "~> 1.10.0"
   spec.add_dependency "unf_ext", ">= 0.0.7.7"
 end
 # rubocop:enable Metrics/BlockLength

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-un
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.10.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-17 00:00:00.000000000 Z
+date: 2022-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: unf_ext
   requirement: !ruby/object:Gem::Requirement
@@ -201,14 +201,14 @@ 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:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: 'RelatonIso: retrieve CC Standards for bibliographic use using the IsoBibliographicItem