relaton-itu 1.6.0 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a90a0ac90df75b22459689d60779ead3ca464ed5a72c8969bed2fec390d89214
-  data.tar.gz: 58ad948fd0f85362b7f3c95a26e0dd0ce30a764e73f443232792976e9e5efa79
+  metadata.gz: cd478e1103e026b9ff40937a19dccc0166da6f839fc2fb216a59ac306b4958f1
+  data.tar.gz: 12bc7a7304aadb7ea91df2bc618b49ef1333ea58d577c760e9273c955fd5fd01
 SHA512:
-  metadata.gz: e5a1771fd84cb59f5465ff86a6e1b681f1ad43af97ee3f3bd4cb1b164a7c1efcbcea81d1efabbd47b0f0e949b053f4269a00818beb33feda53db5e5401beafd7
-  data.tar.gz: 330332c8e964bda7b2ca7678591d628c99925a8650e4854c40994c5c57bfffebe847ebdacd83ac1a8146f250cfeabfd2242f736855ce873a2b49583da33592f4
+  metadata.gz: a4ee1c7e0c5ff26729f598b744035e8ebbf285703f04da910a978d38f3e3a9dc44f9e76d4bc17e6257e443b953c5dd218526305bd95106af410ddbcc667db83f
+  data.tar.gz: b10b5dc734cfed86b6653e8d0f56257ac52a4e06718c30a9256897eecd11a03642ded7820cf7d9797d2c3c7731ccc093035b6e7a7ab4477b6787f120449ca494

data/.github/workflows/rake.yml

@@ -0,0 +1,46 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
+name: rake
+
+on:
+  push:
+    branches: [ master, main ]
+    tags: [ v* ]
+  pull_request:
+
+jobs:
+  rake:
+    name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '2.7', '2.6', '2.5', '2.4' ]
+        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:
+          submodules: true
+
+      # https://github.com/ruby-debug/debase/issues/89#issuecomment-686827382
+      - if: matrix.os == 'macos-latest' && matrix.ruby == '2.5'
+        run: echo BUNDLE_BUILD__DEBASE="--with-cflags=\"-Wno-error=implicit-function-declaration\"" >> $GITHUB_ENV
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - run: bundle exec rake

data/README.adoc

@@ -87,6 +87,39 @@ RelatonItu::ItuBibliography.get("ITU-T L.163", "2018", {})
 ...
 ----
 
+=== Get amendment
+[source,ruby]
+----
+RelatonItu::ItuBibliography.get "ITU-T G.989.2/Amd 1"
+[relaton-itu] ("ITU-T G.989.2/Amd 1") fetching...
+[relaton-itu] ("ITU-T G.989.2/Amd 1") found ITU-T G.989.2/Amd 1
+=> #<RelatonItu::ItuBibliographicItem:0x007fe5409e5840
+...
+----
+
+=== Get ITU-R documents
+
+[source,ruby]
+----
+RelatonItu::ItuBibliography.get "ITU-R REC-BO.600-1"
+[relaton-itu] ("ITU-R REC-BO.600-1") fetching...
+[relaton-itu] ("ITU-R REC-BO.600-1") found R-REC-BO.600-1
+=> #<RelatonItu::ItuBibliographicItem:0x007f84e9930498
+...
+----
+
+=== Get ITU-R Radio Regulations (RR)
+
+[source,ruby]
+----
+RelatonItu::ItuBibliography.get 'ITU-R RR (2020)'
+[relaton-itu] ("ITU-R RR") fetching...
+[relaton-itu] WARNING: invalid doctype: publication
+[relaton-itu] ("ITU-R RR") found ITU-R RR
+=> #<RelatonItu::ItuBibliographicItem:0x007fb4b55eb660
+...
+----
+
 === Create bibliographic item form YAML
 [source,ruby]
 ----

data/grammars/isodoc.rng

@@ -24,6 +24,14 @@
     <start>
       <ref name="standard-document"/>
     </start>
+    <define name="doctype">
+      <element name="doctype">
+        <optional>
+          <attribute name="abbreviation"/>
+        </optional>
+        <ref name="DocumentType"/>
+      </element>
+    </define>
     <define name="hyperlink">
       <element name="link">
         <attribute name="target">
