relaton-ogc 1.16.0 → 1.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87da152cca057f42adce0f783be7106960e30ef3f4360fb00c06c15d9c5ace18
-  data.tar.gz: 6905a639a052950556325baca635bb9a124bc660b55711d50969d707f1c6ff0c
+  metadata.gz: fa6ff540d50e236a8e1aae32805840c0e24a4d17b7b1038b2357472ea74ff65a
+  data.tar.gz: ee011e12cc9aab1b0e0928e13d46627a4b0772cb34e107a401c8d06c3445e27e
 SHA512:
-  metadata.gz: 7d1e6ec43cc8c8b5277ecff697dd8dff43d1b381a3b932844ab0194c0ab55e3fa5d472c62f030c09a7c8b3b97d186b1ed9f7252438fcd01bc7b61a9e3adb6254
-  data.tar.gz: b7156ad6f5237cd742097146dfa620de9e8a030c4bb2e4a7e71d9eacc1b6f301be44ad134950fcbe7555e0df8655ff5d56d91e6e69a1ccaaf7a11067387ca3c6
+  metadata.gz: cc2f32138c399f241989b6288ca4682d55067d14e05ddb7a236119976e4ec725ac5f5362a431364c1704aab503a27112b5665592d3aa67563615380d06acfee1
+  data.tar.gz: 6db6033ad4d01acaedf66fe1bf6ae8fe7ab23127bd690e86e38849897b05961e0c5669a04921db398336d29b3cec1df4cc30ed307905bb944e28776eea32e916

data/lib/relaton_ogc/config.rb

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

data/lib/relaton_ogc/data_fetcher.rb

@@ -72,7 +72,7 @@ module RelatonOgc
       get_data do |etag, json|
         no_errors = true
         json.each { |_, hit| fetch_doc(hit) || no_errors = false }
-        warn "[relaton-ogc] WARNING Duplicated documents: #{@dupids.to_a.join(', ')}" if @dupids.any?
+        warn "WARNING Duplicated documents: #{@dupids.to_a.join(', ')}" if @dupids.any?
         self.etag = etag if no_errors
         index.save
       end

data/lib/relaton_ogc/ogc_bibliography.rb

@@ -23,7 +23,7 @@ module RelatonOgc
         result = bib_search_filter(code, year, opts) || (return nil)
         ret = bib_results_filter(result, year)
         if ret[:ret]
-          warn "[relaton-ogc] (\"#{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])
@@ -33,7 +33,7 @@ module RelatonOgc
       private
 
       def bib_search_filter(code, year, opts)
-        warn "[relaton-ogc] (\"#{code}\") fetching..."
+        Util.warn "(#{code}) fetching..."
         search(code, year, opts)
       end
 
@@ -67,12 +67,12 @@ module RelatonOgc
       # @param year [String]
       # @param missed_years [Array<Strig>]
       def fetch_ref_err(code, year, missed_years)
-        id = year ? "#{code} year #{year}" : code
-        warn "[relaton-ogc] WARNING: no match found online for #{id}. " \
-             "The code must be exactly like it is on the standards website."
+        id = year ? "`#{code}` year `#{year}`" : "#`{code}`"
+        Util.warn "WARNING: no match found online for #{id}. " \
+                  "The code must be exactly like it is on the standards website."
         unless missed_years.empty?
-          warn "[relaton-ogc] (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
         nil
       end

data/lib/relaton_ogc/util.rb

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

data/lib/relaton_ogc/version.rb

@@ -1,3 +1,3 @@
 module RelatonOgc
-  VERSION = "1.16.0".freeze
+  VERSION = "1.16.2".freeze
 end

data/lib/relaton_ogc.rb

@@ -1,6 +1,8 @@
 require "relaton/index"
 require "relaton_iso_bib"
 require "relaton_ogc/version"
+require "relaton_ogc/config"
+require "relaton_ogc/util"
 require "relaton_ogc/ogc_bibliographic_item"
 require "relaton_ogc/ogc_bibliography"
 require "relaton_ogc/data_fetcher"
@@ -17,9 +19,9 @@ module RelatonOgc
   # 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 RelatonOgc::VERSION + RelatonIsoBib::VERSION + RelatonBib::VERSION # grammars
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ogc
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.16.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-03 00:00:00.000000000 Z
+date: 2023-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -78,6 +78,7 @@ files:
 - grammars/relaton-ogc-compile.rng
 - grammars/relaton-ogc.rng
 - lib/relaton_ogc.rb
+- lib/relaton_ogc/config.rb
 - lib/relaton_ogc/data_fetcher.rb
 - lib/relaton_ogc/editorial_group.rb
 - lib/relaton_ogc/hash_converter.rb
@@ -87,6 +88,7 @@ files:
 - lib/relaton_ogc/ogc_bibliography.rb
 - lib/relaton_ogc/processor.rb
 - lib/relaton_ogc/scrapper.rb
+- lib/relaton_ogc/util.rb
 - lib/relaton_ogc/version.rb
 - lib/relaton_ogc/xml_parser.rb
 - relaton_ogc.gemspec