relaton-itu 1.7.5 → 1.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2764e22b822215ec681d22f20b979cc80cb498ffa49d87a164a6118575dd686f
-  data.tar.gz: 9863ca9b6b6d9f76bb3265ef148115de055dd82445c5c058564345e963ada182
+  metadata.gz: b5d9ccc48e23558a34cc5af40c8603e64cf7a4ea5d51d7996ea17a4996cfaeec
+  data.tar.gz: fa28142b10ee1ef854584ee52854642305c86ad78ff32dc059f30315783ccd9b
 SHA512:
-  metadata.gz: '087567111db88be5ee21f16942ce4b80fc07537665b565fb4b0913edcd3e6427196e541775dfaf142ddf9c0b1693d8e0067d7bbbf9602a87293890d6074089ac'
-  data.tar.gz: f9ca1d2439bcef8bc110a8cfe10cb22ea47e2000b289f3c446459c9e51d036bbf2bb7b1f8c99b798735b02522f7e4985aa78f1cefe36ff868f301795858abdaa
+  metadata.gz: b304791f0d90fa0f23c378d30988f7ef1fa4d2abd36c2487fae454bba257019c0811f31354b94d8fb756dfb26eced93ac251d2ba5e64a41edfbc4268129edb08
+  data.tar.gz: 4535c1832d38d37f7df709abac6cc52e446f1da1be1704a8a3e4eaa0a98b47667976f88410bf54b73e6e10f50fa5f0807891f23775af772e6ff6d42ee54db18b

data/bin/rspec

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

data/lib/relaton_itu/hit_collection.rb

@@ -27,7 +27,13 @@ module RelatonItu
       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))
+        resp = Net::HTTP.get_response(URI(url))
+        if resp.code == "404"
+          @array = []
+          return
+        end
+
+        hash = YAML.safe_load resp.body
         item_hash = HashConverter.hash_to_bib(hash)
         item = ItuBibliographicItem.new **item_hash
         hit = Hit.new({ url: url }, self)
@@ -105,7 +111,7 @@ module RelatonItu
         code  = h["Media"]["Name"]
         title = h["Title"]
         url   = h["Redirection"]
-        type  = group.downcase[0...-1]
+        type  = h["Collection"]["Group"].downcase[0...-1]
         Hit.new({ code: code, title: title, url: url, type: type }, self)
       end
     end

data/lib/relaton_itu/itu_bibliography.rb

@@ -19,6 +19,12 @@ module RelatonItu
       # @param text [String]
       # @return [RelatonItu::HitCollection]
       def search(text, year = nil)
+        # code = text.sub(/(?<=ITU-T\s\w)\.(\w+\.)(?=\d+)/, ' \1')
+        if text =~ /(ITU-T\s\w)\.(Suppl\.|Annex)\s?(\w?\d+)/
+          correct_ref = "#{$~[1]} #{$~[2]} #{$~[3]}"
+          warn "[relaton-itu] WARNING: Incorrect reference #{text}"
+          warn "[relaton-itu] the reference should be #{correct_ref}"
+        end
         HitCollection.new text, year
       rescue SocketError, Timeout::Error, Errno::EINVAL, Errno::ECONNRESET,
              EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,
@@ -71,7 +77,7 @@ 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\/]+)
+          ^(?<pref1>ITU)?(-(?<type1>\w))?\s?(?<code1>[^\s\/]+(?:\/\w\.\d+)?)
           (\s\(((?<month1>\d{2})\/)?(?<year1>\d{4})\))?
           (\s-\s(?<buldate1>\d{2}\.\w{1,4}\.\d{4}))?
           (\/(?<corr1>(Amd|Cor)\s?\d+))?

data/lib/relaton_itu/version.rb

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

data/relaton-itu.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   # 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 "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   # spec.add_development_dependency "ruby-debug-ide"
   spec.add_development_dependency "ruby-jing"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-itu
 version: !ruby/object:Gem::Version
-  version: 1.7.5
+  version: 1.7.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-19 00:00:00.000000000 Z
+date: 2021-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -153,6 +153,7 @@ files:
 - README.adoc
 - Rakefile
 - bin/console
+- bin/rspec
 - bin/setup
 - grammars/basicdoc.rng
 - grammars/biblio.rng
@@ -192,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
 summary: 'RelatonItu: retrieve ITU Standards for bibliographic use using the BibliographicItem