@@ -141,6 +149,11 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="key">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <oneOrMore>
           <ref name="dt"/>
           <ref name="dd"/>
@@ -1164,49 +1177,7 @@
   </define>
   <define name="annex">
     <element name="annex">
-      <optional>
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="language"/>
-      </optional>
-      <optional>
-        <attribute name="script"/>
-      </optional>
-      <optional>
-        <attribute name="inline-header">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
-      <attribute name="obligation">
-        <choice>
-          <value>normative</value>
-          <value>informative</value>
-        </choice>
-      </attribute>
-      <optional>
-        <ref name="section-title"/>
-      </optional>
-      <group>
-        <group>
-          <zeroOrMore>
-            <ref name="BasicBlock"/>
-          </zeroOrMore>
-          <zeroOrMore>
-            <ref name="note"/>
-          </zeroOrMore>
-        </group>
-        <zeroOrMore>
-          <choice>
-            <ref name="annex-subsection"/>
-            <ref name="terms"/>
-            <ref name="definitions"/>
-            <ref name="references"/>
-          </choice>
-        </zeroOrMore>
-      </group>
+      <ref name="Annex-Section"/>
     </element>
   </define>
   <define name="terms">

data/grammars/itu.rng

@@ -41,6 +41,9 @@
         <value>technical-report</value>
         <value>joint-itu-iso-iec</value>
         <value>resolution</value>
+        <value>service-publication</value>
+        <value>handbook</value>
+        <value>question</value>
       </choice>
     </define>
     <define name="editorialgroup">
@@ -97,6 +100,9 @@
       <optional>
         <ref name="meeting"/>
       </optional>
+      <optional>
+        <ref name="meeting-place"/>
+      </optional>
       <optional>
         <ref name="meeting-date"/>
       </optional>
@@ -127,6 +133,14 @@
   </include>
   <define name="meeting">
     <element name="meeting">
+      <optional>
+        <attribute name="acronym"/>
+      </optional>
+      <text/>
+    </element>
+  </define>
+  <define name="meeting-place">
+    <element name="meeting-place">
       <text/>
     </element>
   </define>

data/lib/relaton_itu/editorial_group.rb

@@ -20,7 +20,7 @@ module RelatonItu
         warn "[relaton-itu] WARNING: invalid bureau: #{bureau}"
       end
       @bureau = bureau
-      @group = group.is_a?(Hash) ? ItuGroup.new(group) : group
+      @group = group.is_a?(Hash) ? ItuGroup.new(**group) : group
       @subgroup = subgroup.is_a?(Hash) ? ItuGroup.new(subgroup) : subgroup
       @workgroup = workgroup.is_a?(Hash) ? ItuGroup.new(workgroup) : workgroup
     end

data/lib/relaton_itu/hash_converter.rb

@@ -7,7 +7,7 @@ module RelatonItu
         eg = ret[:editorialgroup]
         return unless eg
 
-        ret[:editorialgroup] = EditorialGroup.new eg
+        ret[:editorialgroup] = EditorialGroup.new **eg
       end
 
       # @param ret [Hash]
@@ -15,7 +15,7 @@ module RelatonItu
         return unless ret[:structuredidentifier]
 
         ret[:structuredidentifier] = StructuredIdentifier.new(
-          ret[:structuredidentifier]
+          **ret[:structuredidentifier]
         )
       end
     end

data/lib/relaton_itu/hit.rb

@@ -3,6 +3,8 @@
 module RelatonItu
   # Hit.
   class Hit < RelatonBib::Hit
+    attr_writer :fetch
+
     # Parse page.
     # @return [RelatonItu::ItuBibliographicItem]
     def fetch

data/lib/relaton_itu/hit_collection.rb

@@ -14,23 +14,35 @@ module RelatonItu
 
     # @param ref [String]
     # @param year [String]
-    def initialize(ref, year = nil)
+    def initialize(ref, year = nil) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
       text = ref.sub /(?<=\.)Imp\s?(?=\d)/, ""
       super text, year
       @gi_imp = /\.Imp\d/.match?(ref)
