relaton-un 1.16.0 → 1.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c6791ae82b472328fb219a6b7fc1fba4ea6c5b8539120f8131079cf4d66fcee
-  data.tar.gz: 78eccc13a3e597c377d7e82ad474b8c86345118dfd9119fdfb0ee9830e235cc6
+  metadata.gz: be81c113682d65c26375bc01785feb1081d04f0b127046c6e58faa24dfe7754b
+  data.tar.gz: 0b5e84ea07955fee78f7b8ac57c95551940b0cceb41103b2891c6fdf7129dc5d
 SHA512:
-  metadata.gz: 2d53ebca1c9e6c802953b6598aec20f91ec15fe2c80f1af3ea09f1fae4b502b14713e7442491cdd5ca10c84cb5ac7307e6dbbe967b839527cf1ecbfd05afb34d
-  data.tar.gz: 9761c548c89ec7a5426f1984e3c3e61003c9869f78c9441333a21070bea317c69f36b46bbbd99ffe791ae084580713f42f5d43797d0b92babff961356b51b9ba
+  metadata.gz: 75b2052a163ec18d01a2ed7747846d20346a066c69e4aa57d07be3fb4134b2ccbdf7fa483551ea4514fe95e50ad32615f66d1557a4e909da66157bc1c5f5cff0
+  data.tar.gz: 11ec5a1d7a1a4bb4759edbbee5005b9c187b06417507a652dfb61d89ae66cf18e32e095eb35425d23a05cfc9bb828196abb4c72c0aeee73dce279e31b964bc95

data/README.adoc

@@ -23,13 +23,24 @@ Or install it yourself as:
 
 == Usage
 
-=== Search for a standard using keywords
+=== 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 `RelatonUn.configure` block.
 
 [source,ruby]
 ----
 require 'relaton_un'
 => true
 
+RelatonUn.configure do |config|
+  config.logger.level = Logger::DEBUG
+end
+----
+
+=== Search for a standard using keywords
+
+[source,ruby]
+----
 hits = RelatonUn::UnBibliography.search("TRADE/CEFACT/2004/32")
 => <RelatonUn::HitCollection:0x007fc4e6ec2018 @ref=TRADE/CEFACT/2004/32 @fetched=false>
 
@@ -69,8 +80,8 @@ item.to_xml bibdata: true
 [source,ruby]
 ----
 RelatonUn::UnBibliography.get "UN TRADE/CEFACT/2004/32"
-[relaton-un] ("UN TRADE/CEFACT/2004/32") fetching...
-[relaton-un] ("UN TRADE/CEFACT/2004/32") found TRADE/CEFACT/2004/32
+[relaton-un] (UN TRADE/CEFACT/2004/32) Fetching from documents.un.org ...
+[relaton-un] (UN TRADE/CEFACT/2004/32) Found: `TRADE/CEFACT/2004/32`
 => #<RelatonUn::UnBibliographicItem:0x007fdc5f1c3a20
 ...
 ----

data/lib/relaton_un/config.rb

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

data/lib/relaton_un/hit_collection.rb

@@ -6,13 +6,13 @@ require "http-cookie"
 module RelatonUn
   # Page of hit collection.
   class HitCollection < RelatonBib::HitCollection
-    AGENT = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_5) "\
-    "AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.102 Safari/537.36"
+    AGENT = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_5) AppleWebKit/537.36 " \
+            "(KHTML, like Gecko) Chrome/85.0.4183.102 Safari/537.36"
     DOMAIN = "https://documents.un.org"
     BOUNDARY = "----WebKitFormBoundaryVarT9Z7AFUzw2lma"
 
     # @param text [String] reference to search
-    def initialize(text) # rubocop:disable Metrics/AbcSize
+    def initialize(text) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       super
       @uri = URI.parse DOMAIN
       @jar = HTTP::CookieJar.new

data/lib/relaton_un/un_bibliographic_item.rb

@@ -24,7 +24,7 @@ module RelatonUn
     # @param job_number [String, nil]
     def initialize(**args)
       if args[:distribution] && !DISTRIBUTIONS.has_value?(args[:distribution])
-        warn "[relaton-un] WARNING: invalid distribution: #{args[:distribution]}"
+        Util.warn "WARNING: Invalid distribution: `#{args[:distribution]}`"
       end
       @submissionlanguage = args.delete :submissionlanguage
       @distribution = args.delete :distribution

data/lib/relaton_un/un_bibliography.rb

@@ -21,13 +21,15 @@ module RelatonUn
       # @param opts [Hash] options
       # @return [RelatonUn::UnBibliographicItem]
       def get(ref, _year = nil, _opts = {})
-        warn "[relaton-un] (\"#{ref}\") fetching..."
+        Util.warn "(#{ref}) Fetching from documents.un.org ..."
         /^(?:UN\s)?(?<code>.*)/ =~ ref
         result = isobib_search_filter(code)
         if result
-          warn "[relaton-un] (\"#{ref}\") "\
-            "found #{result.fetch.docidentifier[0].id}"
+          Util.warn "(#{ref}) Found: `#{result.fetch.docidentifier[0].id}`"
           result.fetch
+        else
+          Util.warn "(#{ref}) Not found."
+          nil
         end
       end
 

data/lib/relaton_un/util.rb

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

data/lib/relaton_un/version.rb

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

data/lib/relaton_un.rb

@@ -1,6 +1,8 @@
 require "addressable"
 require "relaton_bib"
 require "relaton_un/version"
+require "relaton_un/config"
+require "relaton_un/util"
 require "relaton_un/un_bibliographic_item"
 require "relaton_un/un_bibliography"
 require "relaton_un/hit_collection"
@@ -16,9 +18,9 @@ module RelatonUn
   # 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 RelatonUn::VERSION + RelatonBib::VERSION # grammars
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-un
 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: addressable
@@ -106,6 +106,7 @@ files:
 - grammars/relaton-un-compile.rng
 - grammars/relaton-un.rng
 - lib/relaton_un.rb
+- lib/relaton_un/config.rb
 - lib/relaton_un/editorialgroup.rb
 - lib/relaton_un/hash_converter.rb
 - lib/relaton_un/hit.rb
@@ -114,6 +115,7 @@ files:
 - lib/relaton_un/session.rb
 - lib/relaton_un/un_bibliographic_item.rb
 - lib/relaton_un/un_bibliography.rb
+- lib/relaton_un/util.rb
 - lib/relaton_un/version.rb
 - lib/relaton_un/xml_parser.rb
 - relaton_un.gemspec