relaton-bipm 1.19.3 → 1.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c9261622d7be459730444f639a2b7f91a6606600a8aa1d0e4806036a766235c
-  data.tar.gz: 0b285754154788c58a7cfb812c92c5cc54331ea6f52e41dd71c129e59ffa5660
+  metadata.gz: 3f82a59533864cf6f80702a221409634b40078c86a3089b8f0578cca757052f6
+  data.tar.gz: 6b34ad48868eb793e6d34b4e049ff688144efde7e8431020e618e4f77b7d0185
 SHA512:
-  metadata.gz: 573c4e55c1d0cc0ecfc2f96c3dccf31f0a85790a433c9332db3d0f8478bcc2d32330fb7727187102045378cbf9555ede82e05871c54024e04267a16b40629372
-  data.tar.gz: 61f92667f0154f11345ca3bec967a2fee19ac2d4795ef81ffc50561f5c554000501e5f0d26a337b903a3be2a2f76cd637026cbb7daaf4206e032bd609aef960e
+  metadata.gz: 5894ea600bac7d43358e31dfdfc4114a83e29962850c07b258424dbb208d7c8087b27bfe927ea82546266ee3babdfeabf7228b81b43bb5889beadba4759ab537
+  data.tar.gz: dd53039d5050bce849c4bed6a6df73046c0ef2c578cd85134ed561a85d27b60367dbc47fbd3e179a0773ba8de98d88b8ee23da44ce196745890ca371f7ab221c

data/lib/relaton_bipm/bipm_bibliographic_item.rb

@@ -86,12 +86,16 @@ module RelatonBipm
     #
     def to_hash(embedded: false)
       hash = super
-      hash["comment_period"] = comment_period.to_hash if comment_period
-      hash["si_aspect"] = si_aspect if si_aspect
-      hash["meeting_note"] = meeting_note if meeting_note
+      hash["ext"]["comment_period"] = comment_period.to_hash if comment_period
+      hash["ext"]["si_aspect"] = si_aspect if si_aspect
+      hash["ext"]["meeting_note"] = meeting_note if meeting_note
       hash
     end
 
+    def has_ext?
+      super || comment_period || si_aspect || meeting_note
+    end
+
     # @param prefix [String]
     # @return [String]
     def to_asciibib(prefix = "")

data/lib/relaton_bipm/hash_converter.rb

@@ -17,6 +17,7 @@ module RelatonBipm
 
       # project_group_hash_to_bib ret
       commentperiod_hash_to_bib ret
+      ret[:si_aspect] = args["ext"]["si_aspect"] if args.dig("ext", "si_aspect")
       ret
     end
 
@@ -42,7 +43,10 @@ module RelatonBipm
 
     # @param ret [Hash]
     def commentperiod_hash_to_bib(ret)
-      ret[:comment_period] &&= CommentPeriond.new(**ret[:comment_period])
+      compr = ret.dig(:ext, :comment_period) || ret[:comment_period] # @TODO: remove ret[:comment_period] after all data is updated
+      return unless compr
+
+      ret[:comment_period] &&= CommentPeriond.new(**compr)
     end
 
     # @param ret [Hash]
@@ -69,16 +73,17 @@ module RelatonBipm
 
     # @param ret [Hash]
     def editorialgroup_hash_to_bib(ret) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
-      return unless ret[:editorialgroup]
+      ed = ret.dig(:ext, :editorialgroup) || ret[:editorialgroup] # @TODO: remove ret[:editorialgroup] after all data is updated
+      return unless ed
 
-      cmt = ret[:editorialgroup][:committee].map do |c|
+      cmt = ed[:committee].map do |c|
         if (vars = committee_variants c).any?
           Committee.new acronym: c[:acronym], content: vars
         else
           Committee.new(**c)
         end
       end
-      wg = RelatonBib.array(ret[:editorialgroup][:workgroup]).map do |w|
+      wg = RelatonBib.array(ed[:workgroup]).map do |w|
         w.is_a?(Hash) ? WorkGroup.new(**w) : WorkGroup.new(content: w)
       end
       ret[:editorialgroup] = EditorialGroup.new committee: cmt, workgroup: wg
@@ -97,9 +102,10 @@ module RelatonBipm
 
     # @param ret [Hash]
     def structuredidentifier_hash_to_bib(ret)
-      ret[:structuredidentifier] &&= StructuredIdentifier.new(
-        **ret[:structuredidentifier],
-      )
+      struct_id = ret.dig(:ext, :structuredidentifier) || ret[:structuredidentifier] # @TODO: remove ret[:structuredidentifier] after all data is updated
+      return unless struct_id
+
+      ret[:structuredidentifier] = StructuredIdentifier.new(**struct_id)
     end
 
     def create_doctype(**args)

data/lib/relaton_bipm/version.rb

@@ -1,3 +1,3 @@
 module RelatonBipm
-  VERSION = "1.19.3".freeze
+  VERSION = "1.20.1".freeze
 end

data/relaton_bipm.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.add_dependency "faraday", "~> 2.7.0"
   spec.add_dependency "mechanize", "~> 2.10"
   spec.add_dependency "parslet", "~> 2.0.0"
-  spec.add_dependency "relaton-bib", "~> 1.19.0"
+  spec.add_dependency "relaton-bib", "~> 1.20.0"
   spec.add_dependency "relaton-index", "~> 0.2.2"
   spec.add_dependency "rubyzip", "~> 2.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bipm
 version: !ruby/object:Gem::Version
-  version: 1.19.3
+  version: 1.20.1
 platform: ruby
 authors:
 - Ribose Inc.
@@ -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: relaton-index
   requirement: !ruby/object:Gem::Requirement
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.19
+rubygems_version: 3.3.27
 signing_key:
 specification_version: 4
 summary: 'RelatonBipm: retrieve BIPM Standards for bibliographic use using the BibliographicItem