-      uri = URI "#{DOMAIN}/net4/ITU-T/search/GlobalSearch/Search"
-      data = { json: params.to_json }
-      resp = Net::HTTP.post(uri, data.to_json,
-                            "Content-Type" => "application/json")
-      @array = hits JSON.parse(resp.body)
+      if ref.match? /^(ITU-T|ITU-R\sRR)/
+        uri = URI "#{DOMAIN}/net4/ITU-T/search/GlobalSearch/Search"
+        data = { json: params.to_json }
+        resp = Net::HTTP.post(uri, data.to_json,
+                              "Content-Type" => "application/json")
+        @array = hits JSON.parse(resp.body)
+      elsif ref.match? /^ITU-R/
+        rf = ref.sub(/^ITU-R\s/, "").upcase
+        url = "https://raw.githubusercontent.com/relaton/relaton-data-itu-r/master/data/#{rf}.yaml"
+        hash = YAML.safe_load Net::HTTP.get(URI(url))
+        item_hash = HashConverter.hash_to_bib(hash)
+        item = ItuBibliographicItem.new **item_hash
+        hit = Hit.new({ url: url }, self)
+        hit.fetch = item
+        @array = [hit]
+      end
     end
 
     private
 
     # @return [String]
     def group
-      @group ||= if %r{OB|Operational Bulletin}.match? text then "Publications"
-                 else "Recommendations"
+      @group ||= case text
+                 when %r{OB|Operational Bulletin}, %r{^ITU-R\sRR} then "Publications"
+                 when %r{^ITU-T} then "Recommendations"
                  end
     end
 
@@ -46,7 +58,7 @@ module RelatonItu
         "ExactPhrase" => false,
         "CollectionName" => "General",
         "CollectionGroup" => group,
-        "Sector" => "t",
+        "Sector" => text.match(/(?<=^ITU-)\w/).to_s.downcase,
         "Criterias" => [{
           "Name" => "Search in",
           "Criterias" => [
@@ -54,7 +66,7 @@ module RelatonItu
               "Selected" => false,
               "Value" => "",
               "Label" => "Name",
-              "Target" => "/name_s",
+              "Target" => "\\/name_s",
               "TypeName" => "CHECKBOX",
               "GetCriteriaType" => 0,
             },
@@ -62,7 +74,7 @@ module RelatonItu
               "Selected" => false,
               "Value" => "",
               "Label" => "Short description",
-              "Target" => "/short_description_s",
+              "Target" => "\\/short_description_s",
               "TypeName" => "CHECKBOX",
               "GetCriteriaType" => 0,
             },
@@ -70,7 +82,7 @@ module RelatonItu
               "Selected" => false,
               "Value" => "",
               "Label" => "File content",
-              "Target" => "/file",
+              "Target" => "\\/file",
               "TypeName" => "CHECKBOX",
               "GetCriteriaType" => 0,
             },
@@ -79,9 +91,8 @@ module RelatonItu
           "Selected" => false,
         }],
         "Topics" => "",
-        "ClientData" => { "ip" => "" },
+        "ClientData" => {},
         "Language" => "en",
-        "IP" => "",
         "SearchType" => "All",
       }
     end

data/lib/relaton_itu/itu_bibliographic_item.rb

@@ -4,7 +4,7 @@ module RelatonItu
       recommendation recommendation-supplement recommendation-amendment
       recommendation-corrigendum recommendation-errata recommendation-annex
       focus-group implementers-guide technical-paper technical-report
-      joint-itu-iso-iec
+      joint-itu-iso-iec resolution service-publication handbook question
     ].freeze
 
     # @params structuredidentifier [RelatonItu::StructuredIdentifier]

data/lib/relaton_itu/itu_bibliography.rb

@@ -30,9 +30,9 @@ module RelatonItu
       # @param year [String] the year the standard was published (optional)
       # @param opts [Hash] options; restricted to :all_parts if all-parts reference is required
       # @return [String] Relaton XML serialisation of reference
-      def get(code, year = nil, opts = {})
+      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
@@ -50,13 +50,15 @@ module RelatonItu
 
       private
 
-      def fetch_ref_err(code, year, missed_years)
+      def fetch_ref_err(code, year, missed_years) # rubocop:disable Metrics/MethodLength
         id = year ? "#{code}:#{year}" : code
         warn "[relaton-itu] WARNING: no match found online for #{id}. "\
           "The code must be exactly like it is on the standards website."
