relaton-gb 1.19.0 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92e9e83e3558899a7705d5e279a1d8458d7a3417ade6b26f4a06835e7ac25005
-  data.tar.gz: 6b5bfd8af41d5ef1a8ddb3aa96b34787f2bf5372f31a729943bcba3426cb3147
+  metadata.gz: 1a6f089b0e88176b0a975002a00cc353ecddc6f611721b89886f5578b047a893
+  data.tar.gz: c962a506d4d9b6359c9ae7e041ae78a6dd61d3b096bfa12833e19cdb8404556c
 SHA512:
-  metadata.gz: 0032bd0054227d78ccec76d8ba302a01a11085a15a89e8cf03d609f96088998dde81bdc93981e50a88239e6d1bf78d9d039a6f3118d011c9e4254bf91eb9872f
-  data.tar.gz: ad973c15f76b194dbd6c9198cc391b3e2d4b2313bce3dfa325bcf5d7f99d1f0a0b3cd7e60bfca7527a6b54ac854206b784b20159128690eccd5d83dcf96e701f
+  metadata.gz: 03e7d65e846285ae4c246b6b0d5c17cda499391413ff49254a535aa0a7413699c740fa736a620291963dacd0d02d16af23b58f2825426a0c45a9c6d1437017a7
+  data.tar.gz: 19ee5ac1b544b344bd051515d14b3558dd6b71eeed66228a8178b5ab6c4c54f322b3ff12a585569e2866334641553a36fcc63bd95da7618f8d3dd6a49c48266c

data/lib/relaton_gb/gb_bibliographic_item.rb

@@ -57,7 +57,7 @@ module RelatonGb
     # @return [String] XML
     def to_xml(**opts) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       super(**opts) do |b|
-        if opts[:bibdata] && has_ext_attrs?
+        if opts[:bibdata] && has_ext?
           ext = b.ext do
             doctype&.to_xml b
             b.horizontal horizontal unless horizontal.nil?
@@ -76,13 +76,17 @@ module RelatonGb
     # @return [Hash]
     def to_hash # rubocop:disable Metrics/AbcSize
       hash = super
-      hash["ccs"] = single_element_array(ccs) if ccs&.any?
-      hash["committee"] = committee.to_hash if committee
-      hash["plannumber"] = gbplannumber if gbplannumber
-      hash["gbtype"] = gbtype.to_hash
+      hash["ext"]["ccs"] = single_element_array(ccs) if ccs&.any?
+      hash["ext"]["committee"] = committee.to_hash if committee
+      hash["ext"]["plannumber"] = gbplannumber if gbplannumber
+      hash["ext"]["gbtype"] = gbtype.to_hash if gbtype
       hash
     end
 
+    def has_ext?
+      super || ccs&.any? || committee || gbplannumber || gbtype
+    end
+
     # @param prefix [String]
     # @return [String]
     def to_asciibib(prefix = "")
@@ -128,8 +132,8 @@ module RelatonGb
     #
     # @return [Boolean]
     #
-    def has_ext_attrs?
-      super || committee || docsubtype
-    end
+    # def has_ext_attrs?
+    #   super || committee || docsubtype
+    # end
   end
 end

data/lib/relaton_gb/hash_converter.rb

@@ -11,6 +11,9 @@ module RelatonGb
       ret = super
       return if ret.nil?
 
+      ret[:committee] = ret[:ext][:committee] if ret.dig(:ext, :committee)
+      ret[:plannumber] = ret[:ext][:plannumber] if ret.dig(:ext, :plannumber)
+      ret[:gbtype] = ret[:ext][:gbtype] if ret.dig(:ext, :gbtype)
       ccs_hash_to_bib(ret)
       ret
     end
@@ -27,8 +30,11 @@ module RelatonGb
     end
 
     def ccs_hash_to_bib(ret)
-      ret[:ccs] = RelatonBib.array(ret[:ccs]).map do |ccs|
-        (ccs[:code] && Cnccs.fetch(ccs[:code])) || Cnccs.fetch(ccs)
+      ccs = ret.dig(:ext, :ccs) || ret[:ccs] # @TODO: remove ret[:ccs] after all specs are updated
+      return unless ccs
+
+      ret[:ccs] = RelatonBib.array(ccs).map do |item|
+        (item[:code] && Cnccs.fetch(item[:code])) || Cnccs.fetch(item)
       end
     end
 

data/lib/relaton_gb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RelatonGb
-  VERSION = "1.19.0"
+  VERSION = "1.20.0"
 end

data/relaton_gb.gemspec

@@ -27,6 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "cnccs", "~> 0.1.1"
   spec.add_dependency "gb-agencies", "~> 0.0.1"
   spec.add_dependency "mechanize", "~> 2.10"
-  spec.add_dependency "relaton-iso-bib", "~> 1.19.0"
+  spec.add_dependency "relaton-iso-bib", "~> 1.20.0"
   spec.add_dependency "csv", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-gb
 version: !ruby/object:Gem::Version
-  version: 1.19.0
+  version: 1.20.0
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-03 00:00:00.000000000 Z
+date: 2024-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cnccs
@@ -58,14 +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
+        version: 1.20.0
 - !ruby/object:Gem::Dependency
   name: csv
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ homepage: https://github.com/metanorma/relaton_gb
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.27
-signing_key: 
+signing_key:
 specification_version: 4
 summary: 'RelatonGb: retrieve Chinese GB Standards for bibliographic use using the
   BibliographicItem model.'