pubid-core 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a3c1e99b3327c14f2364992238d1d6a4040809dca85a6640254e2669784a449
-  data.tar.gz: ca910a6333a2e5e9dc1c907577bee5c3e0c34bc6a891e07b310f4be39e9ecc59
+  metadata.gz: 044351542136162d7aca14a0c3f2997c922c7cee236b2ba5e849284ed3c0b2eb
+  data.tar.gz: '07709b34769d3aef2501c8e715a5757273e0010f332b45760742fdf1b832c617'
 SHA512:
-  metadata.gz: b148eeaf72cd34a292d1da244e33a4c4f7eb1549cca374e9c7da7aadc6a09de262c992de578725ebb5ecaad4c1fa625365dbfda519119ccec82c39da224d71f7
-  data.tar.gz: 9fb7676fbd6e7ffbf1bce920a626d70a260c24e83d59569447595c4e28157e879969b6700423d9199564e915d7929ca5c93a507e2703d79c192f0cc21d6f91cf
+  metadata.gz: c8485180c9bbfd44d7e7f2d8a80177171e17bbd3db278d22a440b470ee82747fbcf5e888872773522aa35106028360dd7318a7af4b091290dbcb11d2835d9f41
+  data.tar.gz: d44abfc112288e85c383f0d9871bf0904cf8dd13a2e5808043371806961bec0b39fa263fd2bcf55e1e31ad099d96b8c80c0834b6258dcc706a9f5fae43646693

data/lib/pubid/core/renderer/base.rb

@@ -42,31 +42,36 @@ module Pubid::Core::Renderer
 
     # Renders amendment and corrigendum when applied through identifier type
     def render_supplement(supplement_params, **args)
-      if supplement_params[:base].type == :amd
-        # render inner amendment (cor -> amd -> base)
-        render_supplement(supplement_params[:base].get_params, **args)
+      base = if supplement_params[:base].type == :amd
+               # render inner amendment (cor -> amd -> base)
+               render_supplement(supplement_params[:base].get_params, **args)
+             else
+               self.class.new(supplement_params[:base].get_params).render_base_identifier(
+                 # always render year for identifiers with supplement
+                 **args.merge({ with_date: true }),
+               )
+             end
+      supplement = case supplement_params[:typed_stage].type.type
+                   when :amd
+                     render_amendments(
+                       [Pubid::Iso::Amendment.new(**supplement_params.slice(:number, :year, :typed_stage, :edition, :iteration))],
+                       args,
+                       nil,
+                     )
+                   when :cor
+                     render_corrigendums(
+                       [Pubid::Iso::Corrigendum.new(**supplement_params.slice(:number, :year, :typed_stage, :edition, :iteration))],
+                       args,
+                       nil,
+                     )
+                     # copy parameters from Identifier only supported by Corrigendum
+                   end
+
+      if supplement_params[:base].language
+        base + supplement + render_language(supplement_params[:base].language, args, nil)
       else
-        self.class.new(supplement_params[:base].get_params).render_base_identifier(
-          # always render year for identifiers with supplement
-          **args.merge({ with_date: true }),
-        )
-      end +
-        case supplement_params[:type].type
-        when :amd
-          render_amendments(
-            [Pubid::Iso::Amendment.new(**supplement_params.slice(:number, :year, :stage, :edition, :iteration))],
-            args,
-            nil,
-          )
-        when :cor
-          render_corrigendums(
-            [Pubid::Iso::Corrigendum.new(**supplement_params.slice(:number, :year, :stage, :edition, :iteration))],
-            args,
-            nil,
-          )
-          # copy parameters from Identifier only supported by Corrigendum
-        end +
-        (supplement_params[:base].language ? render_language(supplement_params[:base].language, args, nil) : "")
+        base + supplement
+      end
     end
 
     # Render identifier

data/lib/pubid/core/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Core
-    VERSION = "1.2.2".freeze
+    VERSION = "1.3.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-core
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-15 00:00:00.000000000 Z
+date: 2022-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake