relaton-itu 1.7.6 → 1.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5d9ccc48e23558a34cc5af40c8603e64cf7a4ea5d51d7996ea17a4996cfaeec
-  data.tar.gz: fa28142b10ee1ef854584ee52854642305c86ad78ff32dc059f30315783ccd9b
+  metadata.gz: 5c9e267804ed407243d999f68830546b55db550bd511fa9146ab87e2db146c1d
+  data.tar.gz: c52daf864de7aeacd2651ca1a5442c0cadd8982e43ff671ae8a730a8a9559096
 SHA512:
-  metadata.gz: b304791f0d90fa0f23c378d30988f7ef1fa4d2abd36c2487fae454bba257019c0811f31354b94d8fb756dfb26eced93ac251d2ba5e64a41edfbc4268129edb08
-  data.tar.gz: 4535c1832d38d37f7df709abac6cc52e446f1da1be1704a8a3e4eaa0a98b47667976f88410bf54b73e6e10f50fa5f0807891f23775af772e6ff6d42ee54db18b
+  metadata.gz: e412c86f5a31146d27ae6b05feef03c817e2004581efde5e3051a66b37fe061c1e984e417ba92e94ca15032bab17c3e6f70a2062842922c4b300dfc4224cac61
+  data.tar.gz: e6718282c40d4119d1b7f33bc0f553c611b87d8f46abe57ddf7eb8569f781d22fa54ea135808d7b895d2b9b48b267eafac4d8d25a43df841b35d21d5041dcaea

data/lib/relaton_itu/itu_bibliography.rb

@@ -77,10 +77,11 @@ 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+)?)
+          ^(?<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}))?
-          (\/(?<corr1>(Amd|Cor)\s?\d+))?
+          (\s(?<corr1>(Amd|Cor|Amendment|Corrigendum)\.?\s?\d+))?
           (\s\(((?<cormonth1>\d{2})\/)?(?<coryear1>\d{4})\))?
         }x =~ code
         year ||= year1
@@ -89,21 +90,27 @@ module RelatonItu
         warn "[relaton-itu] (\"#{code}\") fetching..."
         result = search(code)
         code1.sub! /(?<=\.)Imp(?=\d)/, "" if result.gi_imp
+        if corr1
+          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})\))?
           }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 &&
+          pref1 == pref2 && (!type1 || type1 == type2) && code2.include?(code1) &&
             (!year || year == year2) && (!month1 || month1 == month2) &&
             corr1 == corr2 && (!coryear1 || coryear1 == coryear2) &&
-            buldate1 == buldate2 && (!cormonth1 || cormonth1 == cormonth2)
+            buldate1 == buldate2 && (!cormonth1 || cormonth1 == cormonth2) &&
+            (!ver1 || ver1 == ver2)
         end
       end
 

data/lib/relaton_itu/scrapper.rb

@@ -132,7 +132,7 @@ module RelatonItu
           # (\s\(((?<_cormonth>\d{2})\/)?(?<_coryear>\d{4})\))?
         }x =~ text.squeeze(" ")
         corr&.sub! /\.\s?/, " "
-        id = [code.sub(/[[:space:]]$/, ""), corr].compact.join "/"
+        id = [code.sub(/[[:space:]]$/, ""), corr].compact.join " "
         id += " - #{buldate}" if buldate
         type = id.match(%r{^\w+}).to_s
         type = "ITU" if type == "G"

data/lib/relaton_itu/version.rb

@@ -1,3 +1,3 @@
 module RelatonItu
-  VERSION = "1.7.6".freeze
+  VERSION = "1.7.7".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-itu
 version: !ruby/object:Gem::Version
-  version: 1.7.6
+  version: 1.7.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-12 00:00:00.000000000 Z
+date: 2021-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml