relaton-itu 1.9.0 → 1.10.2

data/grammars/itu.rng

@@ -171,14 +171,9 @@
       </optional>
       <group>
         <choice>
-          <group>
-            <zeroOrMore>
-              <ref name="BasicBlock"/>
-            </zeroOrMore>
-            <zeroOrMore>
-              <ref name="note"/>
-            </zeroOrMore>
-          </group>
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
           <ref name="amend"/>
         </choice>
         <zeroOrMore>
@@ -186,6 +181,7 @@
             <ref name="clause-subsection"/>
             <ref name="terms"/>
             <ref name="definitions"/>
+            <ref name="floating-title"/>
           </choice>
         </zeroOrMore>
       </group>

data/grammars/reqt.rng

@@ -64,9 +64,9 @@
     <optional>
       <ref name="label"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="subject"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="reqinherit"/>
     </zeroOrMore>
@@ -80,6 +80,7 @@
         <ref name="verification"/>
         <ref name="import"/>
         <ref name="description"/>
+        <ref name="component"/>
       </choice>
     </zeroOrMore>
     <optional>
@@ -105,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">
@@ -138,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>

data/lib/relaton_itu/itu_bibliography.rb

@@ -39,7 +39,7 @@ module RelatonItu
       # @return [String] Relaton XML serialisation of reference
       def get(code, year = nil, opts = {}) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
         if year.nil?
-          /^(?<code1>[^\s]+\s[^\s]+)\s\((\d{2}\/)?(?<year1>\d+)\)$/ =~ code
+          /^(?<code1>[^\s]+\s[^\s]+)\s\((?:\d{2}\/)?(?<year1>\d+)\)$/ =~ code
           unless code1.nil?
             code = code1
             year = year1
@@ -78,35 +78,33 @@ module RelatonItu
 
       def search_filter(code, year) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
         %r{
-          ^(?<pref1>ITU)?(-(?<type1>\w))?\s?(?<code1>[^\s\/]+(?:\/\w[\.\d]+)?)
-          (\s\(?(?<ver1>v\d+)\)?)?
-          (\s\(((?<month1>\d{2})\/)?(?<year1>\d{4})\))?
-          (\s-\s(?<buldate1>\d{2}\.\w{1,4}\.\d{4}))?
-          (\s(?<corr1>(Amd|Cor|Amendment|Corrigendum)\.?\s?\d+))?
-          (\s\(((?<cormonth1>\d{2})\/)?(?<coryear1>\d{4})\))?
+          ^(?<pref1>ITU)?(?:-(?<type1>\w))?\s?(?<code1>[^\s/]+(?:/\w[.\d]+)?)
+          (?:\s\(?(?<ver1>v\d+)\)?)?
+          (?:\s\((?:(?<month1>\d{2})/)?(?<year1>\d{4})\))?
+          (?:\s-\s(?<buldate1>\d{2}\.\w{1,4}\.\d{4}))?
+          (?:\s(?<corr1>(?:Amd|Cor|Amendment|Corrigendum)\.?\s?\d+))?
+          (?:\s\((?:(?<cormonth1>\d{2})/)?(?<coryear1>\d{4})\))?
         }x =~ code
         year ||= year1
-        # docidrx = %r{\w+\.\d+|\w\sSuppl\.\s\d+} # %r{^ITU-T\s[^\s]+}
-        # c = code.sub(/Imp\s?/, "").match(docidrx).to_s
         warn "[relaton-itu] (\"#{code}\") fetching..."
         result = search(code)
-        code1.sub! /(?<=\.)Imp(?=\d)/, "" if result.gi_imp
+        code1.sub!(/(?<=\.)Imp(?=\d)/, "") if result.gi_imp
         if corr1
-          corr1.sub!(/[\.\s]+/, " ").sub!("Amendment", "Amd")
+          corr1.sub!(/[.\s]+/, " ").sub!("Amendment", "Amd")
           corr1.sub!("Corrigendum", "Corr")
         end
         result.select do |i|
           next true unless i.hit[:code]
 
           %r{
-            ^(?<pref2>ITU)?(-(?<type2>\w))?\s?(?<code2>[\S]+)
-            (\s\(?(?<ver2>v\d+)\)?)?
-            (\s\(((?<month2>\d{2})\/)?(?<year2>\d{4})\))?
-            (\s(?<corr2>(Amd|Cor)\.\s?\d+))?
-            (\s\(((?<cormonth2>\d{2})\/)?(?<coryear2>\d{4})\))?
+            ^(?<pref2>ITU)?(?:-(?<type2>\w))?\s?(?<code2>\S+)
+            (?:\s\(?(?<ver2>v\d+)\)?)?
+            (?:\s\((?:(?<month2>\d{2})/)?(?<year2>\d{4})\))?
+            (?:\s(?<corr2>(?:Amd|Cor)\.\s?\d+))?
+            (?:\s\((?:(?<cormonth2>\d{2})/)?(?<coryear2>\d{4})\))?
           }x =~ i.hit[:code]
