relaton-oasis 1.16.0 → 1.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3908ef54f79de05bfa9ee81c64f27b03e923f13fdd68df2c3a78b14bdc137bcf
-  data.tar.gz: 8e120eac3b886e8536532747a89b64f3c7fd9e64d098435e3e2135bde6f17acb
+  metadata.gz: 6667e673a229cfd5518f00a5c6d021382effa374ad0dfaad7da60865829f6b40
+  data.tar.gz: 82b404a95e5f02139f6a79c601c1a13102d64d8b006d2ac1cf84c5c3c2cbc173
 SHA512:
-  metadata.gz: 2f97cd29537cce17fa2f3ce144a7074727a277131a1ea5739480efe6adc3c7dfd6b7b2fc913c029e9ade56694f243311b7b30f7c5df878d34a46af6d80437fb3
-  data.tar.gz: 7e9373716c8c693c1532c7a0b413dd0d114597baba2c4a95be9d76b3796d76b16a38e2c44255f45b53642428ddbf7cb55c2562a6688c0cf63ca87ceb3f82ade8
+  metadata.gz: 7c0025fadba0c8c04c32b0b35e2212673bed7396953ae5b9164c8a88e958815e5cf932abe44d09d248a24d0f33876fb11c891a08559171d59da01db87ba34f68
+  data.tar.gz: e9c189383c69ed791232f05fd4a2fa52bf3f07040f67f7cc87cd8bb394352b1b891b88aeee9fb0ac7daa998f01c3ec96c679e12b623aba091f1baaf0e95a7a28

data/lib/relaton_oasis/config.rb

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

data/lib/relaton_oasis/oasis_bibliographic_item.rb

@@ -16,8 +16,9 @@ module RelatonOasis
       @technology_area = args.delete(:technology_area) || []
       uta = @technology_area.reject { |a| AREAS.include? a }
       if uta.any?
-        warn "[relaton-oasis] WARNING Unknown technology area: #{uta.join(', ')}"
-        warn "[relaton-oasis] (Valid values are: #{AREAS.join(', ')})"
+        area = uta.size > 1 ? "areas" : "area"
+        Util.warn "WARNING Unknown technology #{area}: `#{uta.join('`, `')}`"
+        Util.warn "Valid values are: `#{AREAS.join('`, `')}`"
       end
       super
     end

data/lib/relaton_oasis/oasis_bibliography.rb

@@ -34,15 +34,15 @@ module RelatonOasis
       #   reference is required
       # @return [RelatonOasis::OasisBibliographicItem, nil]
       def get(code, year = nil, _opts = {}) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
-        warn "[relaton-oasis] (#{code}) fetching..."
+        Util.warn "(#{code}) fetching..."
         bibitem = search code, year
         if bibitem
           docid = bibitem.docidentifier.detect(&:primary).id
-          warn "[relaton-oasis] (#{code}) found #{docid}"
-          bibitem
+          Util.warn "(#{code}) found `#{docid}`"
         else
-          warn "[relaton-oasis] (#{code}) not found"
+          Util.warn "(#{code}) not found"
         end
+        bibitem
       end
     end
   end

data/lib/relaton_oasis/util.rb

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

data/lib/relaton_oasis/version.rb

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

data/lib/relaton_oasis.rb

@@ -4,6 +4,8 @@ require "mechanize"
 require "relaton/index"
 require "relaton_bib"
 require_relative "relaton_oasis/version"
+require_relative "relaton_oasis/config"
+require_relative "relaton_oasis/util"
 require_relative "relaton_oasis/oasis_bibliographic_item"
 require_relative "relaton_oasis/xml_parser"
 require_relative "relaton_oasis/hash_converter"
@@ -21,9 +23,9 @@ module RelatonOasis
   # 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 RelatonOasis::VERSION + RelatonBib::VERSION # grammars
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-oasis
 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-oasis-compile.rng
 - grammars/relaton-oasis.rng
 - lib/relaton_oasis.rb
+- lib/relaton_oasis/config.rb
 - lib/relaton_oasis/data_fetcher.rb
 - lib/relaton_oasis/data_parser.rb
 - lib/relaton_oasis/data_parser_utils.rb
@@ -101,6 +102,7 @@ files:
 - lib/relaton_oasis/oasis_bibliographic_item.rb
 - lib/relaton_oasis/oasis_bibliography.rb
 - lib/relaton_oasis/processor.rb
+- lib/relaton_oasis/util.rb
 - lib/relaton_oasis/version.rb
 - lib/relaton_oasis/xml_parser.rb
 - relaton_oasis.gemspec