pubid-core 1.2.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a3c1e99b3327c14f2364992238d1d6a4040809dca85a6640254e2669784a449
-  data.tar.gz: ca910a6333a2e5e9dc1c907577bee5c3e0c34bc6a891e07b310f4be39e9ecc59
+  metadata.gz: b1e2dbeb108d767054166d4fec9c0bb64e5c3a7ebb8811dc4f97de4c6cea4e93
+  data.tar.gz: 0aa8be27d6b839e6e985d8ce1a376d6fbe55ef07e87a664ac902c455e937c887
 SHA512:
-  metadata.gz: b148eeaf72cd34a292d1da244e33a4c4f7eb1549cca374e9c7da7aadc6a09de262c992de578725ebb5ecaad4c1fa625365dbfda519119ccec82c39da224d71f7
-  data.tar.gz: 9fb7676fbd6e7ffbf1bce920a626d70a260c24e83d59569447595c4e28157e879969b6700423d9199564e915d7929ca5c93a507e2703d79c192f0cc21d6f91cf
+  metadata.gz: 06b053ef1516f1fbe0524171fbc27afd6659e301cabb6692fb46be8b746807f6e21e081c48bc10f8cb1be282607154a7f084850f117c62e3748f8e2de1b25922
+  data.tar.gz: d3f441ccc72743f752b81eb993c7c71088442c1c53376412553a809464473048a29e80503673962d6b496dd9efc1979ed191f35dea08d9f3f19032073bba3711

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
@@ -81,21 +86,23 @@ module Pubid::Core::Renderer
     end
 
     def render_base(params, prefix = "")
-      "%{publisher}%{copublisher}#{prefix} %{number}" % params
+      "%{publisher}#{prefix} %{number}" % params
     end
 
     def render_identifier(params)
       render_base(params)
     end
 
-    def render_copublisher(copublisher, _opts, _params)
-      # (!@copublisher.is_a?(Array) && [@copublisher]) || @copublisher
-      if copublisher.is_a?(Array)
-        copublisher.map(&:to_s).sort.map do |copublisher|
-          "/#{copublisher.gsub('-', '/')}"
-        end.join
+    def render_publisher(publisher, _opts, params)
+      return publisher unless params[:copublisher]
+
+      case params[:copublisher]
+      when Array
+        ([publisher] + params[:copublisher].map(&:to_s).sort.map(&:to_s)).map do |pub|
+          pub.gsub('-', '/')
+        end.join("/")
       else
-        "/#{copublisher}"
+        [publisher, params[:copublisher]].join("/")
       end
     end
 

data/lib/pubid/core/version.rb

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