relaton-un 1.19.0 → 1.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff20c5706705ecaa88945f97b061a823977c356880f4dd45c8556f262d848b74
-  data.tar.gz: 4e291e62cc9cceb8694e332076c32679c4dff39a4d7d77adb8cee0013e0e95e7
+  metadata.gz: 6560e3649781f334dc28f9c4e5d7e7781bead476afe352e82e2c3b4585559cff
+  data.tar.gz: ee9a9eb72db2871de51ef08bde79314c927360c5cd52f368341f2f966ea651f2
 SHA512:
-  metadata.gz: d4cbfa1a929c3a833c9172806fa433f5b4343e5411f6f881f4bf34740c664be847271efc8b32b7bbe7e64dbdabacbe96f6873c67c8788ecfc50b4a114c5b85c4
-  data.tar.gz: edee2e4000a82cfb833ada16951d4e49c345c6480b2afe86dda3fd7bf88f19e8ffb25d427ccb912878de13fd0541a6091bdec0a3c3cc5e3423d09273e90955bc
+  metadata.gz: f23749670c7895c400f9a26d53820f47b0c557a40865936085d41baef7c98564c019e4c9a89a5a25b96e03cac2510798d4a6c6ca03ce56f9571ca07696202b02
+  data.tar.gz: 5501430f6b938e2dbb824e83f7d678200ba0c91c97bcd94335932060b43edf32d5febfc4c8fe62b9b861a21dd3a400fc4501a01de8ed619a765f999a3b08a91e

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

@@ -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/version.rb

@@ -1,3 +1,3 @@
 module RelatonUn
-  VERSION = "1.19.0".freeze
+  VERSION = "1.20.1".freeze
 end

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.19.0"
-  spec.add_dependency "unf_ext", ">= 0.0.7.7"
+  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.19.0
+  version: 1.20.1
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-04 00:00:00.000000000 Z
+date: 2025-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -58,28 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.19.0
-- !ruby/object:Gem::Dependency
-  name: unf_ext
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.7.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.7.7
+        version: 1.20.0
 description: 'RelatonIso: retrieve CC Standards for bibliographic use using the IsoBibliographicItem
   model'
 email:
@@ -126,7 +112,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,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.27
-signing_key: 
+signing_key:
 specification_version: 4
 summary: 'RelatonIso: retrieve CC Standards for bibliographic use using the IsoBibliographicItem
   model'