relaton-omg 1.16.0 → 1.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09695948d1a4ddc939f6b1d693c32c941461e1df4fa0cd450529dfad4e693730'
-  data.tar.gz: c854b94cd8198b8694ddf3b23b361491290d2f1e34755ac0c1600f7aa65305b1
+  metadata.gz: bf765669d79fa3b144851fb1ed70d7a07e42001ec1db537042582caccad95eef
+  data.tar.gz: 796eede5c6f75112df5b0c410705cbda8381958b81e44fd58e2fa895547254c1
 SHA512:
-  metadata.gz: 65505aeb7a4433c99880b155fee9edff0f3371daf48bb456cab07d8e4823de6b8829c4683ed470c90b8f49161f4957e2576cd04fcfe16b9c85250dee7693dd1f
-  data.tar.gz: 3ea62121336fe256c32dfbd78d4b6f26209de6f8a0efc5b3469b345e28cbc29ac6ccb21c0e58c3c8d33b296bd80aa77e02aeec4b83aae5e3f5dc85651535ec5d
+  metadata.gz: fbc567d8ce33479788dd18d656c6310185e15eabde27e687ffbe9baf85e3f11f3f0652e19950599cb2a279b79fe8512b20cfb7698eb739637cfceff0d0586982
+  data.tar.gz: af419bb675586598d1a04a3de0d00de23b1ad5b484f70acbddbc9b143167ca595737730fc6bca03d5601a8cb24e0191e54b48838efe18f9a33a4792b2edf802d

data/README.adoc

@@ -31,6 +31,20 @@ Or install it yourself as:
 
 == Usage
 
+=== Configuration
+
+Configuration is optional. The available option is `logger` which is a `Logger` instance. By default, the logger is `Logger.new($stderr)` with `Logger::WARN` level. To change the logger level, use `RelatonOmg.configure` block.
+
+[source,ruby]
+----
+require 'relaton_omg'
+=> true
+
+RelatonOmg.configure do |config|
+  config.logger.level = Logger::DEBUG
+end
+----
+
 === Search document
 
 Reference format is `OMG + {ACRONYM} + {VERSION}`
@@ -40,16 +54,16 @@ Reference format is `OMG + {ACRONYM} + {VERSION}`
 
 [source,ruby]
 ----
-require 'relaton_omg'
-=> true
-
 item = RelatonOmg::OmgBibliography.get 'OMG AMI4CCM 1.0'
-=> #<RelatonOmg::OmgBibliographicItem:0x007fda17eab2f0
+[relaton-omg] (OMG AMI4CCM 1.0) Fetching from www.omg.org ...
+[relaton-omg] (OMG AMI4CCM 1.0) Found: `AMI4CCM 1.0`
+=> #<RelatonOmg::OmgBibliographicItem:0x000000010435a520
 ...
 
 # Return nil if the document doesn't exist.
 RelatonOmg::OmgBibliography.get 'OMG 1111'
-[relaton-omg] no document found for "OMG 1111" reference.
+[relaton-omg] (OMG 1111) Fetching from www.omg.org ...
+[relaton-omg] (OMG 1111) Not found.
 => nil
 ----
 

data/lib/relaton_omg/config.rb

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

data/lib/relaton_omg/omg_bibliography.rb

@@ -15,7 +15,14 @@ module RelatonOmg
       # @param opts [Hash] options
       # @return [RelatonOmg::OmgBibliographicItem]
       def get(code, _year = nil, _opts = {})
-        search code
+        Util.warn "(#{code}) Fetching from www.omg.org ..."
+        result = search code
+        if result
+          Util.warn "(#{code}) Found: `#{result.docidentifier.first.id}`"
+        else
+          Util.warn "(#{code}) Not found."
+        end
+        result
       end
     end
   end

data/lib/relaton_omg/scrapper.rb

@@ -14,12 +14,9 @@ module RelatonOmg
         doc = Nokogiri::HTML OpenURI.open_uri(url, open_timeout: 10)
         OmgBibliographicItem.new(**item(doc, acronym))
       rescue OpenURI::HTTPError, URI::InvalidURIError, Net::OpenTimeout => e
-        if e.is_a?(URI::InvalidURIError) || e.io.status[0] == "404"
-          warn %{[relaton-omg] no document found for "#{ref}" reference.}
-          return
-        end
+        return if e.is_a?(URI::InvalidURIError) || e.io.status[0] == "404"
 
-        raise RelatonBib::RequestError, "Unable acces #{url} (#{e.io.status.join(" ")}"
+        raise RelatonBib::RequestError, "Unable acces #{url} (#{e.io.status.join(' ')}"
       end
 
       private
@@ -121,4 +118,4 @@ module RelatonOmg
       end
     end
   end
-end
+end

data/lib/relaton_omg/util.rb

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

data/lib/relaton_omg/version.rb

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

data/lib/relaton_omg.rb

@@ -1,6 +1,8 @@
 require "nokogiri"
 require "relaton_bib"
 require "relaton_omg/version"
+require "relaton_omg/config"
+require "relaton_omg/util"
 require "relaton_omg/scrapper"
 require "relaton_omg/omg_bibliography"
 require "relaton_omg/omg_bibliographic_item"
@@ -11,9 +13,9 @@ module RelatonOmg
   # 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 RelatonOmg::VERSION + RelatonBib::VERSION # grammars
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-omg
 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-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: relaton-bib
@@ -51,11 +51,13 @@ files:
 - grammars/relaton-omg-compile.rng
 - grammars/relaton-omg.rng
 - lib/relaton_omg.rb
+- lib/relaton_omg/config.rb
 - lib/relaton_omg/hash_converter.rb
 - lib/relaton_omg/omg_bibliographic_item.rb
 - lib/relaton_omg/omg_bibliography.rb
 - lib/relaton_omg/processor.rb
 - lib/relaton_omg/scrapper.rb
+- lib/relaton_omg/util.rb
 - lib/relaton_omg/version.rb
 - lib/relaton_omg/xml_parser.rb
 - relaton_omg.gemspec