-          /:[^\(]+\((?<buldate2>\d{2}\.\w{1,4}\.\d{4})\)/ =~ i.hit[:title]
-          corr2&.sub! /\.\s?/, " "
+          /:[^(]+\((?<buldate2>\d{2}\.\w{1,4}\.\d{4})\)/ =~ i.hit[:title]
+          corr2&.sub!(/\.\s?/, " ")
           pref1 == pref2 && (!type1 || type1 == type2) && code2.include?(code1) &&
             (!year || year == year2) && (!month1 || month1 == month2) &&
             corr1 == corr2 && (!coryear1 || coryear1 == coryear2) &&
@@ -124,7 +122,7 @@ module RelatonItu
       def isobib_results_filter(result, year)
         missed_years = []
         result.each do |r|
-          /\((\d{2}\/)?(?<pyear>\d{4})\)/ =~ r.hit[:code]
+          /\((?:\d{2}\/)?(?<pyear>\d{4})\)/ =~ r.hit[:code]
           if !year || year == pyear
             ret = r.fetch
             return { ret: ret } if ret

data/lib/relaton_itu/scrapper.rb

@@ -59,7 +59,7 @@ module RelatonItu
           copyright: fetch_copyright(hit.hit[:code], doc),
           link: fetch_link(doc),
           relation: fetch_relations(doc),
-          place: ["Geneva"]
+          place: ["Geneva"],
         )
       end
 
@@ -86,6 +86,9 @@ module RelatonItu
           language: "en",
           script: "Latn",
         }]
+      rescue Mechanize::ResponseCodeError => e
+        warn "HTTP Service Unavailable: #{e.message}"
+        []
       end
 
       # Get page.
@@ -109,7 +112,7 @@ module RelatonItu
         docids = doc.xpath(
           "//span[@id='ctl00_content_main_uc_rec_main_info1_rpt_main_ctl00_lbl_rec']",
           "//td[.='Identical standard:']/following-sibling::td",
-          "//div/table[1]/tr[4]/td/strong"
+          "//div/table[1]/tr[4]/td/strong",
         ).map { |c| createdocid c.text }
         docids << createdocid(title) unless docids.any?
         docids
@@ -119,18 +122,18 @@ module RelatonItu
       # @return [RelatonBib::DocumentIdentifier]
       def createdocid(text) # rubocop:disable Metrics/MethodLength
         %r{
-          ^(?<code>((ITU-\w|ISO\/IEC)\s)?[^\(:]+)
-          (\(((?<_month>\d{2})\/)?(?<_year>\d{4})\))?
-          (:[^\(]+\((?<buldate>\d{2}\.\w{1,4}\.\d{4})\))?
-          (\s(?<corr>(Amd|Cor)\.\s?\d+))?
+          ^(?<code>(?:(?:ITU-\w|ISO/IEC)\s)?[^(:]+)
+          (?:\((?:(?<_month>\d{2})/)?(?<_year>\d{4})\))?
+          (?::[^(]+\((?<buldate>\d{2}\.\w{1,4}\.\d{4})\))?
+          (?:\s(?<corr>(?:Amd|Cor)\.\s?\d+))?
           # (\s\(((?<_cormonth>\d{2})\/)?(?<_coryear>\d{4})\))?
         }x =~ text.squeeze(" ")
-        corr&.sub! /\.\s?/, " "
+        corr&.sub!(/\.\s?/, " ")
         id = [code.sub(/[[:space:]]$/, ""), corr].compact.join " "
         id += " - #{buldate}" if buldate
         type = id.match(%r{^\w+}).to_s
         type = "ITU" if type == "G"
-        RelatonBib::DocumentIdentifier.new(type: type, id: id)
+        RelatonBib::DocumentIdentifier.new(type: type, id: id, primary: true)
       end
 
       # Fetch status.
@@ -261,7 +264,7 @@ module RelatonItu
         links = [{ type: "src", content: doc.uri.to_s }]
         obp_elm = doc.at(
           '//a[@title="Persistent link to download the PDF file"]',
-          "//font[contains(.,'PDF')]/../.."
+          "//font[contains(.,'PDF')]/../..",
         )
         links << typed_link("obp", obp_elm) if obp_elm
         wrd_elm = doc.at("//font[contains(.,'Word')]/../..")
@@ -274,7 +277,7 @@ module RelatonItu
       def typed_link(type, elm)
         {
           type: type,
-          content: URI.join(HitCollection::DOMAIN + elm[:href].strip).to_s,
+          content: URI.join(HitCollection::DOMAIN, elm[:href].strip).to_s,
         }
       end
 

data/lib/relaton_itu/version.rb

@@ -1,3 +1,3 @@
 module RelatonItu
-  VERSION = "1.9.0".freeze
+  VERSION = "1.10.2".freeze
 end

data/relaton-itu.gemspec

@@ -36,5 +36,5 @@ Gem::Specification.new do |spec|
   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"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-itu
 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-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -142,14 +142,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
 description: 'RelatonItu: retrieve ITU Standards for bibliographic use using the BibliographicItem
   model'
 email: