relaton-itu 1.10.0 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f1ecc3ead7e6a89d9c68a6159bbde9f40c8c627073c4c502280f085197d2b9c
-  data.tar.gz: 6e78adda061d6e628f4659a785906d0e85dbafd20055fa530c04f2c671c7297e
+  metadata.gz: a8796a2554f57885c83de19e32da701739f5c511e092a8abf4113061b598ae35
+  data.tar.gz: 976353ac63cd5e3b5a625cac2012995601ec7d8d3af5563e72e57cf5a6462bf0
 SHA512:
-  metadata.gz: '003209fe48895391ed4cf7e4bbac2facf9cdc0a7ea2d09986c9c19cdc3b0f184a611ad621f61e3919297a94eb0081e973ce67ecbbf3686ccafef3cb07f9cb7f8'
-  data.tar.gz: 57147128da6c591a7a97e9d5581e5c83dd64349539f87b7f1af6bc82b97b9be00bd9f016049a1c6e19488a231705213cd34864c7e587be9f9c00cac7523cc596
+  metadata.gz: 338f6a059cdbfeba44c7a08a54193f1a5f8f423b53d8088d966379b7af6b6bf31ec03b9af441fe8b4daf0f80dc784e53c8fbbddda494b41aa9d7638231c9cec9
+  data.tar.gz: 9c8db8b401cc4f3fef51611d528d957f9924cb9686c17e495846b3f4afde903cab27e61b2e94d51160b13f9234f99b82d7605f91836c463eb07fe5f113ad34af

data/grammars/biblio.rng

@@ -209,9 +209,6 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="uri"/>
-      </zeroOrMore>
     </element>
   </define>
   <define name="fullname">
@@ -828,6 +825,11 @@
       <optional>
         <attribute name="scope"/>
       </optional>
+      <optional>
+        <attribute name="primary">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <text/>
     </element>
   </define>

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
 
@@ -109,7 +109,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 +119,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 +261,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')]/../..")

data/lib/relaton_itu/version.rb

@@ -1,3 +1,3 @@
 module RelatonItu
-  VERSION = "1.10.0".freeze
+  VERSION = "1.10.1".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.10.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.10.0
+  version: 1.10.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-30 00:00:00.000000000 Z
+date: 2022-02-09 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.10.0
+        version: 1.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.10.1
 description: 'RelatonItu: retrieve ITU Standards for bibliographic use using the BibliographicItem
   model'
 email: