relaton-itu 1.5.0 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b003ff0d19f8572b8904f94b5b71cf361ccecd5bba51abd4175ffb12de8802a6
-  data.tar.gz: 4a0c6ee004c92bae06d1ee69e1cffd7175d838b7b91bf6f4eb22cab0c5c95b3e
+  metadata.gz: 994e4bcf33070a5581017d2572048c0d0c85cebc9818d44b4cb679051c3edb55
+  data.tar.gz: 367230b05352067540dce9b8dbbc8e977d31358aca4f39aa96ac529742e553e6
 SHA512:
-  metadata.gz: baf1265b04a29d3d812b53955423e9b25bcc97c3930f7d135839c1c20b6048448262f64f54b72fcba9c547e29d1c68af0119cf23f93591178c5a4c04d67bebe7
-  data.tar.gz: f02ff46adc829c3454010a0df9c9998c8a2bed766ae912f23cab0c5f62476705cbe9bebdc72f8f8faad1f460c77f713d8917eaf786efb59166c666dd023197a8
+  metadata.gz: 679daec50ec3f9b60e1cefafff737ed644cc659fedb805550cc56c84670b3c3cb30fa327627c5728e4aa95e4b158fa7ede13612df4ef87d99c026722c2b2a5cb
+  data.tar.gz: '08f71b448a574f3088d635ef274f0316faddfec4d3097337144f46f3ec1918e61c056402bc26c660227376c9dc680fc11d3bb5903aadc433db796a4ff88a7098'

data/.github/workflows/macos.yml

@@ -26,6 +26,8 @@ jobs:
       - 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: |

data/README.adoc

@@ -87,6 +87,16 @@ 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
+...
+----
+
 === 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,7 @@
         <value>technical-report</value>
         <value>joint-itu-iso-iec</value>
         <value>resolution</value>
+        <value>service-publication</value>
       </choice>
     </define>
     <define name="editorialgroup">

data/lib/relaton_itu/hit_collection.rb

@@ -29,7 +29,7 @@ module RelatonItu
 
     # @return [String]
     def group
-      @group ||= if %r{(OB|Operational Bulletin) No} =~ text then "Publications"
+      @group ||= if %r{OB|Operational Bulletin}.match? text then "Publications"
                  else "Recommendations"
                  end
     end
@@ -54,7 +54,7 @@ module RelatonItu
               "Selected" => false,
               "Value" => "",
               "Label" => "Name",
-              "Target" => "/name_s",
+              "Target" => "\\/name_s",
               "TypeName" => "CHECKBOX",
               "GetCriteriaType" => 0,
             },
@@ -62,7 +62,7 @@ module RelatonItu
               "Selected" => false,
               "Value" => "",
               "Label" => "Short description",
-              "Target" => "/short_description_s",
+              "Target" => "\\/short_description_s",
               "TypeName" => "CHECKBOX",
               "GetCriteriaType" => 0,
             },
@@ -70,7 +70,7 @@ module RelatonItu
               "Selected" => false,
               "Value" => "",
               "Label" => "File content",
-              "Target" => "/file",
+              "Target" => "\\/file",
               "TypeName" => "CHECKBOX",
               "GetCriteriaType" => 0,
             },
@@ -79,9 +79,8 @@ module RelatonItu
           "Selected" => false,
         }],
         "Topics" => "",
-        "ClientData" => { "ip" => "" },
+        "ClientData" => {},
         "Language" => "en",
-        "IP" => "",
         "SearchType" => "All",
       }
     end

data/lib/relaton_itu/itu_bibliography.rb

@@ -67,14 +67,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)
+        %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
+          %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)
+          # i.hit[:code] &&
+          #   i.hit[:code].match(docidrx).to_s == c
         end
       end
 
@@ -86,24 +107,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
 
           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/scrapper.rb

@@ -44,7 +44,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"],
@@ -105,18 +105,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)
+        %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.

data/lib/relaton_itu/version.rb

@@ -1,3 +1,3 @@
 module RelatonItu
-  VERSION = "1.5.0".freeze
+  VERSION = "1.7.2".freeze
 end

data/relaton-itu.gemspec

@@ -37,5 +37,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr", "~> 5.0.0"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "relaton-bib", "~> 1.5.0"
+  spec.add_dependency "relaton-bib", "~> 1.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-itu
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.7.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-09 00:00:00.000000000 Z
+date: 2020-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.7.0
 description: 'RelatonItu: retrieve ITU Standards for bibliographic use using the BibliographicItem
   model'
 email: