relaton-gb 1.16.0 → 1.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af59eecad25f703949530ba1d289daac5eafea562bf4453b56e92e5951747ffa
-  data.tar.gz: 7c6dcf93299919fe1869fb91c93f556382d129d1cfdc69c69c4d09027cfdb1ee
+  metadata.gz: 9abe3c75ca613bc38c155fd5f116ecd967b06eecd7abc78610b498f107d6ec8f
+  data.tar.gz: a01b3c0b36e744d4518a54c2e41576a3c87a996468ff17b19a7981c5ed1a058d
 SHA512:
-  metadata.gz: c45e0158f52768fa4e1468794c9ec78a207db0105f8dc285368c6cde561c1f5695b85dd1699bf2b48a84ac703a6e74f363962536fc8df50c0389bf3055e6a0c8
-  data.tar.gz: 8fd2778d0a2a78f5301666bc5615d7ddf73f2ec627d80ea254cd669915dbad1fcf33aa72ab2db24e50cd702faf85077403909e3d0b717d2e3a0474bd88ca6c20
+  metadata.gz: f10cfd40d9314992bae8b704118d53b519ce1c5f2145139e61f816559f28adbc17703a34e02556af92694e99f5b78371d6fbcea2732d3d3556d181dc7876d811
+  data.tar.gz: f6373a69761f186b254ef5dfacbee6f195143b6cf522dc2da06a9667a4bfd4df90be3ac001de734034655b48072ab7dbca632f73f77ebf2fe196f19ff8a081d2

data/lib/relaton_gb/config.rb

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

data/lib/relaton_gb/gb_bibliographic_item.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "relaton_iso_bib"
-require "cnccs"
 require "relaton_gb/gb_technical_committee"
 require "relaton_gb/gb_standard_type"
 require "relaton_gb/xml_parser"

data/lib/relaton_gb/gb_bibliography.rb

@@ -42,7 +42,7 @@ module RelatonGb
       # @param year [String] the year the standard was published (optional)
       # @param opts [Hash] options; restricted to :all_parts if all-parts reference is required
       # @return [String] Relaton XML serialisation of reference
-      def get(code, year = nil, opts = {})
+      def get(code, year = nil, opts = {}) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
         if year.nil?
           /^(?<code1>[^-]+)-(?<year1>[^-]+)$/ =~ code
           unless code1.nil?
@@ -52,7 +52,7 @@ module RelatonGb
         end
 
         code += ".1" if opts[:all_parts]
-        code, year = code.split(/-/, 2) if /-/ =~ code
+        code, year = code.split("-", 2) if code.include?("-")
         ret = get1(code, year, opts)
         return nil if ret.nil?
 
@@ -63,22 +63,22 @@ module RelatonGb
 
       private
 
-      def fetch_ref_err(code, year, missed_years)
+      def fetch_ref_err(code, year, missed_years) # rubocop:disable Metrics/MethodLength
         id = year ? "#{code}:#{year}" : code
-        warn "[relaton-gb] WARNING: no match found on the GB website "\
-          "for #{id}. The code must be exactly like it is on the website."
+        Util.warn "WARNING: no match found on the GB website for `#{id}`. " \
+                  "The code must be exactly like it is on the website."
         unless missed_years.empty?
-          warn "[relaton-gb] (There was no match for #{year}, though there "\
-            "were matches found for #{missed_years.join(', ')}.)"
+          Util.warn "(There was no match for `#{year}`, though there " \
+                    "were matches found for `#{missed_years.join('`, `')}`.)"
         end
         if /\d-\d/.match? code
-          warn "[relaton-gb] The provided document part may not exist, or the "\
-            "document may no longer be published in parts."
+          Util.warn "The provided document part may not exist, or " \
+                    "the document may no longer be published in parts."
         else
-          warn "[relaton-gb] If you wanted to cite all document parts for the "\
-            "reference, use \"#{code} (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 `#{code} (all parts)`.\nIf the document " \
+                    "is not a standard, use its document type abbreviation " \
+                    "(TS, TR, PAS, Guide)."
         end
         nil
       end
@@ -89,7 +89,7 @@ module RelatonGb
         result = search_filter(searchcode) || return
         ret = results_filter(result, year)
         if ret[:ret]
-          warn "[relaton-gb] (\"#{code}\") found #{ret[:ret].docidentifier.first.id}"
+          Util.warn "(#{code}) found `#{ret[:ret].docidentifier.first.id}`"
           ret[:ret]
         else
           fetch_ref_err(code, year, ret[:years])
@@ -99,7 +99,7 @@ module RelatonGb
       def search_filter(code)
         # search filter needs to incorporate year
         docidrx = %r{^[^\s]+\s[\d.-]+}
-        warn "[relaton-gb] (\"#{code}\") fetching..."
+        Util.warn "(#{code}) fetching..."
         result = search(code)
         result.select do |hit|
           hit.docref && hit.docref.match(docidrx).to_s.include?(code)

data/lib/relaton_gb/util.rb

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

data/lib/relaton_gb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RelatonGb
-  VERSION = "1.16.0"
+  VERSION = "1.16.1"
 end

data/lib/relaton_gb.rb

@@ -1,6 +1,10 @@
+require "digest/md5"
+require "relaton_iso_bib"
+require "cnccs"
 require "relaton_gb/version"
+require "relaton_gb/config"
+require "relaton_gb/util"
 require "relaton_gb/gb_bibliography"
-require "digest/md5"
 
 # if defined? Relaton
 #   require "relaton_gb/processor"
@@ -14,9 +18,9 @@ module RelatonGb
   # 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 RelatonGb::VERSION + RelatonIsoBib::VERSION + RelatonBib::VERSION # grammars
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-gb
 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-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cnccs
@@ -80,6 +80,7 @@ files:
 - grammars/relaton-gb.rng
 - lib/relaton_gb.rb
 - lib/relaton_gb/ccs.rb
+- lib/relaton_gb/config.rb
 - lib/relaton_gb/gb_bibliographic_item.rb
 - lib/relaton_gb/gb_bibliography.rb
 - lib/relaton_gb/gb_scrapper.rb
@@ -92,6 +93,7 @@ files:
 - lib/relaton_gb/scrapper.rb
 - lib/relaton_gb/sec_scrapper.rb
 - lib/relaton_gb/t_scrapper.rb
+- lib/relaton_gb/util.rb
 - lib/relaton_gb/version.rb
 - lib/relaton_gb/xml_parser.rb
 - lib/relaton_gb/yaml/prefixes.yaml