relaton-iso-bib 1.19.2 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 860f3d81266f83e7f0a1d83d9f2e6a46ace0756beb111b220cf594396d0dc279
-  data.tar.gz: 7d0370c90d4b736d2639c50ac4911de82979ee1030e8ae195ea365af6d85d372
+  metadata.gz: c67887a51ee3fb592c44c0b17b5a7bd719649f0d6e0bbeaa7d4f78856c9b0470
+  data.tar.gz: 983766d082992e9b953cf6feee7a8e5dc51c14611394d5835d1f9f5ff7b43d68
 SHA512:
-  metadata.gz: bd2746def404ebe7c6f9048567f1f27a48ddb133f4e02b3092a7e5fec809ebc9c1e006c7a6a1a49df5820dde94faf72d334356932d1e948bc38bc514860adafd
-  data.tar.gz: 49d5bfe5dd54eee4cb279cd3a200b3efa4efefb7b77a6c8198dd2802f6e2507478f82c95c82911db439830cb25a458edd6b7b8810116ea54b369ffee114888ac
+  metadata.gz: 13668716fca704f98eb6e4763b920e2aaf92ffea6e098384ce6e55369ab6d5f0936b73869b9ea0b624fc010df3a4739c0cafeb666ad14e09eaf0a5dc85b36305
+  data.tar.gz: fcd8fd493a61ed2220f538b5174517d0d701d7ca35f782818e1135de1e1b3d8362e18d7e9673a2221109049b2191f91ab3e3a4ae13cf666e7655a117b90738dd

data/lib/relaton_iso_bib/hash_converter.rb

@@ -5,6 +5,15 @@ module RelatonIsoBib
 
     private
 
+    def ext_has_to_bib(ret)
+      super
+      ret[:stagename] = ret[:ext][:stagename] if ret.dig(:ext, :stagename)
+      ret[:horizontal] = ret[:ext][:horizontal] unless ret.dig(:ext, :horizontal).nil?
+      ret[:fast_track] = ret[:ext][:fast_track] unless ret.dig(:ext, :fast_track).nil?
+      ret[:price_code] = ret[:ext][:price_code] if ret.dig(:ext, :price_code)
+      ret
+    end
+
     #
     # Ovverides superclass's method
     #
@@ -25,7 +34,7 @@ module RelatonIsoBib
 
     # @param ret [Hash]
     def editorialgroup_hash_to_bib(ret)
-      eg = ret[:editorialgroup]
+      eg = ret.dig(:ext, :editorialgroup) || ret[:editorialgroup] # TODO: remove :editorialgroup after all bibdata are updated
       return unless eg
 
       ret[:editorialgroup] = EditorialGroup.new(
@@ -38,16 +47,18 @@ module RelatonIsoBib
 
     # @param ret [Hash]
     def ics_hash_to_bib(ret)
-      ret[:ics] = RelatonBib.array(ret[:ics]).map do |ics|
-        Ics.new(ics[:code] || ics)
-      end
+      ics = ret.dig(:ext, :ics) || ret[:ics] # TODO: remove :ics after all bibdata are updated
+      return unless ics
+
+      ret[:ics] = RelatonBib.array(ics).map { |item| Ics.new(item[:code] || item) }
     end
 
     # @param ret [Hash]
     def structuredidentifier_hash_to_bib(ret)
-      return unless ret[:structuredidentifier]
+      struct_id = ret.dig(:ext, :structuredidentifier) || ret[:structuredidentifier] # TODO: remove :structuredidentifier after all bibdata are updated
+      return unless struct_id
 
-      ret[:structuredidentifier] = RelatonIsoBib::StructuredIdentifier.new(**ret[:structuredidentifier])
+      ret[:structuredidentifier] = RelatonIsoBib::StructuredIdentifier.new(**struct_id)
     end
 
     def create_doctype(**args)

data/lib/relaton_iso_bib/iso_bibliographic_item.rb

@@ -162,7 +162,7 @@ module RelatonIsoBib
     def to_xml(**opts)
       super(**opts) do |b|
         if block_given? then yield b
-        elsif opts[:bibdata] && has_ext_attrs?
+        elsif opts[:bibdata] && has_ext?
           ext = b.ext do
             doctype.to_xml b if doctype
             b.subdoctype subdoctype if subdoctype
@@ -191,13 +191,17 @@ module RelatonIsoBib
     #
     def to_hash(embedded: false)
       hash = super
-      hash["horizontal"] = horizontal unless horizontal.nil?
-      hash["stagename"] = stagename if stagename
-      hash["fast_track"] = fast_track unless fast_track.nil?
-      hash["price_code"] = price_code if price_code
+      hash["ext"]["horizontal"] = horizontal unless horizontal.nil?
+      hash["ext"]["stagename"] = stagename if stagename
+      hash["ext"]["fast_track"] = fast_track unless fast_track.nil?
+      hash["ext"]["price_code"] = price_code if price_code
       hash
     end
 
+    def has_ext?
+      super || horizontal || stagename || fast_track || price_code
+    end
+
     # @param prefix [String]
     # @return [String]
     def to_asciibib(prefix = "")
@@ -226,9 +230,8 @@ module RelatonIsoBib
     #
     # @return [Boolean]
     #
-    def has_ext_attrs? # rubocop:disable Metrics/CyclomaticComplexity
-      (doctype || !horizontal.nil? || editorialgroup || ics.any? ||
-        structuredidentifier || stagename || horizontal)
+    def has_ext? # rubocop:disable Metrics/CyclomaticComplexity
+      super || !horizontal.nil? || ics&.any? || stagename || !fast_track.nil? || price_code
     end
   end
 end

data/lib/relaton_iso_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonIsoBib
-  VERSION = "1.19.2".freeze
+  VERSION = "1.20.0".freeze
 end

data/relaton_iso_bib.gemspec

@@ -27,5 +27,5 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.add_dependency "isoics", "~> 0.1.6"
-spec.add_dependency "relaton-bib", "~> 1.19.0"
+spec.add_dependency "relaton-bib", "~> 1.20.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iso-bib
 version: !ruby/object:Gem::Version
-  version: 1.19.2
+  version: 1.20.0
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-31 00:00:00.000000000 Z
+date: 2024-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: isoics
@@ -30,14 +30,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
+        version: 1.20.0
 description: 'RelatonIsoBib: Ruby ISOXMLDOC impementation.'
 email:
 - open.source@ribose.com
@@ -78,7 +78,7 @@ homepage: https://github.com/relaton/relaton-iso-bib
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.27
-signing_key: 
+signing_key:
 specification_version: 4
 summary: 'RelatonIsoBib: Ruby ISOXMLDOC impementation.'
 test_files: []