relaton-iec 1.16.0 → 1.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 407e0b683664d9b9e59bcbf2dadbbcc3b3289df9d16354cf7704b27529169020
-  data.tar.gz: dc55bf895de7f08f93f9430c348d562903567df12f5e93c1a7916082c4742ed5
+  metadata.gz: 22c30d32d348985a90f88d21872741162ebef459ccff4fc118597f196e53f4b9
+  data.tar.gz: 5a265ce8efceee119c822824eb347ace8aeedd9f695b23b7270a22d150da3678
 SHA512:
-  metadata.gz: f4d1c322f0fd0d0f4a5d21c6cebd43f1f8556d34cd096f547da2c16e8f4a437294be845812b35fa1880c0d790092ae13926bd65fbb9d6a24d6c53263417fb3b4
-  data.tar.gz: ff11597b0da5425a9c402d2da4926200703636b7d88a305299e6d59897e0835f1f68ca2b65f01f94e8f6ff4950e726957bd52ce5624ec712ab67c8f2a794e229
+  metadata.gz: f6f4575283e266b8f35c28b88ff70ec1653c35222e6283d62385c883c459a3a65b096b5ed7495b68a40f4b99760f2e741d59ce4c370556180d0e41bc3d04f529
+  data.tar.gz: 76d9702d3434cf7a7c3b1dfc4e03e9be53ca2e49c801c5dc2060b7574e3d3c023ade59074daeb628a00eb57e1792860d8d35073228594baf0e897917d2b3c9d1

data/lib/relaton_iec/config.rb

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

data/lib/relaton_iec/iec_bibliographic_item.rb

@@ -34,15 +34,13 @@ module RelatonIec
     #
     def initialize(**args) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       if args[:function] && !FUNCTION.include?(args[:function])
-        warn "[relaton-iec] WARNING: invalid function \"#{args[:function]}\""
-        warn "[relaton-iec] allowed function values are: #{FUNCTION.join(', ')}"
+        Util.warn "WARNING: invalid function `#{args[:function]}`"
+        Util.warn "allowed function values are: `#{FUNCTION.join('`, `')}`"
       end
       if args[:updates_document_type] &&
           !DOCTYPES.include?(args[:updates_document_type])
-        warn "[relaton-iec] WARNING: invalid updates_document_type " \
-             "\"#{args[:updates_document_type]}\""
-        warn "[relaton-iec] allowed updates_document_type values are: " \
-             "#{DOCTYPES.join(', ')}"
+        Util.warn "WARNING: invalid updates_document_type `#{args[:updates_document_type]}`"
+        Util.warn "allowed updates_document_type values are: `#{DOCTYPES.join('`, `')}`"
       end
       @function = args.delete :function
       @updates_document_type = args.delete :updates_document_type

data/lib/relaton_iec/iec_bibliography.rb

@@ -46,9 +46,8 @@ module RelatonIec
       # @param missed_years [Array<String>]
       def warn_missing_years(pubid, year, missed_years)
         id = ref_with_year(pubid, year)
-        warn "[relaton-iec] (\"#{id}\") TIP: " \
-          "No match for edition year #{year}, " \
-          "but matches exist for #{missed_years.uniq.join(', ')}."
+        Util.warn "(#{id}) TIP: No match for edition year `#{year}`, " \
+                  "but matches exist for `#{missed_years.uniq.join('`, `')}`."
       end
 
       # @param code [String]
@@ -57,9 +56,7 @@ module RelatonIec
       def fetch_ref_err(code, year, missed_years) # rubocop:disable Metrics/MethodLength
         id = ref_with_year(code, year)
 
-        warn "[relaton-iec] (\"#{id}\") " \
-             "Not found. "\
-             "The identifier must be exactly as shown on the IEC Webstore."
+        Util.warn "(#{id}) Not found. The identifier must be exactly as shown on the IEC Webstore."
 
         if year && missed_years.any?
           warn_missing_years(code, year, missed_years)
@@ -68,13 +65,11 @@ module RelatonIec
         # TODO: change this to pubid-iec
         has_part = /\d-\d/.match?(code)
         if has_part
