relaton-un 1.18.1 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dae4aa964d9746c12a509b7d9ff2d58b50d6465ec8a6d4eca8a5a24255118080
-  data.tar.gz: c8b47b15603b0b1b9565c0c12b5c6fb4b4a4352d207c228c314473981fef635c
+  metadata.gz: e9120476339806fdcd9a828b2964ac3ecbda39e6e36145677f845a7bb0aa9a85
+  data.tar.gz: a738350b59eb157fef698cab95ecd7b5b5d65cdf3b25ebea0edbe7ba850da95b
 SHA512:
-  metadata.gz: b05b6dfcae803d7d0c3d8d9128258545f6487ce1e212f699ed1700d96d1de6abdc7d67a485185807b4c07d3749b4f0c23fae82a48bd2b32cb2979e65b93a925b
-  data.tar.gz: 64cd19f4922196a8d5e2aaa914882031721b1fd6320ae516179a8a4360a1c9f310ae74bca238c810f78dee22b36bfdc44ed0f3fca396841fecd9663018d192a1
+  metadata.gz: 2b9a11306d032945d285d55353cc089b09ca35d97138d044778803a6fdbde552d4058c8eb7a90668e33653cf16d4e60b136fd132c066dae22904e73932b942d5
+  data.tar.gz: deb641be672158598d41550ff20bbcafb4a70dc13fbdd420d7a1ce5670263a2235b703831417ac4eaaf875ede2b3b48172242a74d40b509dd9c7088bea5c6132

data/README.adoc

