pubid-core 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cc372a0160fd8c1a670be2957f3b3e0a98766dd89ed6f8782b1f52085bcbb8f
-  data.tar.gz: 9a0d58a218b982531fe206bd7505203428ec6f9d7dcbaa649f80267b09e44030
+  metadata.gz: 2a3c1e99b3327c14f2364992238d1d6a4040809dca85a6640254e2669784a449
+  data.tar.gz: ca910a6333a2e5e9dc1c907577bee5c3e0c34bc6a891e07b310f4be39e9ecc59
 SHA512:
-  metadata.gz: 04e0297f6ce7bea0cabc3e41c7718e1eee523f93e039fa42f4b08c7a34d4fcb7b3c979fbcdb2c0c7bd980b4523d2c6985198cf61f03bb1fad64765a51ad2ccd8
-  data.tar.gz: f0c98e3158ff918fe1f0df2e5ae3c2e7cff838e6cdf37cd078d1abdc1d147561b2453ffb6b5c749dbc7b019f1691f59d0b0b52356a61efcbb10533ce44319d64
+  metadata.gz: b148eeaf72cd34a292d1da244e33a4c4f7eb1549cca374e9c7da7aadc6a09de262c992de578725ebb5ecaad4c1fa625365dbfda519119ccec82c39da224d71f7
+  data.tar.gz: 9fb7676fbd6e7ffbf1bce920a626d70a260c24e83d59569447595c4e28157e879969b6700423d9199564e915d7929ca5c93a507e2703d79c192f0cc21d6f91cf

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,44 @@ module Pubid::Core::Renderer
       end.compact.to_h
     end
 
+    # 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)
+      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) : "")
+    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.2.2".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.2.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-12 00:00:00.000000000 Z
+date: 2022-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake