relaton-itu 1.16.0 → 1.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7d07b59787bd399ec0100f37ab66cf50b2c69e1a30a1e5466db2ceca8dbf908
-  data.tar.gz: ef1b9720c0797daba527de587e52d86866297aa3f9ada5ee594ac9ecec998f69
+  metadata.gz: ba25af96c755b3ba32e9318e989f3a7396538c23667112dcde1282fd22b64c4b
+  data.tar.gz: 1757b9672eeeae25548c7cf2ea3c6f2fb7beb9dbdc5740b452177e20540fc4dc
 SHA512:
-  metadata.gz: 3ae2909366f26f5d76e6a44efd5eaf7cadb0efcb6b644dca908d48bc4e7af2e3404e5f4699085210d3aaf7fa58d6d221f059f70dc3f5c2a49a7b9f05fe1f7d8d
-  data.tar.gz: e4b564c0166c953529af568bef7ea8e292eb72173d0fbf9c89626522d6a576383df57f6be5ffe714c2bbd82380f014439110caf2cb97072033200cee9148d8eb
+  metadata.gz: adc9864ea7e48260cb0aa5550b0fbaa2a4943359537acaf75a974514f9a034dd34a01842da5abd2b5b65cffb796f022dbb5f8527fc1addcd915e4646340eb502
+  data.tar.gz: 24b824c4af92c5aa195abd7681f9e24f370450555cef3018e67280257eccc0b6e4290a70c2270406f70e0714cbc5c651b2d1fdf94d4babff2ca37209a0455918

data/lib/relaton_itu/config.rb

@@ -0,0 +1,10 @@
+module RelatonItu
+  module Config
+    include RelatonBib::Config
+  end
+  extend Config
+
+  class Configuration < RelatonBib::Configuration
+    PROGNAME = "relaton-itu".freeze
+  end
+end

data/lib/relaton_itu/editorial_group.rb

@@ -17,7 +17,8 @@ module RelatonItu
     # @param workgroup [Hash, RelatonItu::ItuGroup, NilClass]
     def initialize(bureau:, group:, subgroup: nil, workgroup: nil)
       unless BUREAUS.include? bureau
-        warn "[relaton-itu] WARNING: invalid bureau: #{bureau}"
+        Util.warn "WARNING: invalid bureau: `#{bureau}`"
+        Util.warn "WARNING: valid bureaus are: `#{BUREAUS.join('`, `')}`"
       end
       @bureau = bureau
       @group = group.is_a?(Hash) ? ItuGroup.new(**group) : group

data/lib/relaton_itu/itu_bibliographic_item.rb

@@ -10,7 +10,7 @@ module RelatonItu
     # @params structuredidentifier [RelatonItu::StructuredIdentifier]
     def initialize(**args)
       if args[:doctype] && !TYPES.include?(args[:doctype])
-        warn "[relaton-itu] WARNING: invalid doctype: #{args[:doctype]}"
+        Util.warn "WARNING: invalid doctype: `#{args[:doctype]}`"
       end
       super
     end

data/lib/relaton_itu/itu_bibliography.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "relaton_bib"
 require "relaton_itu/itu_bibliographic_item"
 require "relaton_itu/editorial_group"
 require "relaton_itu/structured_identifier"
@@ -23,9 +22,9 @@ module RelatonItu
     def search(refid)
       refid = RelatonItu::Pubid.parse refid if refid.is_a? String
       if refid.to_ref =~ /(ITU[\s-]T\s\w)\.(Suppl\.|Annex)\s?(\w?\d+)/
-        correct_ref = "#{$~[1]} #{$~[2]} #{$~[3]}"
-        warn "[relaton-itu] WARNING: Incorrect reference #{refid}"
-        warn "[relaton-itu] the reference should be #{correct_ref}"
+        correct_ref = "`#{$~[1]}` `#{$~[2]}` `#{$~[3]}`"
+        Util.warn "WARNING: Incorrect reference `#{refid}`"
+        Util.warn "the reference should be #{correct_ref}"
       end
       HitCollection.new refid
     rescue SocketError, Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse,
@@ -64,20 +63,21 @@ module RelatonItu
     private
 
     def fetch_ref_err(refid, missed_years) # rubocop:disable Metrics/MethodLength
-      warn "[relaton-itu] WARNING: no match found online for #{refid}. " \
-           "The code must be exactly like it is on the standards website."
+      Util.warn "WARNING: no match found online for `#{refid}`. " \
+                "The code must be exactly like it is on the standards website."
       unless missed_years.empty?
-        warn "[relaton-itu] (There was no match for #{refid.year}, though there " \
-             "were matches found for #{missed_years.join(', ')}.)"
+        Util.warn "(There was no match for `#{refid.year}`, though there " \
+                  "were matches found for `#{missed_years.join('`, `')}`.)"
       end
       # if /\d-\d/.match? refid.code
       #   warn "[relaton-itu] The provided document part may not exist, or " \
       #        "the document may no longer be published in parts."
       # else
-      warn "[relaton-itu] If you wanted to cite all document parts for the reference, " \
-           "use \"#{refid} (all parts)\".\nIf the document is not a standard, " \
-           "use its document type abbreviation (TS, TR, PAS, Guide)."
+      Util.warn "If you wanted to cite all document parts for the reference, " \
+                "use `#{refid} (all parts)`.\nIf the document is not a standard, " \
+                "use its document type abbreviation `S`, `TR`, `PAS`, `Guide`)."
       # end
+      nil
     end
 
     def search_filter(refid) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
@@ -90,7 +90,7 @@ module RelatonItu
       #   (?:\s\((?:(?<cormonth1>\d{2})/)?(?<coryear1>\d{4})\))?
       # }x =~ code
       # year ||= year1
-      warn "[relaton-itu] (\"#{refid}\") fetching..."
+      Util.warn "(#{refid}) fetching..."
       result = search(refid)
       # refid.code.sub!(/(?<=\.)Imp(?=\d)/, "") if result.gi_imp
       # if corr1
@@ -143,7 +143,7 @@ module RelatonItu
       result = search_filter(refid) || return
       ret = isobib_results_filter(result, refid)
       if ret[:ret]
-        warn "[relaton-itu] (\"#{refid}\") found #{ret[:ret].docidentifier.first&.id}"
+        Util.warn "(#{refid}) found `#{ret[:ret].docidentifier.first&.id}`"
         ret[:ret]
       else
         fetch_ref_err(refid, ret[:years])

data/lib/relaton_itu/util.rb

@@ -0,0 +1,9 @@
+module RelatonItu
+  module Util
+    extend RelatonBib::Util
+
+    def self.logger
+      RelatonItu.configuration.logger
+    end
+  end
+end

data/lib/relaton_itu/version.rb

@@ -1,3 +1,3 @@
 module RelatonItu
-  VERSION = "1.16.0".freeze
+  VERSION = "1.16.1".freeze
 end

data/lib/relaton_itu.rb

@@ -2,7 +2,10 @@ require "mechanize"
 require "parslet"
 require "digest/md5"
 require "relaton/index"
+require "relaton_bib"
 require "relaton_itu/version"
+require "relaton_itu/config"
+require "relaton_itu/util"
 require "relaton_itu/pubid"
 require "relaton_itu/itu_bibliography"
 require "relaton_itu/data_fetcher"
@@ -14,9 +17,9 @@ module RelatonItu
   # Returns hash of XML reammar
   # @return [String]
   def self.grammar_hash
-    gem_path = File.expand_path "..", __dir__
-    grammars_path = File.join gem_path, "grammars", "*"
-    grammars = Dir[grammars_path].sort.map { |gp| File.read gp }.join
-    Digest::MD5.hexdigest grammars
+    # gem_path = File.expand_path "..", __dir__
+    # grammars_path = File.join gem_path, "grammars", "*"
+    # grammars = Dir[grammars_path].sort.map { |gp| File.read gp }.join
+    Digest::MD5.hexdigest RelatonItu::VERSION + RelatonBib::VERSION # grammars
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-itu
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.16.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-03 00:00:00.000000000 Z
+date: 2023-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -92,6 +92,7 @@ files:
 - grammars/relaton-itu-compile.rng
 - grammars/relaton-itu.rng
 - lib/relaton_itu.rb
+- lib/relaton_itu/config.rb
 - lib/relaton_itu/data_fetcher.rb
 - lib/relaton_itu/data_parser_r.rb
 - lib/relaton_itu/editorial_group.rb
@@ -105,6 +106,7 @@ files:
 - lib/relaton_itu/pubid.rb
 - lib/relaton_itu/scrapper.rb
 - lib/relaton_itu/structured_identifier.rb
+- lib/relaton_itu/util.rb
 - lib/relaton_itu/version.rb
 - lib/relaton_itu/xml_parser.rb
 - relaton-itu.gemspec