@@ -23,24 +23,13 @@ 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 `RelatonUn.configure` block.
+=== Search for a standard using keywords
 
 [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>
 
@@ -122,6 +111,10 @@ RelatonUn::UnBibliographicItem.new **bib_hash
 ...
 ----
 
+=== Logging
+
+RelatonUn uses the relaton-logger gem for logging. By default, it logs to STDOUT. To change the log levels and add other loggers, read the https://github.com/relaton/relaton-logger#usage[relaton-logger] documentation.
+
 == Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/grammars/basicdoc.rng

@@ -244,6 +244,9 @@
         <data type="ID"/>
       </attribute>
       <attribute name="reviewer"/>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="date">
           <data type="dateTime"/>

data/lib/relaton_un/document_type.rb

@@ -12,7 +12,7 @@ module RelatonUn
 
     def check_type(type)
       unless DOCTYPES.include? type
-        Util.warn "WARNING: invalid doctype: `#{type}`"
+        Util.warn "invalid doctype: `#{type}`"
       end
     end
   end

data/lib/relaton_un/hash_converter.rb

@@ -10,21 +10,33 @@ module RelatonUn
       ret = super
       return if ret.nil?
 
-      ret[:submissionlanguage] = RelatonBib.array ret[:submissionlanguage]
+      hash_to_bib_submissions ret
       session_hash_to_bib ret
+      ret[:distribution] = ret[:ext][:distribution] if ret.dig(:ext, :distribution)
+      ret[:job_number] = ret[:ext][:job_number] if ret.dig(:ext, :job_number)
       ret
     end
 
     private
 
+    def hash_to_bib_submissions(ret)
+      sm = ret.dig(:ext, :submissionlanguage) || ret[:submissionlanguage] # @TODO remove args[:submissionlanguage] after all gems are updated
+      return unless sm
+
+      ret[:submissionlanguage] = RelatonBib.array sm
+    end
+
     # @param ret [Hash]
     def session_hash_to_bib(ret)
-      ret[:session] = Session.new(**ret[:session]) if ret[:session]
+      session = ret.dig(:ext, :session) || ret[:session] # @TODO remove ret[:session] after all gems are updated
+      return unless session
+
+      ret[:session] = Session.new(**session)
     end
 
     # @param ret [Hash]
     def editorialgroup_hash_to_bib(ret)
-      eg = ret[:editorialgroup]
+      eg = ret.dig(:ext, :editorialgroup) || ret[:editorialgroup] # @TODO remove ret[:editorialgroup] after all gems are updated
       return unless eg
 
       committee = eg.map { |e| e[:committee] }

data/lib/relaton_un/un_bibliographic_item.rb

@@ -19,7 +19,7 @@ module RelatonUn
     # @param job_number [String, nil]
     def initialize(**args)
       if args[:distribution] && !DISTRIBUTIONS.has_value?(args[:distribution])
-        Util.warn "WARNING: Invalid distribution: `#{args[:distribution]}`"
+        Util.warn "Invalid distribution: `#{args[:distribution]}`"
       end
       @submissionlanguage = args.delete :submissionlanguage
       @distribution = args.delete :distribution
@@ -67,14 +67,18 @@ module RelatonUn
     def to_hash(embedded: false) # rubocop:disable Metrics/AbcSize
       hash = super
       if submissionlanguage&.any?
-        hash["submissionlanguage"] = single_element_array submissionlanguage
+        hash["ext"]["submissionlanguage"] = single_element_array submissionlanguage
       end
-      hash["distribution"] = distribution if distribution
-      hash["session"] = session.to_hash if session
-      hash["job_number"] = job_number if job_number
+      hash["ext"]["distribution"] = distribution if distribution
+      hash["ext"]["session"] = session.to_hash if session
+      hash["ext"]["job_number"] = job_number if job_number
       hash
     end
 
+    def has_ext?
+      super || submissionlanguage&.any? || distribution || session || job_number
+    end
+
     # @param prefix [String]
     # @return [String]
     def to_asciibib(prefix = "") # rubocop:disable Metrics/AbcSize

data/lib/relaton_un/un_bibliography.rb

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

data/lib/relaton_un/util.rb

@@ -1,9 +1,6 @@
 module RelatonUn
   module Util
     extend RelatonBib::Util
-
-    def self.logger
-      RelatonUn.configuration.logger
-    end
+    PROGNAME = "relaton-un".freeze
   end
 end

data/lib/relaton_un/version.rb

@@ -1,3 +1,3 @@
 module RelatonUn
-  VERSION = "1.18.1".freeze
+  VERSION = "1.20.0".freeze
 end

data/lib/relaton_un/xml_parser.rb

@@ -57,6 +57,10 @@ module RelatonUn
       def fetch_submissionlanguage(ext)
         ext.xpath("./submissionlanguage").map(&:text)
       end
+
+      def create_doctype(type)
+        DocumentType.new type: type.text, abbreviation: type[:abbreviation]
+      end
     end
   end
 end

data/lib/relaton_un.rb

@@ -1,7 +1,6 @@
 require "addressable"
 require "relaton_bib"
 require "relaton_un/version"
-require "relaton_un/config"
 require "relaton_un/util"
 require "relaton_un/document_type"
 require "relaton_un/un_bibliographic_item"

data/relaton_un.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "addressable", "~> 2.8.0"
   spec.add_dependency "faraday", "~> 2.7.0"
   spec.add_dependency "http-cookie", "~> 1.0.5"
-  spec.add_dependency "relaton-bib", "~> 1.18.0"
+  spec.add_dependency "relaton-bib", "~> 1.20.0"
   spec.add_dependency "unf_ext", ">= 0.0.7.7"
 end
 # rubocop:enable Metrics/BlockLength

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-un
 version: !ruby/object:Gem::Version
-  version: 1.18.1
+  version: 1.20.0
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-16 00:00:00.000000000 Z
+date: 2024-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: 1.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: 1.20.0
 - !ruby/object:Gem::Dependency
   name: unf_ext
   requirement: !ruby/object:Gem::Requirement
@@ -106,7 +106,6 @@ files:
 - grammars/relaton-un-compile.rng
 - grammars/relaton-un.rng
 - lib/relaton_un.rb
-- lib/relaton_un/config.rb
 - lib/relaton_un/document_type.rb
 - lib/relaton_un/editorialgroup.rb
 - lib/relaton_un/hash_converter.rb
@@ -127,7 +126,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/relaton/relaton-un
   source_code_uri: https://github.com/relaton/relaton-un
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -142,8 +141,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key: 
+rubygems_version: 3.3.27
+signing_key:
 specification_version: 4
 summary: 'RelatonIso: retrieve CC Standards for bibliographic use using the IsoBibliographicItem
   model'

data/lib/relaton_un/config.rb

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