relaton-bipm 1.16.0 → 1.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1db042c4a912ff57cf2fc14c3d7f43047e06f44ac3f30f45564ea9214201571
-  data.tar.gz: d089989213bb5b37722e493600852c687ad1e889983d75f874c691e970e71ad4
+  metadata.gz: 24d544bd3daad314cd7af5b723c53765c4dfaedc5fe1cd56bfd4352dd9901a72
+  data.tar.gz: '0309c87fe248963a2fec6d1a9fd1eadfc99158a55e8e6a8e9fdf7cc00f3e6add'
 SHA512:
-  metadata.gz: 896bdd6d0bab83f90479990c232a34a35d5a6a76a0ea4514410741e2febf94622b103d0e6403aeebd4acec5a2a347d03232a56f7cb33298b94bd1e347e40a62b
-  data.tar.gz: 9175449ecb0da4a81389203aeccd1c541f2fd6f2f6028c087e9c40f263b143ffebc5c768df3bb299007e6150fccdfa51cd98b180d274363f902642df3a47a316
+  metadata.gz: a125b70df0a8cfaafb3acb4adc7fbf8dc429c05208def6658927302e9880009bc6a9d471c24ca7c0cf5257484297c75ad020d282eafa99cad1230e9048957eba
+  data.tar.gz: b7041bf466e72998494a9ebeeec12b7d26ca504a47125e2b47e4903a996a4756c6f04926fc5818f9cffb61601be2ef2e91b6e8a25b20b2c294cd7e45996cc6ff

data/lib/relaton_bipm/bipm_bibliographic_item.rb

@@ -27,13 +27,13 @@ module RelatonBipm
     # @param structuredidentifier [RelatonBipm::StructuredIdentifier]
     def initialize(**args) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
       if args[:docstatus] && !STATUSES.include?(args[:docstatus].stage.value)
-        warn "[relaton-bipm] Warning: invalid docstatus: #{args[:docstatus].stage.value}. " \
-             "It should be one of: #{STATUSES}"
+        Util.warn "Warning: invalid docstatus: `#{args[:docstatus].stage.value}`. " \
+                  "It should be one of: `#{STATUSES.join('`, `')}`"
       end
 
       if args[:si_aspect] && !SI_ASPECTS.include?(args[:si_aspect])
-        warn "[relaton-bipm] Warning: invalid si_aspect: #{args[:si_aspect]}. " \
-             "It should be one of: #{SI_ASPECTS}"
+        Util.warn "Warning: invalid si_aspect: `#{args[:si_aspect]}``. " \
+                  "It should be one of: `#{SI_ASPECTS.join('`, `')}`"
       end
 
       @comment_period = args.delete :comment_period

data/lib/relaton_bipm/bipm_bibliography.rb

@@ -9,15 +9,15 @@ module RelatonBipm
       # @param text [String]
       # @return [RelatonBipm::BipmBibliographicItem]
       def search(text, _year = nil, _opts = {}) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-        warn "[relaton-bipm] (\"#{text}\") fetching..."
+        Util.warn "(#{text}) fetching..."
         ref = text.sub(/^BIPM\s/, "")
         item = get_bipm(ref, magent)
         unless item
-          warn "[relaton-bipm] (\"#{text}\") not found."
+          Util.warn "(#{text}) not found."
           return
         end
 
-        warn("[relaton-bipm] (\"#{text}\") found #{item.docidentifier[0].id}")
+        Util.warn("(#{text}) found `#{item.docidentifier[0].id}`")
         item
       rescue Mechanize::ResponseCodeError => e
         raise RelatonBib::RequestError, e.message unless e.response_code == "404"

data/lib/relaton_bipm/committee.rb

@@ -11,8 +11,8 @@ module RelatonBipm
     def initialize(acronym:, content: nil)
       acronyms = YAML.load_file File.join(__dir__, "acronyms.yaml")
       unless acronyms[acronym]
-        warn "[relaton-bipm] WARNING: invalid acronym: #{acronym}. Allowed " \
-             "values: #{acronyms.map { |k, _v| k }.join ', '}"
+        Util.warn "WARNING: invalid acronym: `#{acronym}`. Allowed " \
+                  "values: `#{acronyms.map { |k, _v| k }.join '`, `'}`"
       end
 
       @acronym = acronym

data/lib/relaton_bipm/config.rb

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

data/lib/relaton_bipm/id_parser.rb

@@ -76,7 +76,7 @@ module RelatonBipm
     def initialize(id)
       @id = Parser.new.parse(id)
     rescue Parslet::ParseFailed => e
-      warn "[relaton-bipm] Incorrect reference: #{id}"
+      Util.warn "Incorrect reference: `#{id}`"
       # warn "[relaton-bipm] #{e.parse_failure_cause.ascii_tree}"
       raise RelatonBib::RequestError, e
     end

data/lib/relaton_bipm/util.rb

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

data/lib/relaton_bipm/version.rb

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

data/lib/relaton_bipm.rb

@@ -3,6 +3,8 @@ require "fileutils"
 require "parslet"
 require "relaton_bib"
 require "relaton/index"
+require "relaton_bipm/config"
+require "relaton_bipm/util"
 require "relaton_bipm/id_parser"
 require "relaton_bipm/version"
 require "relaton_bipm/editorial_group"
@@ -28,10 +30,10 @@ module RelatonBipm
   # 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 RelatonBipm::VERSION + RelatonBib::VERSION # grammars
   end
 
   extend self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bipm
 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: faraday
@@ -127,6 +127,7 @@ files:
 - lib/relaton_bipm/bipm_si_brochure_parser.rb
 - lib/relaton_bipm/comment_periond.rb
 - lib/relaton_bipm/committee.rb
+- lib/relaton_bipm/config.rb
 - lib/relaton_bipm/data_fetcher.rb
 - lib/relaton_bipm/data_outcomes_parser.rb
 - lib/relaton_bipm/document_relation.rb
@@ -137,6 +138,7 @@ files:
 - lib/relaton_bipm/rawdata_bipm_metrologia/article_parser.rb
 - lib/relaton_bipm/rawdata_bipm_metrologia/fetcher.rb
 - lib/relaton_bipm/structured_identifier.rb
+- lib/relaton_bipm/util.rb
 - lib/relaton_bipm/version.rb
 - lib/relaton_bipm/workgroup.rb
 - lib/relaton_bipm/xml_parser.rb