pubid-core 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cc372a0160fd8c1a670be2957f3b3e0a98766dd89ed6f8782b1f52085bcbb8f
-  data.tar.gz: 9a0d58a218b982531fe206bd7505203428ec6f9d7dcbaa649f80267b09e44030
+  metadata.gz: 044351542136162d7aca14a0c3f2997c922c7cee236b2ba5e849284ed3c0b2eb
+  data.tar.gz: '07709b34769d3aef2501c8e715a5757273e0010f332b45760742fdf1b832c617'
 SHA512:
-  metadata.gz: 04e0297f6ce7bea0cabc3e41c7718e1eee523f93e039fa42f4b08c7a34d4fcb7b3c979fbcdb2c0c7bd980b4523d2c6985198cf61f03bb1fad64765a51ad2ccd8
-  data.tar.gz: f0c98e3158ff918fe1f0df2e5ae3c2e7cff838e6cdf37cd078d1abdc1d147561b2453ffb6b5c749dbc7b019f1691f59d0b0b52356a61efcbb10533ce44319d64
+  metadata.gz: c8485180c9bbfd44d7e7f2d8a80177171e17bbd3db278d22a440b470ee82747fbcf5e888872773522aa35106028360dd7318a7af4b091290dbcb11d2835d9f41
+  data.tar.gz: d44abfc112288e85c383f0d9871bf0904cf8dd13a2e5808043371806961bec0b39fa263fd2bcf55e1e31ad099d96b8c80c0834b6258dcc706a9f5fae43646693

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

@@ -13,6 +13,22 @@ module Pubid::Core::Renderer
       @params = params
     end
 
+    # Prerender parameters and store in @prerendered_params
+    # @param opts [Hash] options for render method, eg. { with_language_code: :single, with_date: true }
+    # @return [Renderer::Base] self
+    def prerender(**opts)
+      @prerendered_params = prerender_params(@params, opts)
+      @prerendered_params.default = ""
+      self
+    end
+
+    def render_base_identifier(**args)
+      prerender(**args)
+
+      render_identifier(@prerendered_params)
+    end
+
+
     def prerender_params(params, opts)
       params.map do |key, value|
         next unless value
@@ -24,16 +40,49 @@ module Pubid::Core::Renderer
       end.compact.to_h
     end
 
+    # Renders amendment and corrigendum when applied through identifier type
+    def render_supplement(supplement_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
+        base + supplement
+      end
+    end
+
     # Render identifier
     # @param with_date [Boolean] include year in output
     # @param with_language_code [:iso,:single] render document language as 2-letter ISO 639-1 language code or single code
-    def render(with_date: true, with_language_code: :iso)
-      params = prerender_params(@params,
-                                { with_date: with_date, with_language_code: with_language_code })
-      # render empty string when the key is not exist
-      params.default = ""
-
-      render_identifier(params)
+    def render(with_date: true, with_language_code: :iso, **args)
+      if %i(amd cor).include? @params[:type]&.type
+        render_supplement(@params, **args.merge({ with_date: with_date, with_language_code: with_language_code}))
+      else
+        render_base_identifier(**args.merge({ with_date: with_date, with_language_code: with_language_code})) + @prerendered_params[:language].to_s
+      end
     end
 
     def render_base(params, prefix = "")

data/lib/pubid/core/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Core
-    VERSION = "1.2.1".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.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-12 00:00:00.000000000 Z
+date: 2022-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake