relaton-un 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3564e5435624e31a03dba3819f040dd8802d68ca366c908205b56efc24e3176a
-  data.tar.gz: 274b0d5b0f27e7cf86d9dc3673d701f36ca47a6527b51253c2e9c26faea0b32c
+  metadata.gz: 1b64d7b0f28b07e64887e9364f5f5e6ac208b56e41b98b4510bf9d390d196158
+  data.tar.gz: a64346fb10bd24bfa6b4ca63a1e5fc6c34e696b9a76ed79bb162eb599a3cf8a6
 SHA512:
-  metadata.gz: e438e93982e704d1f78a48c660529271d9d4c5e8b7b0f7dc29670c582587b3fbe217415ca193693f3c22f5720c0823abcd23d87ba444154130e7dcbb6a01acf7
-  data.tar.gz: e4bbd63374c496b898f796d1c4d30a4412c83eb715e77f0cab7b67aec4ba0136f36b5d0d19d3a2c545f917cb9cb95bd1cd21f002563b91a9713b3a9b245c61e9
+  metadata.gz: 3733280407058b932f89d5bf7bafd4bd00eaa3669e5d87cc7eab54f0cc0b1e16a412cb5b0d2e20777f2cfb40b6c98ddee3ac63b7174ce28892025cea80693bc9
+  data.tar.gz: 56d9ec70ddda0db1f8849877207cbd82d27bca6011f4916326d5ce456a86385c76ba6974c97b5a34ad8c278dc5afeb1c9a5488120b742c4eccae4af1164038fa

data/.github/workflows/rake.yml

@@ -16,19 +16,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.7', '2.6', '2.5', '2.4' ]
+        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/.rubocop.yml

@@ -5,6 +5,6 @@
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
 Rails:
   Enabled: false

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/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/grammars/un.rng

@@ -104,6 +104,9 @@
       <optional>
         <ref name="doctype"/>
       </optional>
+      <optional>
+        <ref name="docsubtype"/>
+      </optional>
       <zeroOrMore>
         <ref name="submissionlanguage"/>
       </zeroOrMore>

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_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.8.0".freeze
+  VERSION = "1.9.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.8.0"
+  spec.add_dependency "relaton-bib", "~> 1.9.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.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-17 00:00:00.000000000 Z
+date: 2021-08-26 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.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: unf_ext
   requirement: !ruby/object:Gem::Requirement
@@ -201,7 +201,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:
   - - ">="