-          warn "[relaton-iec] (\"#{id}\") TIP: " \
-               "If it cannot be found, the document may no longer be published in parts."
+          Util.warn "(#{id}) TIP: If it cannot be found, the document may no longer be published in parts."
 
         else
-          warn "[relaton-iec] (\"#{id}\") TIP: " \
-               "If you wish to cite all document parts for the reference, " \
-               "use (\"#{code} (all parts)\")."
+          Util.warn "(#{id}) TIP: If you wish to cite all document parts for " \
+                    "the reference, use `#{code} (all parts)`."
         end
 
         # TODO: streamline after integration with pubid-iec
@@ -83,9 +78,8 @@ module RelatonIec
           code.include?("#{t} ")
         end
         unless selected_doctype
-          warn "[relaton-iec] (\"#{id}\") TIP: " \
-              "If the document is not an International Standard, use its " \
-              "deliverable type abbreviation (#{doctypes.join(", ")})."
+          Util.warn "(#{id}) TIP: If the document is not an International Standard, use its " \
+                    "deliverable type abbreviation `#{doctypes.join('`, `')}`."
         end
 
         nil
@@ -131,7 +125,7 @@ module RelatonIec
       # @return [RelatonIec::HitCollection]
       def search_filter(ref, year)
         code = ref.split(":").first
-        warn "[relaton-iec] (\"#{ref_with_year(ref, year)}\") Fetching from IEC..."
+        Util.warn "(#{ref_with_year(ref, year)}) Fetching from IEC..."
         search(code)
       end
 
@@ -256,17 +250,13 @@ module RelatonIec
         id = ref_with_year(code, year)
         docid = ret[:ret].docidentifier.first.id
 
-        if id == docid
-          warn "[relaton-iec] (\"#{id}\") Found exact match."
-        else
-          warn "[relaton-iec] (\"#{id}\") Found (\"#{docid}\")."
+        if id == docid then Util.warn "(#{id}) Found exact match."
+        else Util.warn "(#{id}) Found `#{docid}`."
         end
 
         if ret[:missed_parts]
-          warn "[relaton-iec] (\"#{id}\") TIP: " \
-          "\"#{code}\" also contains other parts, " \
-          "if you want to cite all parts, use "\
-          "(\"#{code} (all parts)\")."
+          Util.warn "(#{id}) TIP: `#{code}` also contains other parts, " \
+                    "if you want to cite all parts, use `#{code} (all parts)`."
         end
 
         ret[:ret]

data/lib/relaton_iec/util.rb

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

data/lib/relaton_iec/version.rb

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

data/lib/relaton_iec.rb

@@ -7,6 +7,8 @@ require "relaton/index"
 require "relaton_iso_bib"
 require "relaton_iec/hit"
 require "relaton_iec/version"
+require "relaton_iec/config"
+require "relaton_iec/util"
 require "relaton_iec/iec_bibliography"
 require "relaton_iec/iec_bibliographic_item"
 require "relaton_iec/xml_parser"
@@ -20,10 +22,10 @@ module RelatonIec
     # Returns hash of XML reammar
     # @return [String]
     def 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 RelatonIec::VERSION + RelatonIsoBib::VERSION + RelatonBib::VERSION # grammars
     end
 
     # @param code [String]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iec
 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: addressable
@@ -109,6 +109,7 @@ files:
 - lib/relaton_iec/basic_block/stem.rb
 - lib/relaton_iec/basic_block/table.rb
 - lib/relaton_iec/basic_block/text_element.rb
+- lib/relaton_iec/config.rb
 - lib/relaton_iec/data_fetcher.rb
 - lib/relaton_iec/data_parser.rb
 - lib/relaton_iec/hash_converter.rb
@@ -120,6 +121,7 @@ files:
 - lib/relaton_iec/processor.rb
 - lib/relaton_iec/statuses.yml
 - lib/relaton_iec/tc_sc_officers_note.rb
+- lib/relaton_iec/util.rb
 - lib/relaton_iec/version.rb
 - lib/relaton_iec/xml_parser.rb
 - relaton_iec.gemspec