-        warn "[relaton-itu] (There was no match for #{year}, though there were matches "\
-          "found for #{missed_years.join(', ')}.)" unless missed_years.empty?
-        if /\d-\d/ =~ code
+        unless missed_years.empty?
+          warn "[relaton-itu] (There was no match for #{year}, though there were matches "\
+            "found for #{missed_years.join(', ')}.)"
+        end
+        if /\d-\d/.match? code
           warn "[relaton-itu] The provided document part may not exist, or the document "\
             "may no longer be published in parts."
         else
@@ -67,14 +69,35 @@ module RelatonItu
         nil
       end
 
-      def search_filter(code)
-        docidrx = %r{\w+\.\d+|\w\sSuppl\.\s\d+} # %r{^ITU-T\s[^\s]+}
-        c = code.sub(/Imp\s?/, "").match(docidrx).to_s
+      def search_filter(code, year) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
+        %r{
+          ^(?<pref1>ITU)?(-(?<type1>\w))?\s?(?<code1>[^\s\/]+)
+          (\s\(((?<month1>\d{2})\/)?(?<year1>\d{4})\))?
+          (\s-\s(?<buldate1>\d{2}\.\w{1,4}\.\d{4}))?
+          (\/(?<corr1>(Amd|Cor)\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
         result.select do |i|
-          i.hit[:code] &&
-            i.hit[:code].match(docidrx).to_s == c
+          next true unless i.hit[:code]
+
+          %r{
+            ^(?<pref2>ITU)?(-(?<type2>\w))?\s?(?<code2>[\S]+)
+            (\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?/, " "
+          pref1 == pref2 && (!type1 || type1 == type2) && code1 == code2 &&
+            (!year || year == year2) && (!month1 || month1 == month2) &&
+            corr1 == corr2 && (!coryear1 || coryear1 == coryear2) &&
+            buldate1 == buldate2 && (!cormonth1 || cormonth1 == cormonth2)
         end
       end
 
@@ -86,24 +109,19 @@ module RelatonItu
       # If no match, returns any years which caused mismatch, for error reporting
       def isobib_results_filter(result, year)
         missed_years = []
-        # result.each_slice(3) do |s| # ISO website only allows 3 connections
-        #   fetch_pages(s, 3).each do |r|
         result.each do |r|
-          return { ret: r.fetch } if !year
-
-          /\(\d{2}\/(?<pyear>\d{4})\)/ =~ r.hit[:code]
-          # r.date.select { |d| d.type == "published" }.each do |d|
-          return { ret: r.fetch } if year == pyear
+          if !year || /\((\d{2}\/)?(?<pyear>\d{4})\)/ =~ r.hit[:code]
+            ret = r.fetch
+            return { ret: ret } if ret
+          end
 
           missed_years << pyear
-          # end
-          # end
         end
         { years: missed_years }
       end
 
       def itubib_get1(code, year, _opts)
-        result = search_filter(code) || return
+        result = search_filter(code, year) || return
         ret = isobib_results_filter(result, year)
         if ret[:ret]
           warn "[relaton-itu] (\"#{code}\") found #{ret[:ret].docidentifier.first&.id}"

data/lib/relaton_itu/itu_group.rb

@@ -63,7 +63,7 @@ module RelatonItu
       @type = type
       @name = name
       @acronym = acronym
-      @period = period.is_a?(Hash) ? Period.new(period) : period
+      @period = period.is_a?(Hash) ? Period.new(**period) : period
     end
 
     # @param builder [Nokogiri::XML::Builder]

data/lib/relaton_itu/scrapper.rb

@@ -31,6 +31,8 @@ module RelatonItu
       # @return [Hash]
       def parse_page(hit_data, imp = false)
         url, doc = get_page hit_data[:url]
+        return unless doc
+
         if imp
           a = doc.at "//span[contains(@id, 'tab_ig_uc_rec')]/a"
           return unless a
@@ -44,7 +46,7 @@ module RelatonItu
         ItuBibliographicItem.new(
           fetched: Date.today.to_s,
           type: "standard",
-          docid: fetch_docid(doc),
+          docid: fetch_docid(doc, hit_data[:title]),
           edition: edition,
           language: ["en"],
           script: ["Latn"],
@@ -59,7 +61,7 @@ module RelatonItu
           copyright: fetch_copyright(hit_data[:code], doc),
           link: fetch_link(doc, url),
           relation: fetch_relations(doc),
-          place: ["Geneva"],
+          place: ["Geneva"]
         )
       end
       # rubocop:enable Metrics/AbcSize
@@ -69,17 +71,19 @@ module RelatonItu
       # Fetch abstracts.
       # @param doc [Nokigiri::HTML::Document]
       # @return [Array<Array>]
-      def fetch_abstract(doc)
+      def fetch_abstract(doc) # rubocop:disable Metrics/AbcSize
         abstract_url = doc.at('//table/tr/td/span[contains(@id, "lbl_dms")]/div')
-        return [] unless abstract_url
-
-        url = abstract_url[:onclick].match(/https?[^']+/).to_s
-        d = Nokogiri::HTML Net::HTTP.get(URI(url)).encode(undef: :replace, replace: "")
-        abstract_content = d.css("p.MsoNormal").text.gsub(/\r\n/, "")
-          .squeeze(" ").gsub(/\u00a0/, "")
+        content = if abstract_url
+                    url = abstract_url[:onclick].match(/https?[^']+/).to_s
+                    d = Nokogiri::HTML Net::HTTP.get(URI(url)).encode(undef: :replace, replace: "")
+                    d.css("p.MsoNormal").text.gsub(/\r\n/, "").squeeze(" ").gsub(/\u00a0/, "")
+                  elsif a = doc.at('//table/tr/td/span[contains(@class, "observation")]/text()')
+                    a.text.strip
+                  end
+        return [] unless content
 
         [{
-          content: abstract_content,
+          content: content,
           language: "en",
           script: "Latn",
         }]
@@ -92,7 +96,9 @@ module RelatonItu
         uri = URI url
         resp = Net::HTTP.get_response(uri)
         until resp.code == "200"
-          uri = URI resp["location"] if resp.code =~ /^30/
+          return if resp["location"] == "/en/publications/pages/notfound.aspx"
+
+          uri = URI resp["location"] if resp.code.match? /^30/
           resp = Net::HTTP.get_response(uri)
         end
         [uri.to_s, Nokogiri::HTML(resp.body)]
@@ -105,18 +111,32 @@ module RelatonItu
 
       # Fetch docid.
       # @param doc [Nokogiri::HTML::Document]
+      # @param title [String]
       # @return [Hash]
-      def fetch_docid(doc)
-        doc.xpath(
+      def fetch_docid(doc, title)
+        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",
-        ).map do |code|
-          id = code.text.match(%r{^.*?(?= \()|\w\.Imp\s?\d+}).to_s.squeeze(" ")
-          type = id.match(%r{^\w+}).to_s
-          type = "ITU" if type == "G"
-          RelatonBib::DocumentIdentifier.new(type: type, id: id)
-        end
+          "//div/table[1]/tr[4]/td/strong"
+        ).map { |c| createdocid c.text }
+        docids << createdocid(title) unless docids.any?
+        docids
+      end
+
+      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+))?
+          # (\s\(((?<_cormonth>\d{2})\/)?(?<_coryear>\d{4})\))?
+        }x =~ text.squeeze(" ")
+        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)
       end
 
       # Fetch status.
@@ -142,13 +162,13 @@ module RelatonItu
         group = wg && itugroup(wg.text)
         EditorialGroup.new(
           bureau: code.match(/(?<=-)./).to_s,
-          group: group,
+          group: group
         )
       end
 
       # @param name [String]
       # @return [RelatonItu::ItuGroup]
-      def itugroup(name)
+      def itugroup(name) # rubocop:disable Metrics/MethodLength
         if name.include? "Study Group"
           type = "study-group"
           acronym = "SG"
@@ -190,13 +210,15 @@ module RelatonItu
       # Fetch dates
       # @param doc [Nokogiri::HTML::Document]
       # @return [Array<Hash>]
-      def fetch_dates(doc)
+      def fetch_dates(doc) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
         dates = []
         date = doc.at("//table/tr/td/span[contains(@id, 'Label5')]",
                       "//p[contains(.,'Approved in')]")
         pdate = date&.text&.match(/\d{4}-\d{2}-\d{2}/).to_s || ob_date(doc)
         if pdate && !pdate&.empty?
           dates << { type: "published", on: pdate }
+        elsif pdate = ob_date(doc)
+          dates << { type: "published", on: pdate }
         end
         dates
       end
@@ -208,7 +230,7 @@ module RelatonItu
         pdate = doc.at('//table/tbody/tr/td[contains(text(), "Year:")]')
         return unless pdate
 
-        roman_to_arabic pdate.text.match(%r{(?<=Year: )\d{2}.\w+.\d{4}}).to_s
+        roman_to_arabic pdate.text.match(%r{(?<=Year: )(\d{2}.\w+.)?\d{4}}).to_s
       end
 
       # Convert roman month number in string date to arabic number
@@ -216,8 +238,11 @@ module RelatonItu
       # @return [String]
       def roman_to_arabic(date)
         %r{(?<rmonth>[IVX]+)} =~ date
-        month = ROMAN_MONTHS.index(rmonth) + 1
-        Date.parse(date.sub(%r{[IVX]+}, month.to_s)).to_s
+        if ROMAN_MONTHS.index(rmonth)
+          month = ROMAN_MONTHS.index(rmonth) + 1
+          Date.parse(date.sub(%r{[IVX]+}, month.to_s)).to_s
+        else date
+        end
       end
 
       # Fetch contributors
@@ -244,7 +269,7 @@ module RelatonItu
         links = [{ type: "src", content: url }]
         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.6.0".freeze
+  VERSION = "1.7.4".freeze
 end

data/lib/relaton_itu/xml_parser.rb

@@ -8,7 +8,7 @@ module RelatonItu
       # @param item_hash [Hash]
       # @return [RelatonItu::ItuBibliographicItem]
       def bib_item(item_hash)
-        ItuBibliographicItem.new item_hash
+        ItuBibliographicItem.new **item_hash
       end
 
       # @param ext [Nokogiri::XML::Element]

data/relaton-itu.gemspec

@@ -26,16 +26,16 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
-  spec.add_development_dependency "debase"
+  # 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 "rspec", "~> 3.0"
-  spec.add_development_dependency "ruby-debug-ide"
+  # spec.add_development_dependency "ruby-debug-ide"
   spec.add_development_dependency "ruby-jing"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "vcr", "~> 5.0.0"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "relaton-bib", "~> 1.6.pre"
+  spec.add_dependency "relaton-bib", "~> 1.7.0"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: relaton-itu
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-13 00:00:00.000000000 Z
+date: 2021-03-18 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: debase
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: ruby-debug-ide
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.pre
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.pre
+        version: 1.7.0
 description: 'RelatonItu: retrieve ITU Standards for bibliographic use using the BibliographicItem
   model'
 email:
@@ -172,9 +144,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/macos.yml"
-- ".github/workflows/ubuntu.yml"
-- ".github/workflows/windows.yml"
+- ".github/workflows/rake.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"

data/.github/workflows/macos.yml

@@ -1,34 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: macos
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ '**' ]
-
-jobs:
-  test-macos:
-    name: Test on Ruby ${{ matrix.ruby }} macOS
-    runs-on: macos-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          architecture: 'x64'
-      - name: Update gems
-        run: |
-          sudo gem install bundler --force
-          ruby -v | grep 2.5 && bundle config set build.debase --with-cflags="-Wno-error=implicit-function-declaration"
-          ruby -v | grep 2.5 && bundle config set build.ruby-debug-ide --with-cflags="-Wno-error=implicit-function-declaration"
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          bundle exec rake

data/.github/workflows/ubuntu.yml

@@ -1,33 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: ubuntu
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ '**' ]
-
-jobs:
-  test-linux:
-    name: Test on Ruby ${{ matrix.ruby }} Ubuntu
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          architecture: 'x64'
-      - name: Update gems
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          unset JAVA_TOOL_OPTIONS
-          bundle exec rake

data/.github/workflows/windows.yml

@@ -1,35 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: windows
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ '**' ]
-
-jobs:
-  test-windows:
-    name: Test on Ruby ${{ matrix.ruby }} Windows
-    runs-on: windows-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          architecture: 'x64'
-      - name: Update gems
-        shell: pwsh
-        run: |
-          gem install bundler
-          bundle config --local path vendor/bundle
-          bundle update
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          bundle exec rake